AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: Fix depth/stencil image views

Browse Source 
Vulkan wants an R001 pattern, where the depth/stencil is stored in
the red component, but the pan_format/texture logic gives us RRRR.
Tweak the swizzle so we get what Vulkan wants.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28417>
This commit is contained in:
Boris Brezillon
2024-03-28 10:48:12 +01:00
committed by Marge Bot
parent b40dad1d59
commit 0eec8b0ff6
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/vulkan/panvk_vX_image_view.c
+22 -2
View File
@@ -99,8 +99,28 @@ panvk_per_arch(CreateImageView)(VkDevice _device,
if (view->vk.usage &
(VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)) {
/* Use a temporary pan_image_view so we can tweak it for texture
* descriptor emission without changing the original definition.
*/
struct pan_image_view pview = view->pview;
if (util_format_is_depth_or_stencil(view->pview.format)) {
/* Vulkan wants R001, where the depth/stencil is stored in the red
* component, but the pan_format/texture logic gives us RRRR.
* Tweak the swizzle so we get what Vulkan wants.
*/
static const unsigned char r001[4] = {
PIPE_SWIZZLE_X,
PIPE_SWIZZLE_0,
PIPE_SWIZZLE_0,
PIPE_SWIZZLE_1,
};
util_format_compose_swizzles(r001, view->pview.swizzle, pview.swizzle);
}
unsigned bo_size =
GENX(panfrost_estimate_texture_payload_size)(&view->pview);
GENX(panfrost_estimate_texture_payload_size)(&pview);
view->bo = panvk_priv_bo_create(device, bo_size, 0, pAllocator,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
@@ -110,7 +130,7 @@ panvk_per_arch(CreateImageView)(VkDevice _device,
.cpu = view->bo->addr.host,
};
GENX(panfrost_new_texture)(&view->pview, view->descs.tex.opaque, &ptr);
GENX(panfrost_new_texture)(&pview, view->descs.tex.opaque, &ptr);
}
if (view->vk.usage & VK_IMAGE_USAGE_STORAGE_BIT) {