fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: texture swizzle depth/stencil fix

Browse source 
With the currrent state of things when setting up the texture state
word we need to make sure the swizzle is obtained from a format
compatible with the TPU.

Signed-off-by: Simon Perretta <simon.perretta@imgtec.com>
Co-authored-by: Luigi Santivetti <luigi.santivetti@imgtec.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36412>
This commit is contained in:
Simon Perretta 2023-09-18 10:04:15 +01:00 • committed by Marge Bot
parent 231755f517
commit ef55f836bc
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/imagination/vulkan/pvr_image.c
View file

@ -322,7 +322,7 @@ VkResult pvr_CreateImageView(VkDevice _device,
info.base_level = iview->vk.base_mip_level;
info.mip_levels = iview->vk.level_count;
info.extent = image->vk.extent;
info.aspect_mask = image->vk.aspects;
info.aspect_mask = iview->vk.aspects;
info.is_cube = (info.type == VK_IMAGE_VIEW_TYPE_CUBE ||
info.type == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY);
info.array_size = iview->vk.layer_count;
@ -341,7 +341,29 @@ VkResult pvr_CreateImageView(VkDevice _device,
pvr_adjust_non_compressed_view(image, &info);
vk_component_mapping_to_pipe_swizzle(iview->vk.swizzle, input_swizzle);
format_swizzle = pvr_get_format_swizzle(info.format);
enum pipe_format pipe_format =
vk_format_to_pipe_format(iview->vk.view_format);
if (util_format_is_depth_or_stencil(pipe_format)) {
switch (pipe_format) {
case PIPE_FORMAT_S8_UINT:
pipe_format = PIPE_FORMAT_R8_UINT;
break;
case PIPE_FORMAT_Z16_UNORM:
pipe_format = PIPE_FORMAT_R16_UINT;
break;
case PIPE_FORMAT_Z32_FLOAT:
pipe_format = PIPE_FORMAT_R32_FLOAT;
break;
default:
break;
}
}
format_swizzle = util_format_description(pipe_format)->swizzle;
util_format_compose_swizzles(format_swizzle, input_swizzle, info.swizzle);
result = pvr_pack_tex_state(device,