OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: Remove ZS texture_swizzle_replicate_x

Browse Source 
The texture_swizzle_replicate_x functionality appears not to be required
for Vulkan anymore, so let's remove it.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32515>
This commit is contained in:
Lars-Ivar Hesselberg Simonsen
2024-12-06 13:32:13 +01:00
parent 12f69d26dc
commit 5e5f4432cf
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/panfrost/vulkan/panvk_vX_buffer_view.c
View File

@@ -90,11 +90,6 @@ panvk_per_arch(CreateBufferView)(VkDevice _device,
}, },
}; };
#if PAN_ARCH >= 7
/* v7+ doesn't have an _RRRR component order. */
if (util_format_is_depth_or_stencil(pfmt))
GENX(panfrost_texture_swizzle_replicate_x)(&pview);
#endif
#if PAN_ARCH == 7 #if PAN_ARCH == 7
/* v7 requires AFBC reswizzle. */ /* v7 requires AFBC reswizzle. */
if (!util_format_is_depth_or_stencil(pfmt) && if (!util_format_is_depth_or_stencil(pfmt) &&

7
src/panfrost/vulkan/panvk_vX_image_view.c
View File

@@ -89,8 +89,7 @@ prepare_tex_descs(struct panvk_image_view *view)
if (util_format_is_depth_or_stencil(view->pview.format)) { if (util_format_is_depth_or_stencil(view->pview.format)) {
/* Vulkan wants R001, where the depth/stencil is stored in the red /* Vulkan wants R001, where the depth/stencil is stored in the red
* component, but the pan_format/texture logic gives us RRRR. * component. Tweak the swizzle so we get what Vulkan wants.
* Tweak the swizzle so we get what Vulkan wants.
*/ */
static const unsigned char r001[4] = { static const unsigned char r001[4] = {
PIPE_SWIZZLE_X, PIPE_SWIZZLE_X,
@@ -100,10 +99,6 @@ prepare_tex_descs(struct panvk_image_view *view)
}; };
util_format_compose_swizzles(r001, view->pview.swizzle, pview.swizzle); util_format_compose_swizzles(r001, view->pview.swizzle, pview.swizzle);
#if PAN_ARCH >= 7
GENX(panfrost_texture_swizzle_replicate_x)(&pview);
#endif
} }
#if PAN_ARCH == 7 #if PAN_ARCH == 7
/* v7 requires AFBC reswizzle. */ /* v7 requires AFBC reswizzle. */