Import Mesa 17.2.8

16 files changed, 32 insertions, 32 deletions

diff --git a/lib/mesa/src/gallium/tests/graw/fs-fragcoord.c b/lib/mesa/src/gallium/tests/graw/fs-fragcoord.c
index 9b85cf79f..cf7642c78 100644
--- a/lib/mesa/src/gallium/tests/graw/fs-fragcoord.c
+++ b/lib/mesa/src/gallium/tests/graw/fs-fragcoord.c
@@ -68,7 +68,7 @@ set_vertices(void)
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/fs-frontface.c b/lib/mesa/src/gallium/tests/graw/fs-frontface.c
index a0c8a2d5d..32a13cb9e 100644
--- a/lib/mesa/src/gallium/tests/graw/fs-frontface.c
+++ b/lib/mesa/src/gallium/tests/graw/fs-frontface.c
@@ -90,7 +90,7 @@ set_vertices(void)
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/fs-test.c b/lib/mesa/src/gallium/tests/graw/fs-test.c
index e2e7ac80a..d1ade1d2b 100644
--- a/lib/mesa/src/gallium/tests/graw/fs-test.c
+++ b/lib/mesa/src/gallium/tests/graw/fs-test.c
@@ -173,7 +173,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/fs-write-z.c b/lib/mesa/src/gallium/tests/graw/fs-write-z.c
index eabae6424..12267ed82 100644
--- a/lib/mesa/src/gallium/tests/graw/fs-write-z.c
+++ b/lib/mesa/src/gallium/tests/graw/fs-write-z.c
@@ -94,7 +94,7 @@ set_vertices(void)
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/gs-test.c b/lib/mesa/src/gallium/tests/graw/gs-test.c
index 46042c68a..dad3298d1 100644
--- a/lib/mesa/src/gallium/tests/graw/gs-test.c
+++ b/lib/mesa/src/gallium/tests/graw/gs-test.c
@@ -235,13 +235,13 @@ static void set_vertices( void )
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
    if (draw_strip) {
-      vbuf.buffer = pipe_buffer_create_with_data(ctx,
+      vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                                  PIPE_BIND_VERTEX_BUFFER,
                                                  PIPE_USAGE_DEFAULT,
                                                  sizeof(vertices_strip),
                                                  vertices_strip);
    } else {
-      vbuf.buffer = pipe_buffer_create_with_data(ctx,
+      vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                                  PIPE_BIND_VERTEX_BUFFER,
                                                  PIPE_USAGE_DEFAULT,
                                                  sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/occlusion-query.c b/lib/mesa/src/gallium/tests/graw/occlusion-query.c
index d03934f9d..444b645ca 100644
--- a/lib/mesa/src/gallium/tests/graw/occlusion-query.c
+++ b/lib/mesa/src/gallium/tests/graw/occlusion-query.c
@@ -94,7 +94,7 @@ set_vertices(struct vertex *vertices, unsigned bytes)
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               bytes,
diff --git a/lib/mesa/src/gallium/tests/graw/quad-sample.c b/lib/mesa/src/gallium/tests/graw/quad-sample.c
index 03f51fc95..79174204d 100644
--- a/lib/mesa/src/gallium/tests/graw/quad-sample.c
+++ b/lib/mesa/src/gallium/tests/graw/quad-sample.c
@@ -99,7 +99,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/quad-tex.c b/lib/mesa/src/gallium/tests/graw/quad-tex.c
index 8a9d1b80f..444f64e94 100644
--- a/lib/mesa/src/gallium/tests/graw/quad-tex.c
+++ b/lib/mesa/src/gallium/tests/graw/quad-tex.c
@@ -57,7 +57,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/shader-leak.c b/lib/mesa/src/gallium/tests/graw/shader-leak.c
index dddb69c79..fb4344c08 100644
--- a/lib/mesa/src/gallium/tests/graw/shader-leak.c
+++ b/lib/mesa/src/gallium/tests/graw/shader-leak.c
@@ -89,7 +89,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/tex-srgb.c b/lib/mesa/src/gallium/tests/graw/tex-srgb.c
index 9d3af9480..503350a68 100644
--- a/lib/mesa/src/gallium/tests/graw/tex-srgb.c
+++ b/lib/mesa/src/gallium/tests/graw/tex-srgb.c
@@ -73,7 +73,7 @@ set_vertices(struct vertex *verts, unsigned num_verts)
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               num_verts * sizeof(struct vertex),
diff --git a/lib/mesa/src/gallium/tests/graw/tex-swizzle.c b/lib/mesa/src/gallium/tests/graw/tex-swizzle.c
index bc56a9570..787f324fc 100644
--- a/lib/mesa/src/gallium/tests/graw/tex-swizzle.c
+++ b/lib/mesa/src/gallium/tests/graw/tex-swizzle.c
@@ -55,7 +55,7 @@ static void set_vertices(void)
 
    vbuf.stride = sizeof(struct vertex);
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/tri-gs.c b/lib/mesa/src/gallium/tests/graw/tri-gs.c
index 6d9e41ddb..2ca36ce91 100644
--- a/lib/mesa/src/gallium/tests/graw/tri-gs.c
+++ b/lib/mesa/src/gallium/tests/graw/tri-gs.c
@@ -90,7 +90,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/tri-instanced.c b/lib/mesa/src/gallium/tests/graw/tri-instanced.c
index b1fa21dc3..6c6783c93 100644
--- a/lib/mesa/src/gallium/tests/graw/tri-instanced.c
+++ b/lib/mesa/src/gallium/tests/graw/tri-instanced.c
@@ -104,7 +104,6 @@ static void set_vertices( void )
 {
    struct pipe_vertex_element ve[3];
    struct pipe_vertex_buffer vbuf[2];
-   struct pipe_index_buffer ibuf;
    void *handle;
 
    memset(ve, 0, sizeof ve);
@@ -133,7 +132,7 @@ static void set_vertices( void )
    /* vertex data */
    vbuf[0].stride = sizeof( struct vertex );
    vbuf[0].buffer_offset = 0;
-   vbuf[0].buffer = pipe_buffer_create_with_data(ctx,
+   vbuf[0].buffer.resource = pipe_buffer_create_with_data(ctx,
                                                  PIPE_BIND_VERTEX_BUFFER,
                                                  PIPE_USAGE_DEFAULT,
                                                  sizeof(vertices),
@@ -142,25 +141,13 @@ static void set_vertices( void )
    /* instance data */
    vbuf[1].stride = sizeof( inst_data[0] );
    vbuf[1].buffer_offset = 0;
-   vbuf[1].buffer = pipe_buffer_create_with_data(ctx,
+   vbuf[1].buffer.resource = pipe_buffer_create_with_data(ctx,
                                                  PIPE_BIND_VERTEX_BUFFER,
                                                  PIPE_USAGE_DEFAULT,
                                                  sizeof(inst_data),
                                                  inst_data);
 
    ctx->set_vertex_buffers(ctx, 0, 2, vbuf);
-
-   /* index data */
-   ibuf.buffer = pipe_buffer_create_with_data(ctx,
-                                              PIPE_BIND_INDEX_BUFFER,
-                                              PIPE_USAGE_DEFAULT,
-                                              sizeof(indices),
-                                              indices);
-   ibuf.offset = 0;
-   ibuf.index_size = 2;
-
-   ctx->set_index_buffer(ctx, &ibuf);
-
 }
 
 static void set_vertex_shader( void )
@@ -203,16 +190,29 @@ static void draw( void )
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0);
 
+
    util_draw_init_info(&info);
-   info.indexed = (draw_elements != 0);
+   info.index_size = draw_elements ? 2 : 0;
    info.mode = PIPE_PRIM_TRIANGLES;
    info.start = 0;
    info.count = 3;
    /* draw NUM_INST triangles */
    info.instance_count = NUM_INST;
 
+   /* index data */
+   if (info.index_size) {
+      info.index.resource =
+         pipe_buffer_create_with_data(ctx,
+                                      PIPE_BIND_INDEX_BUFFER,
+                                      PIPE_USAGE_DEFAULT,
+                                      sizeof(indices),
+                                      indices);
+   }
+
    ctx->draw_vbo(ctx, &info);
 
+   pipe_resource_reference(&info.index.resource, NULL);
+
    ctx->flush(ctx, NULL, 0);
 
    graw_save_surface_to_file(ctx, surf, NULL);
diff --git a/lib/mesa/src/gallium/tests/graw/tri-large.c b/lib/mesa/src/gallium/tests/graw/tri-large.c
index 4ccb7c526..1ca915aa1 100644
--- a/lib/mesa/src/gallium/tests/graw/tri-large.c
+++ b/lib/mesa/src/gallium/tests/graw/tri-large.c
@@ -59,7 +59,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/tri.c b/lib/mesa/src/gallium/tests/graw/tri.c
index 0968387e1..b62a2ab48 100644
--- a/lib/mesa/src/gallium/tests/graw/tri.c
+++ b/lib/mesa/src/gallium/tests/graw/tri.c
@@ -56,7 +56,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(info.ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(info.ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),
diff --git a/lib/mesa/src/gallium/tests/graw/vs-test.c b/lib/mesa/src/gallium/tests/graw/vs-test.c
index 14e63cdef..e3b50ea8f 100644
--- a/lib/mesa/src/gallium/tests/graw/vs-test.c
+++ b/lib/mesa/src/gallium/tests/graw/vs-test.c
@@ -167,7 +167,7 @@ static void set_vertices( void )
 
    vbuf.stride = sizeof( struct vertex );
    vbuf.buffer_offset = 0;
-   vbuf.buffer = pipe_buffer_create_with_data(ctx,
+   vbuf.buffer.resource = pipe_buffer_create_with_data(ctx,
                                               PIPE_BIND_VERTEX_BUFFER,
                                               PIPE_USAGE_DEFAULT,
                                               sizeof(vertices),