Emulation/skyline
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Only clear requested aspect for depth/stencil clears

Browse source 
Fixes water in Skyrim (depth was being cleared when only stencil should have been)
This commit is contained in:
Billy Laws 2023-02-20 13:41:35 +00:00
parent 330f402398
commit 34fddfccba
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/maxwell_3d.cpp
View file

@ -182,18 +182,22 @@ namespace skyline::gpu::interconnect::maxwell3d {
ctx.executor.AttachTexture(&*view);
bool viewHasDepth{view->range.aspectMask & vk::ImageAspectFlagBits::eDepth}, viewHasStencil{view->range.aspectMask & vk::ImageAspectFlagBits::eStencil};
vk::ImageAspectFlags clearAspectMask{(clearSurface.zEnable ? vk::ImageAspectFlagBits::eDepth : vk::ImageAspectFlags{}) |
(clearSurface.stencilEnable ? vk::ImageAspectFlagBits::eStencil : vk::ImageAspectFlags{})};
clearAspectMask &= view->range.aspectMask;
vk::ClearDepthStencilValue clearValue{
.depth = clearEngineRegisters.depthClearValue,
.stencil = clearEngineRegisters.stencilClearValue
};
if (!viewHasDepth && !viewHasStencil) {
if (!clearAspectMask) {
Logger::Warn("Depth stencil RT used in clear lacks depth or stencil aspects"); // TODO: Drop this check after texman rework
return;
}
if (needsAttachmentClearCmd(view) || (!clearSurface.stencilEnable && viewHasStencil) || (!clearSurface.zEnable && viewHasDepth)) { // Subpass clears write to all aspects of the texture, so we can't use them when only one component is enabled
clearAttachments.push_back({.aspectMask = view->range.aspectMask, .clearValue = clearValue});
if (needsAttachmentClearCmd(view) || (clearAspectMask != view->range.aspectMask)) { // Subpass clears write to all aspects of the texture, so we can't use them when only one component is enabled
clearAttachments.push_back({.aspectMask = clearAspectMask, .clearValue = clearValue});
depthStencilView = view;
} else {
ctx.executor.AddClearDepthStencilSubpass(&*view, clearValue);