From 42a2fe25f4552805c253d96c121f1e4dd436eb4a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 19 Apr 2017 18:52:54 +0200 Subject: glsl: relax bindless sampler arrays indexing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From section 4.1.7 of the ARB_bindless_texture spec: "Samplers aggregated into arrays within a shader (using square brackets []) can be indexed with arbitrary integer expressions." v3: - update spec comment formatting Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri Reviewed-by: Nicolai Hähnle --- src/compiler/glsl/ast_array_index.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/compiler/glsl/ast_array_index.cpp') diff --git a/src/compiler/glsl/ast_array_index.cpp b/src/compiler/glsl/ast_array_index.cpp index dfa44b703d4..f6b7a64a281 100644 --- a/src/compiler/glsl/ast_array_index.cpp +++ b/src/compiler/glsl/ast_array_index.cpp @@ -299,12 +299,18 @@ _mesa_ast_array_index_to_hir(void *mem_ctx, * values must not diverge between shader invocations run together. If the * values *do* diverge, then the behavior of the operation requiring a * dynamically uniform expression is undefined. + * + * From section 4.1.7 of the ARB_bindless_texture spec: + * + * "Samplers aggregated into arrays within a shader (using square + * brackets []) can be indexed with arbitrary integer expressions." */ if (array->type->without_array()->is_sampler()) { if (!state->is_version(400, 320) && !state->ARB_gpu_shader5_enable && !state->EXT_gpu_shader5_enable && - !state->OES_gpu_shader5_enable) { + !state->OES_gpu_shader5_enable && + !state->has_bindless()) { if (state->is_version(130, 300)) _mesa_glsl_error(&loc, state, "sampler arrays indexed with non-constant " -- cgit v1.2.3