summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2018-02-20 11:06:27 +1100
committerTimothy Arceri <[email protected]>2018-03-28 12:56:15 +1100
commit5411b98d5249e6ceb79f0b9923dd142fbbce8852 (patch)
tree83417457a484f1c8df05e0abbc6d18a81b2fdb2b /src/mesa/state_tracker
parentf94b6b79be8e86be6908c7e7b93380b082433277 (diff)
st/glsl_to_nir: set driver location for bindless images and samplers
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-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