From 5411b98d5249e6ceb79f0b9923dd142fbbce8852 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 20 Feb 2018 11:06:27 +1100 Subject: [PATCH] st/glsl_to_nir: set driver location for bindless images and samplers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 3 ++- 1 file changed, 2 insertions(+), 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 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