Mesa (master): st/glsl_to_nir: fix next_stage gathering
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 30 22:38:01 UTC 2018
Module: Mesa
Branch: master
Commit: 31596836fc22e1f5b4cf85abc012acd27366db87
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31596836fc22e1f5b4cf85abc012acd27366db87
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Sat Oct 20 15:02:59 2018 +1100
st/glsl_to_nir: fix next_stage gathering
ffs() just returns the bit that is set, we need to know what
stage that bit represents so use u_bit_scan() instead.
Fixes: 2ca5d9548fc4 ("st/glsl_to_nir: gather next_stage in shader_info")
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index fe85eeb458..c58deadc95 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -373,7 +373,7 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
~prev_stages & shader_program->data->linked_stages;
nir->info.next_stage = stages_mask ?
- (gl_shader_stage) ffs(stages_mask) : MESA_SHADER_FRAGMENT;
+ (gl_shader_stage) u_bit_scan(&stages_mask) : MESA_SHADER_FRAGMENT;
} else {
nir->info.next_stage = MESA_SHADER_FRAGMENT;
}
More information about the mesa-commit
mailing list