Mesa (master): ac: image size builtin for GLSL_SAMPLER_DIM_3D

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 82adf53308c137ce0dc5f2d5da4e7cc40c5b808c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82adf53308c137ce0dc5f2d5da4e7cc40c5b808c

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Thu Jan 18 18:15:28 2018 +1100

ac: image size builtin for GLSL_SAMPLER_DIM_3D

This is what radeonsi does. Fixes remaing piglit subtest in:

./bin/arb_shader_image_size-builtin --quick -auto -fbo

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/amd/common/ac_nir_to_llvm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 214fb148a1..8ec361cf8d 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3814,7 +3814,8 @@ static LLVMValueRef visit_image_size(struct ac_nir_context *ctx,
 	const nir_variable *var = instr->variables[0]->var;
 	const struct glsl_type *type = instr->variables[0]->var->type;
 	bool da = glsl_sampler_type_is_array(var->type) ||
-	          glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_CUBE;
+		  glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_CUBE ||
+		  glsl_get_sampler_dim(var->type) == GLSL_SAMPLER_DIM_3D;
 	if(instr->variables[0]->deref.child)
 		type = instr->variables[0]->deref.child->type;