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

panfrost/vk: Use correct sampler dimensions for MSAA

Browse source 
2D-MS samplers are SAMPLER_DIM_MS, not SAMPLER_DIM_2D. There is no MSAA
for non-2D textures.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Closes: mesa/mesa#9474
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24494>
This commit is contained in:
Daniel Stone 2023-08-04 12:39:40 +01:00 • committed by Marge Bot
parent f5074adeb5
commit cfa23e6690
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/panfrost/vulkan/panvk_vX_meta_copy.c
View file

@ -314,12 +314,14 @@ panvk_meta_copy_img2img_shader(struct panfrost_device *pdev,
switch (texdim) {
case 1:
assert(!is_ms);
tex->sampler_dim = GLSL_SAMPLER_DIM_1D;
break;
case 2:
tex->sampler_dim = GLSL_SAMPLER_DIM_2D;
tex->sampler_dim = is_ms ? GLSL_SAMPLER_DIM_MS : GLSL_SAMPLER_DIM_2D;
break;
case 3:
assert(!is_ms);
tex->sampler_dim = GLSL_SAMPLER_DIM_3D;
break;
default:
@ -702,8 +704,8 @@ panvk_meta_copy_img2img_init(struct panvk_physical_device *dev, bool is_ms)
unsigned texdimidx = panvk_meta_copy_tex_type(texdim, false);
assert(texdimidx < ARRAY_SIZE(dev->meta.copy.img2img[0]));
/* No MSAA on 3D textures */
if (texdim == 3 && is_ms)
/* No MSAA on 1D/3D textures */
if (texdim != 2 && is_ms)
continue;
struct pan_shader_info shader_info;