diff --git a/.pick_status.json b/.pick_status.json index e0d01d12e48..18cf4722f2e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1327,7 +1327,7 @@ "description": "radv: Fix sampler types in ETC2 decode.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "1153db23f58c39af2472e3bdfa721879ca1ac8cd" }, 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 =