zink: elide a buffer samplerview update conditional
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Mon, 24 Oct 2022 20:46:59 +0000 (16:46 -0400)
committerMarge Bot <emma+marge@anholt.net>
Tue, 25 Oct 2022 22:40:43 +0000 (22:40 +0000)
this is really part of the previous conditional blocks

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19306>

src/gallium/drivers/zink/zink_context.c

index 9ae3382..7a42e67 100644 (file)
@@ -1839,11 +1839,10 @@ zink_set_sampler_views(struct pipe_context *pctx,
                zink_buffer_view_reference(zink_screen(ctx->base.screen), &b->buffer_view, NULL);
                b->buffer_view = buffer_view;
                update = true;
-            }
+            } else if (!a || a->buffer_view->buffer_view != b->buffer_view->buffer_view)
+                  update = true;
             zink_screen(ctx->base.screen)->buffer_barrier(ctx, res, VK_ACCESS_SHADER_READ_BIT,
                                          res->gfx_barrier);
-            if (!a || a->buffer_view->buffer_view != b->buffer_view->buffer_view)
-               update = true;
             zink_batch_resource_usage_set(&ctx->batch, res, false, true);
          } else if (!res->obj->is_buffer) {
              if (res->base.b.format != b->image_view->base.format)