From a2cda5ba09e994d453479625e5d97fb0372232ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 22 Nov 2022 04:34:04 -0500 Subject: [PATCH] mesa: don't AND with VERT_BIT_ALL because it's ~0u Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/main/arrayobj.h | 2 +- src/mesa/main/varray.c | 2 -- src/mesa/vbo/vbo_exec_draw.c | 2 +- src/mesa/vbo/vbo_private.h | 2 +- src/mesa/vbo/vbo_save_draw.c | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 58feea588d4..09d655f0508 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -222,7 +222,7 @@ _mesa_get_derived_vao_masks(const struct gl_context *ctx, static inline GLbitfield _mesa_draw_current_bits(const struct gl_context *ctx) { - return ~ctx->Array._DrawVAOEnabledAttribs & VERT_BIT_ALL; + return ~ctx->Array._DrawVAOEnabledAttribs; } diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 29f2e6b9d6e..1b1eb93680a 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2060,7 +2060,6 @@ _mesa_enable_vertex_array_attribs(struct gl_context *ctx, struct gl_vertex_array_object *vao, GLbitfield attrib_bits) { - assert((attrib_bits & ~VERT_BIT_ALL) == 0); assert(!vao->SharedAndImmutable); /* Only work on bits that are disabled */ @@ -2165,7 +2164,6 @@ _mesa_disable_vertex_array_attribs(struct gl_context *ctx, struct gl_vertex_array_object *vao, GLbitfield attrib_bits) { - assert((attrib_bits & ~VERT_BIT_ALL) == 0); assert(!vao->SharedAndImmutable); /* Only work on bits that are enabled */ diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 235b97b9c1a..1c39ef43b84 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -112,7 +112,7 @@ vbo_exec_bind_arrays(struct gl_context *ctx, } /* At first disable arrays no longer needed */ - _mesa_disable_vertex_array_attribs(ctx, vao, VERT_BIT_ALL & ~vao_enabled); + _mesa_disable_vertex_array_attribs(ctx, vao, ~vao_enabled); assert((~vao_enabled & vao->Enabled) == 0); /* Bind the buffer object */ diff --git a/src/mesa/vbo/vbo_private.h b/src/mesa/vbo/vbo_private.h index 9f7e70f4c77..cd79c590de2 100644 --- a/src/mesa/vbo/vbo_private.h +++ b/src/mesa/vbo/vbo_private.h @@ -235,7 +235,7 @@ _vbo_get_vao_enabled_from_vbo(gl_vertex_processing_mode vertex_processing_mode, return (((GLbitfield)enabled) & VERT_BIT_FF_ALL) | (((GLbitfield)(enabled >> VBO_MATERIAL_SHIFT)) & VERT_BIT_MAT_ALL); } else { - return ((GLbitfield)enabled) & VERT_BIT_ALL; + return enabled; } } diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 0148810f761..20da9c43fbc 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -108,7 +108,7 @@ playback_copy_to_current(struct gl_context *ctx, bool color0_changed = false; /* Copy conventional attribs and generics except pos */ - copy_vao(ctx, node->cold->VAO[VP_MODE_SHADER], ~VERT_BIT_POS & VERT_BIT_ALL, + copy_vao(ctx, node->cold->VAO[VP_MODE_SHADER], ~VERT_BIT_POS, _NEW_CURRENT_ATTRIB, GL_CURRENT_BIT, 0, &data, &color0_changed); /* Copy materials */ copy_vao(ctx, node->cold->VAO[VP_MODE_FF], VERT_BIT_MAT_ALL,