Merge Mesa 21.3.7

8 files changed, 19 insertions, 18 deletions

diff --git a/lib/mesa/src/gallium/tests/graw/fs-test.c b/lib/mesa/src/gallium/tests/graw/fs-test.c
index f9bddccda..b4ddfb609 100644
--- a/lib/mesa/src/gallium/tests/graw/fs-test.c
+++ b/lib/mesa/src/gallium/tests/graw/fs-test.c
@@ -331,7 +331,7 @@ static void init_tex( void )
    {
       struct pipe_transfer *t;
       uint32_t *ptr;
-      ptr = pipe_transfer_map(ctx, samptex,
+      ptr = pipe_texture_map(ctx, samptex,
                               0, 0, /* level, layer */
                               PIPE_MAP_READ,
                               0, 0, SIZE, SIZE, &t); /* x, y, width, height */
@@ -341,7 +341,7 @@ static void init_tex( void )
          exit(9);
       }
 
-      ctx->transfer_unmap(ctx, t);
+      ctx->texture_unmap(ctx, t);
    }
 
    memset(&sv_template, 0, sizeof sv_template);
@@ -355,7 +355,7 @@ static void init_tex( void )
    if (sv == NULL)
       exit(5);
 
-   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &sv);
+   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &sv);
    
 
    memset(&sampler_desc, 0, sizeof sampler_desc);
diff --git a/lib/mesa/src/gallium/tests/graw/gs-test.c b/lib/mesa/src/gallium/tests/graw/gs-test.c
index 4d8f5c31f..cd6bdec98 100644
--- a/lib/mesa/src/gallium/tests/graw/gs-test.c
+++ b/lib/mesa/src/gallium/tests/graw/gs-test.c
@@ -421,7 +421,7 @@ static void init_tex( void )
    {
       struct pipe_transfer *t;
       uint32_t *ptr;
-      ptr = pipe_transfer_map(ctx, samptex,
+      ptr = pipe_texture_map(ctx, samptex,
                               0, 0, /* level, layer */
                               PIPE_MAP_READ,
                               0, 0, SIZE, SIZE, &t); /* x, y, width, height */
@@ -431,7 +431,7 @@ static void init_tex( void )
          exit(9);
       }
 
-      ctx->transfer_unmap(ctx, t);
+      ctx->texture_unmap(ctx, t);
    }
 
    memset(&sv_template, 0, sizeof sv_template);
@@ -445,7 +445,7 @@ static void init_tex( void )
    if (sv == NULL)
       exit(5);
 
-   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &sv);
+   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &sv);
    
 
    memset(&sampler_desc, 0, sizeof sampler_desc);
diff --git a/lib/mesa/src/gallium/tests/graw/quad-sample.c b/lib/mesa/src/gallium/tests/graw/quad-sample.c
index 912df7e7a..436674635 100644
--- a/lib/mesa/src/gallium/tests/graw/quad-sample.c
+++ b/lib/mesa/src/gallium/tests/graw/quad-sample.c
@@ -246,7 +246,7 @@ static void init_tex( void )
    {
       struct pipe_transfer *t;
       uint32_t *ptr;
-      ptr = pipe_transfer_map(ctx, samptex,
+      ptr = pipe_texture_map(ctx, samptex,
                               0, 0, /* level, layer */
                               PIPE_MAP_READ,
                               0, 0, SIZE, SIZE, &t); /* x, y, width, height */
@@ -256,7 +256,7 @@ static void init_tex( void )
          exit(9);
       }
 
-      ctx->transfer_unmap(ctx, t);
+      ctx->texture_unmap(ctx, t);
    }
 
    memset(&sv_template, 0, sizeof sv_template);
@@ -270,7 +270,7 @@ static void init_tex( void )
    if (sv == NULL)
       exit(5);
 
-   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &sv);
+   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &sv);
    
 
    memset(&sampler_desc, 0, sizeof sampler_desc);
diff --git a/lib/mesa/src/gallium/tests/graw/quad-tex.c b/lib/mesa/src/gallium/tests/graw/quad-tex.c
index 5eb1ae59e..3c78b3550 100644
--- a/lib/mesa/src/gallium/tests/graw/quad-tex.c
+++ b/lib/mesa/src/gallium/tests/graw/quad-tex.c
@@ -168,7 +168,7 @@ static void init_tex( void )
                                     PIPE_FORMAT_B8G8R8A8_UNORM, tex2d);
 
    sv = graw_util_create_simple_sampler_view(&info, texture);
