From eab61863c0bd6b08bfc7c28d96cd99f49856e449 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 21 Nov 2022 23:38:53 +0100 Subject: [PATCH] radv: Fix sampler types in ETC2 decode. Otherwise we'd have a type mismatch vs texture fetches, which is asserted upon these days. Fixes: 1153db23f58 ("radv: Add ETC2 decode shader.") Part-of: --- src/amd/vulkan/radv_meta_etc_decode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_meta_etc_decode.c b/src/amd/vulkan/radv_meta_etc_decode.c index 4320c2a0e33..dcaed8ea556 100644 --- a/src/amd/vulkan/radv_meta_etc_decode.c +++ b/src/amd/vulkan/radv_meta_etc_decode.c @@ -161,9 +161,9 @@ static nir_shader * build_shader(struct radv_device *dev) { const struct glsl_type *sampler_type_2d = - glsl_sampler_type(GLSL_SAMPLER_DIM_2D, false, true, GLSL_TYPE_FLOAT); + glsl_sampler_type(GLSL_SAMPLER_DIM_2D, false, true, GLSL_TYPE_UINT); const struct glsl_type *sampler_type_3d = - glsl_sampler_type(GLSL_SAMPLER_DIM_3D, false, false, GLSL_TYPE_FLOAT); + glsl_sampler_type(GLSL_SAMPLER_DIM_3D, false, false, GLSL_TYPE_UINT); const struct glsl_type *img_type_2d = glsl_image_type(GLSL_SAMPLER_DIM_2D, true, GLSL_TYPE_FLOAT); const struct glsl_type *img_type_3d =