[Mesa-dev] [PATCH] radv: Also fix up 1D images in the image_size intrinsic.

Bas Nieuwenhuizen bas at basnieuwenhuizen.nl
Fri Sep 15 19:24:30 UTC 2017


Forgotten when implementing them using 2D textures.

This fixes:
dEQP-VK.image.image_size.1d_array.readonly_12x34
dEQP-VK.image.image_size.1d_array.readonly_1x1
dEQP-VK.image.image_size.1d_array.readonly_32x32
dEQP-VK.image.image_size.1d_array.readonly_7x1
dEQP-VK.image.image_size.1d_array.readonly_writeonly_12x34
dEQP-VK.image.image_size.1d_array.readonly_writeonly_1x1
dEQP-VK.image.image_size.1d_array.readonly_writeonly_32x32
dEQP-VK.image.image_size.1d_array.readonly_writeonly_7x1
dEQP-VK.image.image_size.1d_array.writeonly_12x34
dEQP-VK.image.image_size.1d_array.writeonly_1x1
dEQP-VK.image.image_size.1d_array.writeonly_32x32
dEQP-VK.image.image_size.1d_array.writeonly_7x1

Fixes: 1bcb953e166 "radv: handle GFX9 1D textures"
---
 src/amd/common/ac_nir_to_llvm.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 1388ebd998b..befbb96590d 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -3579,13 +3579,6 @@ static LLVMValueRef visit_image_size(struct ac_nir_context *ctx,
 		z = LLVMBuildSDiv(ctx->ac.builder, z, six, "");
 		res = LLVMBuildInsertElement(ctx->ac.builder, res, z, two, "");
 	}
-	if (glsl_get_sampler_dim(type) == GLSL_SAMPLER_DIM_1D &&
-	    glsl_sampler_type_is_array(type)) {
-		LLVMValueRef layers = LLVMBuildExtractElement(ctx->ac.builder, res, two, "");
-		res = LLVMBuildInsertElement(ctx->ac.builder, res, layers,
-						ctx->ac.i32_1, "");
-
-	}
 	return res;
 }
 
-- 
2.14.1



More information about the mesa-dev mailing list