From a8e2fa733f2e00ace47366e6e2359c0ff35ff0c3 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: (cherry picked from commit eab61863c0bd6b08bfc7c28d96cd99f49856e449) --- .pick_status.json | 2 +- src/amd/vulkan/radv_meta_etc_decode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e0d01d1..18cf472 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 4320c2a..dcaed8e 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 = -- 2.7.4