From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Tue, 20 Feb 2018 00:06:27 +0000 (+1100)
Subject: st/glsl_to_nir: set driver location for bindless images and samplers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5411b98d5249e6ceb79f0b9923dd142fbbce8852;p=mesa.git

st/glsl_to_nir: set driver location for bindless images and samplers

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

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