-   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &sv);
+   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &sv);
 
    sampler = graw_util_create_simple_sampler(&info, 
                                              PIPE_TEX_WRAP_REPEAT,
diff --git a/lib/mesa/src/gallium/tests/graw/tex-srgb.c b/lib/mesa/src/gallium/tests/graw/tex-srgb.c
index cf9a2a14b..0d3e9ba15 100644
--- a/lib/mesa/src/gallium/tests/graw/tex-srgb.c
+++ b/lib/mesa/src/gallium/tests/graw/tex-srgb.c
@@ -129,11 +129,11 @@ static void draw( void )
 
    info.ctx->clear(info.ctx, PIPE_CLEAR_COLOR, NULL, &clear_color, 0, 0);
 
-   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &linear_sv);
+   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &linear_sv);
    set_vertices(vertices1, 4);
    util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, 4);
 
-   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &srgb_sv);
+   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &srgb_sv);
    set_vertices(vertices2, 4);
    util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, 4);
 
diff --git a/lib/mesa/src/gallium/tests/graw/tex-swizzle.c b/lib/mesa/src/gallium/tests/graw/tex-swizzle.c
index fa5a3e8e5..a522a2e01 100644
--- a/lib/mesa/src/gallium/tests/graw/tex-swizzle.c
+++ b/lib/mesa/src/gallium/tests/graw/tex-swizzle.c
@@ -147,7 +147,7 @@ init_tex(const unsigned swizzle[4])
    if (sv == NULL)
       exit(5);
 
-   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &sv);
+   info.ctx->set_sampler_views(info.ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &sv);
 
    sampler = graw_util_create_simple_sampler(&info,
                                              PIPE_TEX_WRAP_REPEAT,
diff --git a/lib/mesa/src/gallium/tests/graw/tri-instanced.c b/lib/mesa/src/gallium/tests/graw/tri-instanced.c
index 8ddd26679..66f7d1b22 100644
--- a/lib/mesa/src/gallium/tests/graw/tri-instanced.c
+++ b/lib/mesa/src/gallium/tests/graw/tri-instanced.c
@@ -192,7 +192,7 @@ static void draw( void )
 {
    union pipe_color_union clear_color = { {1,0,1,1} };
    struct pipe_draw_info info;
-   struct pipe_draw_start_count draw;
+   struct pipe_draw_start_count_bias draw;
 
    ctx->clear(ctx, PIPE_CLEAR_COLOR, NULL, &clear_color, 0, 0);
 
@@ -202,6 +202,7 @@ static void draw( void )
    info.mode = PIPE_PRIM_TRIANGLES;
    draw.start = 0;
    draw.count = 3;
+   draw.index_bias = 0;
    /* draw NUM_INST triangles */
    info.instance_count = NUM_INST;
 
@@ -215,7 +216,7 @@ static void draw( void )
                                       indices);
    }
 
-   ctx->draw_vbo(ctx, &info, NULL, &draw, 1);
+   ctx->draw_vbo(ctx, &info, 0, NULL, &draw, 1);
 
    pipe_resource_reference(&info.index.resource, NULL);
 
diff --git a/lib/mesa/src/gallium/tests/graw/vs-test.c b/lib/mesa/src/gallium/tests/graw/vs-test.c
index 23e642b47..215a756bb 100644
--- a/lib/mesa/src/gallium/tests/graw/vs-test.c
+++ b/lib/mesa/src/gallium/tests/graw/vs-test.c
@@ -319,7 +319,7 @@ static void init_tex( void )
    {
       struct pipe_transfer *t;
       uint32_t *ptr;
-      ptr = pipe_transfer_map(ctx, samptex,
+      ptr = pipe_texture_map(ctx, samptex,
                               0, 0, /* level, layer */
                               PIPE_MAP_READ,
                               0, 0, SIZE, SIZE, &t); /* x, y, width, height */
@@ -329,7 +329,7 @@ static void init_tex( void )
          exit(9);
       }
 
-      ctx->transfer_unmap(ctx, t);
+      ctx->texture_unmap(ctx, t);
    }
 
    memset(&sv_template, 0, sizeof sv_template);
@@ -343,7 +343,7 @@ static void init_tex( void )
    if (sv == NULL)
       exit(5);
 
-   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, &sv);
+   ctx->set_sampler_views(ctx, PIPE_SHADER_FRAGMENT, 0, 1, 0, false, &sv);
    
 
    memset(&sampler_desc, 0, sizeof sampler_desc);