From 4fe2a6ba7a3ef56b806a4e3888a47f05097e02f2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 19 Apr 2017 15:54:32 +0200 Subject: mesa: store bindless samplers as PROGRAM_UNIFORM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Old-style samplers (ie. bound samplers) are stored as PROGRAM_SAMPLER, while bindless ones are PROGRAM_UNIFORM. Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle --- src/mesa/program/ir_to_mesa.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mesa/program/ir_to_mesa.cpp') diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 825f03d590e..ab39406bd21 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2452,7 +2452,7 @@ add_uniform_to_shader::visit_field(const glsl_type *type, const char *name, return; gl_register_file file; - if (type->without_array()->is_sampler()) { + if (type->without_array()->is_sampler() && !var->data.bindless) { file = PROGRAM_SAMPLER; } else { file = PROGRAM_UNIFORM; -- cgit v1.2.3