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

nvk: Use the image format for depth views

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36957>
This commit is contained in:
Faith Ekstrand 2025-09-05 16:32:43 -04:00 • committed by Marge Bot
parent 7527ad001a
commit 89110b8d1d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nouveau/vulkan/nvk_cmd_draw.c
View file

@ -1223,9 +1223,8 @@ nvk_CmdBeginRendering(VkCommandBuffer commandBuffer,
P_NV9097_SET_ZT_B(p, addr); P_NV9097_SET_ZT_B(p, addr);
/* We want the combined Z/S format for the SET_ZT_FORMAT packet */ /* We want the combined Z/S format for the SET_ZT_FORMAT packet */
const enum pipe_format zs_p_format = const uint8_t zs_format =
nvk_format_to_pipe_format(iview->vk.format); nil_format_to_depth_stencil(nil_image.format.p_format);
const uint8_t zs_format = nil_format_to_depth_stencil(zs_p_format);
if (pdev->info.cls_eng3d >= BLACKWELL_A) { if (pdev->info.cls_eng3d >= BLACKWELL_A) {
P_NVCD97_SET_ZT_FORMAT(p, { P_NVCD97_SET_ZT_FORMAT(p, {

4
src/nouveau/vulkan/nvk_image_view.c
View file

@ -158,7 +158,9 @@ nvk_image_view_init(struct nvk_device *dev,
if (image->separate_zs) if (image->separate_zs)
p_format = nil_image.format.p_format; p_format = nil_image.format.p_format;
else if (view->vk.aspects == VK_IMAGE_ASPECT_STENCIL_BIT) else if (view->vk.aspects == VK_IMAGE_ASPECT_STENCIL_BIT)
p_format = util_format_stencil_only(p_format); p_format = util_format_stencil_only(nil_image.format.p_format);
else if (view->vk.aspects & VK_IMAGE_ASPECT_DEPTH_BIT)
p_format = nil_image.format.p_format;
struct nil_view nil_view = { struct nil_view nil_view = {
.view_type = vk_image_view_type_to_nil_view_type(view->vk.view_type), .view_type = vk_image_view_type_to_nil_view_type(view->vk.view_type),