Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix depth/stencil clearing broken during recent fix.

Browse Source 
A recent change for resolving color formats mistakenly
broke clearing depth and stencil formats.
Remove optionality of all function arguments in
MVKRenderPassAttachment::populateMTLRenderPassAttachmentDescriptor()
to avoid bad calls being masked by optional function arguments.
Add appropriate canResolveFormat values for all calls to that function.
This commit is contained in:
Bill Hollings 2021-08-20 13:58:32 -04:00
parent ce583f4f3d
commit ff7ea713f6
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h
View File

@ -191,7 +191,7 @@ public:
bool hasResolveAttachment,
bool canResolveFormat,
bool isStencil,
bool loadOverride = false);
bool loadOverride);
/** If a render encoder is active, sets the store action for this attachment to it. */
void encodeStoreAction(MVKCommandEncoder* cmdEncoder,

12
MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm
View File

@ -275,10 +275,9 @@ void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor*
isMemorylessAttachment = dsImage->getMTLTexture(0).storageMode == MTLStorageModeMemoryless;
#endif
if (dsMVKRPAtt->populateMTLRenderPassAttachmentDescriptor(mtlDepthAttDesc, this,
isRenderingEntireAttachment,
isMemorylessAttachment,
hasResolveAttachment, false,
loadOverride)) {
isRenderingEntireAttachment, isMemorylessAttachment,
hasResolveAttachment, true,
false, loadOverride)) {
mtlDepthAttDesc.clearDepth = pixFmts->getMTLClearDepthValue(clearValues[dsRPAttIdx]);
}
if (isMultiview()) {
@ -303,10 +302,9 @@ void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor*
isMemorylessAttachment = dsImage->getMTLTexture(0).storageMode == MTLStorageModeMemoryless;
#endif
if (dsMVKRPAtt->populateMTLRenderPassAttachmentDescriptor(mtlStencilAttDesc, this,
isRenderingEntireAttachment,
isMemorylessAttachment,
isRenderingEntireAttachment, isMemorylessAttachment,
hasResolveAttachment, true,
loadOverride)) {
true, loadOverride)) {
mtlStencilAttDesc.clearStencil = pixFmts->getMTLClearStencilValue(clearValues[dsRPAttIdx]);
}
if (isMultiview()) {