Module: Mesa Branch: master Commit: 5411b98d5249e6ceb79f0b9923dd142fbbce8852 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5411b98d5249e6ceb79f0b9923dd142fbbce8852
Author: Timothy Arceri <tarc...@itsqueeze.com> Date: Tue Feb 20 11:06:27 2018 +1100 st/glsl_to_nir: set driver location for bindless images and samplers Reviewed-by: Marek Olšák <marek.ol...@amd.com> --- 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 d80b8318c1..2cd1d97bae 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 _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit