From 6c858227fd0b11fa53e13c2df6a27dc4f727bf9e Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Wed, 26 Apr 2017 18:34:27 +0200 Subject: glsl: skip tree grafting for sampler and image types --- src/compiler/glsl/opt_tree_grafting.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/compiler/glsl/opt_tree_grafting.cpp b/src/compiler/glsl/opt_tree_grafting.cpp index 28b6e1856e..3c8ab82088 100644 --- a/src/compiler/glsl/opt_tree_grafting.cpp +++ b/src/compiler/glsl/opt_tree_grafting.cpp @@ -371,6 +371,19 @@ tree_grafting_basic_block(ir_instruction *bb_first, if (lhs_var->data.precise) continue; + /* Do not graft sampler and image variables. This is a workaround to + * st/glsl_to_tgsi being unable to handle expression parameters to image + * intrinsics. + * + * Note that if this is ever fixed, we still need to skip grafting when + * any image layout qualifiers (including the image format) are set, + * since we must not lose those. + */ + glsl_base_type base_type = lhs_var->type->base_type; + + if (base_type == GLSL_TYPE_SAMPLER || base_type == GLSL_TYPE_IMAGE) + continue; + ir_variable_refcount_entry *entry = info->refs->get_variable_entry(lhs_var); if (!entry->declaration || -- cgit v1.2.3