summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/state_tracker/st_glsl_to_nir.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index d80b8318c1d..2cd1d97baec 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -271,7 +271,8 @@ st_nir_assign_uniform_locations(struct gl_context *ctx,
uniform->interface_type != NULL)
continue;
- if (uniform->type->is_sampler() || uniform->type->is_image()) {
+ if (!uniform->data.bindless &&
+ (uniform->type->is_sampler() || uniform->type->is_image())) {
if (uniform->type->is_sampler())
loc = shaderidx++;
else