projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f94b6b7)
st/glsl_to_nir: set driver location for bindless images and samplers
authorTimothy Arceri <tarceri@itsqueeze.com>
Tue, 20 Feb 2018 00:06:27 +0000 (11:06 +1100)
committerTimothy Arceri <tarceri@itsqueeze.com>
Wed, 28 Mar 2018 01:56:15 +0000 (12:56 +1100)
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/mesa/state_tracker/st_glsl_to_nir.cpp patch | blob | history

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index d80b8318c1d2425a17e5fd59a39729d1493b7a2d..2cd1d97baecd8f21f9eca1c71f8dcefc72624c53 100644 (file)
--- 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