Mesa (main): zink: remove duplicated bitflag filtering for inline uniforms

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 18 13:01:27 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jun 18 00:17:10 2021 -0400

zink: remove duplicated bitflag filtering for inline uniforms

'bits' already does this

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

---

 src/gallium/drivers/zink/zink_draw.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 3dceab1078f..056d49ccce9 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -166,7 +166,6 @@ update_compute_program(struct zink_context *ctx)
 {
    unsigned bits = 1 << PIPE_SHADER_COMPUTE;
    ctx->dirty_shader_stages |= ctx->inlinable_uniforms_dirty_mask &
-                               ctx->inlinable_uniforms_valid_mask &
                                ctx->shader_has_inlinable_uniforms_mask & bits;
    if (ctx->dirty_shader_stages & bits) {
       struct zink_compute_program *comp = NULL;
@@ -201,7 +200,6 @@ update_gfx_program(struct zink_context *ctx)
    }
    unsigned bits = u_bit_consecutive(PIPE_SHADER_VERTEX, 5);
    ctx->dirty_shader_stages |= ctx->inlinable_uniforms_dirty_mask &
-                               ctx->inlinable_uniforms_valid_mask &
                                ctx->shader_has_inlinable_uniforms_mask & bits;
    if (ctx->dirty_shader_stages & bits) {
       struct zink_gfx_program *prog = NULL;



More information about the mesa-commit mailing list