From 3da4b5eaa51ea74a4e3e1309a75308a9586189a6 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 9 Aug 2024 16:30:22 +1000 Subject: [PATCH] glsl: always copy bindless sampler packing constructors to a temp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11648 Fixes: 3cdcc5f02f39 ("glsl: implement ARB_bindless_texture conversions") Reviewed-by: Marek Olšák Part-of: --- src/compiler/glsl/ast_function.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index 4a336a46ef0..de4452b838a 100644 --- a/src/compiler/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp @@ -2398,6 +2398,24 @@ ast_function_expression::hir(exec_list *instructions, ir_rvalue *result = convert_component(ir, desired_type); + /* If the bindless packing constructors are used directly as function + * params to bultin functions the compiler doesn't know what to do + * with them. To avoid this make sure we always copy the results from + * the pack to a temp first. + */ + if (result->as_expression() && + result->as_expression()->operation == ir_unop_pack_sampler_2x32) { + ir_variable *var = + new(ctx) ir_variable(desired_type, "sampler_ctor", + ir_var_temporary); + instructions->push_tail(var); + + ir_dereference *lhs = new(ctx) ir_dereference_variable(var); + ir_instruction *assignment = new(ctx) ir_assignment(lhs, result); + instructions->push_tail(assignment); + result = lhs; + } + /* Attempt to convert the parameter to a constant valued expression. * After doing so, track whether or not all the parameters to the * constructor are trivially constant valued expressions.