From 5e7c7b2a4e6b9cbdbcdaa95caac787b4d4953b68 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 28 Aug 2015 16:17:45 -0700 Subject: [PATCH] spirv: Only do a block load if you're actually loading a uniform --- src/glsl/nir/spirv_to_nir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/nir/spirv_to_nir.c b/src/glsl/nir/spirv_to_nir.c index 3cbaf3c8616..ffaebf10502 100644 --- a/src/glsl/nir/spirv_to_nir.c +++ b/src/glsl/nir/spirv_to_nir.c @@ -1147,7 +1147,7 @@ vtn_variable_load(struct vtn_builder *b, nir_deref_var *src, nir_deref *src_tail = get_deref_tail(src); struct vtn_ssa_value *val; - if (src->var->interface_type) + if (src->var->interface_type && src->var->data.mode == nir_var_uniform) val = vtn_block_load(b, src, src_type, src_tail); else val = _vtn_variable_load(b, src, src_type, src_tail); -- 2.30.2