fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Zero zcull data in layout transition

Browse source 
We should have never been doing this as bind time. Instead, layout
transitions out of UNDEFINED are in the spec specifically so the
driver has a point where it can do initialization, so do our init there
instead.

Reviewed-by: Mary Guillemard <mary@mary.zone>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41275>
This commit is contained in:
Mel Henning 2026-04-06 17:38:51 -04:00 • committed by Marge Bot
parent cb29829f72
commit 8d054c390e
3 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/nouveau/vulkan/nvk_cmd_buffer.c
View file

@ -754,6 +754,25 @@ nvk_cmd_invalidate_deps(struct nvk_cmd_buffer *cmd,
P_IMMD(p, NVB1C0, INVALIDATE_SKED_CACHES, 0);
}
static void
nvk_cmd_image_layout_transition(struct nvk_cmd_buffer *cmd,
const VkDependencyInfo *dep)
{
for (uint32_t i = 0; i < dep->imageMemoryBarrierCount; i++) {
const VkImageMemoryBarrier2 *bar = &dep->pImageMemoryBarriers[i];
if (bar->oldLayout == VK_IMAGE_LAYOUT_UNDEFINED &&
bar->newLayout != VK_IMAGE_LAYOUT_UNDEFINED) {
VK_FROM_HANDLE(nvk_image, image, bar->image);
/*
* zcull hardware kills the context if we try to LOAD_ZCULL on garbage
* data. Handle this by initializing the zcull data to zero.
*/
if (image->zcull.nil.size_B > 0)
nvk_cmd_fill_memory(cmd, image->zcull.addr, image->zcull.nil.size_B, 0);
}
}
}
VKAPI_ATTR void VKAPI_CALL
nvk_CmdPipelineBarrier2(VkCommandBuffer commandBuffer,
const VkDependencyInfo *pDependencyInfo)
@ -761,6 +780,7 @@ nvk_CmdPipelineBarrier2(VkCommandBuffer commandBuffer,
VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
nvk_cmd_flush_wait_dep(cmd, pDependencyInfo, true);
nvk_cmd_image_layout_transition(cmd, pDependencyInfo);
nvk_cmd_invalidate_deps(cmd, 1, pDependencyInfo);
}

7
src/nouveau/vulkan/nvk_host_copy.c
View file

@ -572,6 +572,11 @@ nvk_TransitionImageLayoutEXT(VkDevice device,
uint32_t transitionCount,
const VkHostImageLayoutTransitionInfoEXT *transitions)
{
/* Nothing to do here */
for (uint32_t t = 0; t < transitionCount; t++) {
VK_FROM_HANDLE(nvk_image, image, transitions[t].image);
/* Zcull is disabled for VK_IMAGE_USAGE_HOST_TRANSFER_BIT */
assert(image->zcull.nil.size_B == 0);
}
return VK_SUCCESS;
}

14
src/nouveau/vulkan/nvk_image.c
View file

@ -1698,20 +1698,6 @@ nvk_bind_image_memory(struct nvk_device *dev,
result = nvk_image_zcull_bind(&image->zcull, mem, offset_B);
if (result != VK_SUCCESS)
return result;
/*
* zcull hardware kills the context if we try to LOAD_ZCULL on garbage
* data. Work around this by always initializing the zcull data to zero.
*/
result = nvk_upload_queue_fill(dev, &dev->upload,
image->zcull.addr,
0, image->zcull.nil.size_B);
if (result != VK_SUCCESS)
return result;
result = nvk_upload_queue_sync(dev, &dev->upload);
if (result != VK_SUCCESS)
return result;
}
if (image->stencil_copy_temp.nil.size_B > 0) {