diff options
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index eea611b7954..127f097fe1f 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -36,6 +36,7 @@ #include "compiler/glsl/glsl_parser_extras.h" #include "compiler/glsl/program.h" #include "program/hash_table.h" +#include "util/bitscan.h" extern "C" void GLAPIENTRY @@ -843,9 +844,10 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, * been modified. */ bool changed = false; - for (unsigned j = 0; j < ARRAY_SIZE(prog->SamplerUnits); j++) { - if ((sh->active_samplers & (1U << j)) != 0 - && (prog->SamplerUnits[j] != sh->SamplerUnits[j])) { + GLbitfield mask = sh->active_samplers; + while (mask) { + const int j = u_bit_scan(&mask); + if (prog->SamplerUnits[j] != sh->SamplerUnits[j]) { changed = true; break; } |