lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-08-28 09:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated DLSSG Vk barrier fixup

Browse Source 
Not fully tested
This commit is contained in:
FakeMichau
2026-07-01 00:57:34 +02:00
parent 7133731ccb
commit f7fddf05f1
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/hooks/VulkanwDx12_Hooks.cpp
+17 -13
View File
@@ -1058,24 +1058,28 @@ void Vulkan_wDx12::hk_vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipe
// AMD drivers on the cards around RDNA2 didn't treat VK_IMAGE_LAYOUT_UNDEFINED in the same way Nvidia does.
// Doesn't seem like a bug, just a different way of handling an UB but we need to adjust.
// DLSSG Present
if (imageMemoryBarrierCount == 2)
for (size_t i = 0; i < imageMemoryBarrierCount; i++)
{
if (pImageMemoryBarriers[0].oldLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR &&
pImageMemoryBarriers[0].newLayout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL &&
pImageMemoryBarriers[1].oldLayout == VK_IMAGE_LAYOUT_UNDEFINED &&
pImageMemoryBarriers[1].newLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL)
if (pImageMemoryBarriers[i].oldLayout == VK_IMAGE_LAYOUT_UNDEFINED &&
pImageMemoryBarriers[i].newLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL)
{
LOG_TRACE("Changing an UNDEFINED barrier in DLSSG Present");
LOG_TRACE("Changing an UNDEFINED barrier in DLSSG Present, imageMemoryBarrierCount: {}",
imageMemoryBarrierCount);
VkImageMemoryBarrier newImageBarriers[2];
std::memcpy(newImageBarriers, pImageMemoryBarriers, sizeof(newImageBarriers));
VkImageMemoryBarrier* newImageBarriers = new VkImageMemoryBarrier[imageMemoryBarrierCount];
newImageBarriers[1].oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
std::memcpy(newImageBarriers, pImageMemoryBarriers,
sizeof(*newImageBarriers) * imageMemoryBarrierCount);
return o_vkCmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags,
memoryBarrierCount, pMemoryBarriers, bufferMemoryBarrierCount,
pBufferMemoryBarriers, imageMemoryBarrierCount, newImageBarriers);
newImageBarriers[i].oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
o_vkCmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount,
pMemoryBarriers, bufferMemoryBarrierCount, pBufferMemoryBarriers,
imageMemoryBarrierCount, newImageBarriers);
delete[] newImageBarriers;
return;
}
}