[Mesa-dev] [PATCH 3/4] glsl/nir: fix variable type for image intrinsics and ubos
Karol Herbst
kherbst at redhat.com
Tue Apr 3 13:21:30 UTC 2018
If the bindless image is passed through a struct we ended up getting the
glsl_type of the struct, not the image.
variable_referenced points to the declaration of the struct, so it won't work
for bindless images. So just drop it.
Signed-off-by: Karol Herbst <kherbst at redhat.com>
---
src/compiler/glsl/glsl_to_nir.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 8e2d96a2361..1fc0cac4736 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -893,7 +893,7 @@ nir_visitor::visit(ir_call *ir)
exec_node *param = ir->actual_parameters.get_head();
ir_dereference *image = (ir_dereference *)param;
const glsl_type *type =
- image->variable_referenced()->type->without_array();
+ image->type->without_array();
instr->variables[0] = evaluate_deref(&instr->instr, image);
param = param->get_next();
--
2.14.3
More information about the mesa-dev
mailing list