Mesa (main): zink: remove inlinable_uniforms_dirty_mask

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d3a63149dadcf9aa5b34a4cab884a233a6d6c75c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d3a63149dadcf9aa5b34a4cab884a233a6d6c75c

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue May 11 12:10:05 2021 -0400

zink: remove inlinable_uniforms_dirty_mask

this should've always just been flagging the shaders dirty directly

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11405>

---

 src/gallium/drivers/zink/zink_context.c | 2 +-
 src/gallium/drivers/zink/zink_context.h | 1 -
 src/gallium/drivers/zink/zink_draw.c    | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index d0510f038fa..2a740e54b93 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -974,7 +974,7 @@ zink_set_inlinable_constants(struct pipe_context *pctx,
    struct zink_context *ctx = (struct zink_context *)pctx;
 
    memcpy(ctx->inlinable_uniforms[shader], values, num_values * 4);
-   ctx->inlinable_uniforms_dirty_mask |= 1 << shader;
+   ctx->dirty_shader_stages |= 1 << shader;
    ctx->inlinable_uniforms_valid_mask |= 1 << shader;
 }
 
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index 31d975e639d..3a22eeec50f 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -152,7 +152,6 @@ struct zink_context {
    VkDeviceSize resource_size; //the accumulated size of resources in submitted buffers
 
    unsigned shader_has_inlinable_uniforms_mask;
-   unsigned inlinable_uniforms_dirty_mask;
    unsigned inlinable_uniforms_valid_mask;
    uint32_t inlinable_uniforms[PIPE_SHADER_TYPES][MAX_INLINABLE_UNIFORMS];
 
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 056d49ccce9..7153f5cdda7 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -165,8 +165,6 @@ static void
 update_compute_program(struct zink_context *ctx)
 {
    unsigned bits = 1 << PIPE_SHADER_COMPUTE;
-   ctx->dirty_shader_stages |= ctx->inlinable_uniforms_dirty_mask &
-                               ctx->shader_has_inlinable_uniforms_mask & bits;
    if (ctx->dirty_shader_stages & bits) {
       struct zink_compute_program *comp = NULL;
       struct hash_entry *entry = _mesa_hash_table_search(ctx->compute_program_cache,
@@ -182,7 +180,6 @@ update_compute_program(struct zink_context *ctx)
       }
       ctx->curr_compute = comp;
       ctx->dirty_shader_stages &= bits;
-      ctx->inlinable_uniforms_dirty_mask &= bits;
    }
 }
 
@@ -199,8 +196,6 @@ update_gfx_program(struct zink_context *ctx)
       ctx->last_vertex_stage_dirty = false;
    }
    unsigned bits = u_bit_consecutive(PIPE_SHADER_VERTEX, 5);
-   ctx->dirty_shader_stages |= ctx->inlinable_uniforms_dirty_mask &
-                               ctx->shader_has_inlinable_uniforms_mask & bits;
    if (ctx->dirty_shader_stages & bits) {
       struct zink_gfx_program *prog = NULL;
       struct hash_entry *entry = _mesa_hash_table_search(ctx->program_cache,
@@ -218,7 +213,6 @@ update_gfx_program(struct zink_context *ctx)
       }
       ctx->curr_program = prog;
       ctx->dirty_shader_stages &= ~bits;
-      ctx->inlinable_uniforms_dirty_mask &= ~bits;
    }
 }