fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-21 21:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

radv: Fix sampler types in ETC2 decode.

Browse source 
Otherwise we'd have a type mismatch vs texture fetches, which
is asserted upon these days.

Fixes: 1153db23f5 ("radv: Add ETC2 decode shader.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19914>
(cherry picked from commit eab61863c0)
This commit is contained in:
Bas Nieuwenhuizen 2022-11-21 23:38:53 +01:00 • committed by Eric Engestrom
parent 1b08bbe2db
commit a8e2fa733f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

4
src/amd/vulkan/radv_meta_etc_decode.c
View file

@ -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 =