The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-26 23:14:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Skip clears if attachments are invalid

Browse Source
This commit is contained in:
Billy Laws 2022-09-29 20:53:41 +01:00
parent 01a5e95ce1
commit af1b4ca4f8
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/maxwell_3d.cpp
View File

@ -135,49 +135,53 @@ namespace skyline::gpu::interconnect::maxwell3d {
std::shared_ptr<TextureView> depthStencilView{}; std::shared_ptr<TextureView> depthStencilView{};
if (clearSurface.rEnable || clearSurface.gEnable || clearSurface.bEnable || clearSurface.aEnable) { if (clearSurface.rEnable || clearSurface.gEnable || clearSurface.bEnable || clearSurface.aEnable) {
colorView = activeState.GetColorRenderTargetForClear(ctx, clearSurface.mrtSelect); if (auto view{activeState.GetColorRenderTargetForClear(ctx, clearSurface.mrtSelect)}) {
ctx.executor.AttachTexture(&*colorView); ctx.executor.AttachTexture(&*view);
if (!(clearSurface.rEnable && clearSurface.gEnable && clearSurface.bEnable && clearSurface.aEnable)) if (!(clearSurface.rEnable && clearSurface.gEnable && clearSurface.bEnable && clearSurface.aEnable))
Logger::Warn("Partial clears are unimplemented! Performing full clear instead"); Logger::Warn("Partial clears are unimplemented! Performing full clear instead");
if (!(colorView->range.aspectMask & vk::ImageAspectFlagBits::eColor)) { if (!(view->range.aspectMask & vk::ImageAspectFlagBits::eColor)) {
Logger::Warn("Colour RT used in clear lacks colour aspect"); // TODO: Drop this check after texman rework Logger::Warn("Colour RT used in clear lacks colour aspect"); // TODO: Drop this check after texman rework
return; return;
} }
if (needsAttachmentClearCmd(colorView)) { if (needsAttachmentClearCmd(view)) {
clearAttachments.push_back({ .aspectMask = colorView->range.aspectMask, .clearValue = {clearEngineRegisters.colorClearValue} }); clearAttachments.push_back({.aspectMask = view->range.aspectMask, .clearValue = {clearEngineRegisters.colorClearValue}});
} else { colorView = view;
ctx.executor.AddClearColorSubpass(&*colorView, clearEngineRegisters.colorClearValue); } else {
colorView = {}; // Will avoid adding as colour RT ctx.executor.AddClearColorSubpass(&*view, clearEngineRegisters.colorClearValue);
}
} }
} }
if (clearSurface.stencilEnable || clearSurface.zEnable) { if (clearSurface.stencilEnable || clearSurface.zEnable) {
depthStencilView = activeState.GetDepthRenderTargetForClear(ctx); if (auto view{activeState.GetDepthRenderTargetForClear(ctx)}) {
ctx.executor.AttachTexture(&*depthStencilView); ctx.executor.AttachTexture(&*view);
bool viewHasDepth{depthStencilView->range.aspectMask & vk::ImageAspectFlagBits::eDepth}, viewHasStencil{depthStencilView->range.aspectMask & vk::ImageAspectFlagBits::eStencil}; bool viewHasDepth{view->range.aspectMask & vk::ImageAspectFlagBits::eDepth}, viewHasStencil{view->range.aspectMask & vk::ImageAspectFlagBits::eStencil};
vk::ClearDepthStencilValue clearValue{ vk::ClearDepthStencilValue clearValue{
.depth = clearEngineRegisters.depthClearValue, .depth = clearEngineRegisters.depthClearValue,
.stencil = clearEngineRegisters.stencilClearValue .stencil = clearEngineRegisters.stencilClearValue
}; };
if (!viewHasDepth && !viewHasStencil) {
Logger::Warn("Depth stencil RT used in clear lacks depth or stencil aspects"); // TODO: Drop this check after texman rework
return;
}
if (!viewHasDepth && !viewHasStencil) { 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
Logger::Warn("Depth stencil RT used in clear lacks depth or stencil aspects"); // TODO: Drop this check after texman rework clearAttachments.push_back({.aspectMask = view->range.aspectMask, .clearValue = clearValue});
return; depthStencilView = view;
} } else {
ctx.executor.AddClearDepthStencilSubpass(&*view, clearValue);
if (needsAttachmentClearCmd(depthStencilView) || (!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 = depthStencilView->range.aspectMask, .clearValue = clearValue });
} else {
ctx.executor.AddClearDepthStencilSubpass(&*depthStencilView, clearValue);
depthStencilView = {}; // Will avoid adding as depth-stencil RT
} }
} }
if (clearAttachments.empty())
return;
// Always use surfaceClip for render area since it's more likely to match the renderArea of draws and avoid an RP break // Always use surfaceClip for render area since it's more likely to match the renderArea of draws and avoid an RP break
const auto &surfaceClip{clearEngineRegisters.surfaceClip}; const auto &surfaceClip{clearEngineRegisters.surfaceClip};
vk::Rect2D renderArea{{surfaceClip.horizontal.x, surfaceClip.vertical.y}, {surfaceClip.horizontal.width, surfaceClip.vertical.height}}; vk::Rect2D renderArea{{surfaceClip.horizontal.x, surfaceClip.vertical.y}, {surfaceClip.horizontal.width, surfaceClip.vertical.height}};