From c12a98589463de68a2aefc13a37fe0ab71da608a Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 10 Jun 2021 06:31:42 -0400
Subject: [PATCH] zink: set inlinable_uniforms_mask first when binding a shader

Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12532>
---
 src/gallium/drivers/zink/zink_program.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index f710885cff5..b49f84a196f 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -874,6 +874,11 @@ static inline void
 bind_stage(struct zink_context *ctx, enum pipe_shader_type stage,
            struct zink_shader *shader)
 {
+   if (shader && shader->nir->info.num_inlinable_uniforms)
+      ctx->shader_has_inlinable_uniforms_mask |= 1 << stage;
+   else
+      ctx->shader_has_inlinable_uniforms_mask &= ~(1 << stage);
+
    if (stage == PIPE_SHADER_COMPUTE) {
       if (shader && shader != ctx->compute_stage) {
          struct hash_entry *entry = _mesa_hash_table_search(&ctx->compute_program_cache, shader);
@@ -903,10 +908,6 @@ bind_stage(struct zink_context *ctx, enum pipe_shader_type stage,
          ctx->shader_stages &= ~BITFIELD_BIT(stage);
       }
    }
-   if (shader && shader->nir->info.num_inlinable_uniforms)
-      ctx->shader_has_inlinable_uniforms_mask |= 1 << stage;
-   else
-      ctx->shader_has_inlinable_uniforms_mask &= ~(1 << stage);
 }
 
 static void