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

MVKQueryPool: Fix ending a query outside a render pass.

Browse Source 
I missed this when I fixed occlusion queries begun outside a render
pass.
This commit is contained in:
Chip Davis 2020-09-25 15:22:40 -05:00
parent f319e9bd68
commit bbe45e4a8a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MoltenVK/MoltenVK/Commands/MVKCommandBuffer.h
View File

@ -290,6 +290,9 @@ public:
/** If a render encoder is active, encodes store actions for all attachments to it. */
void encodeStoreActions(bool storeOverride = false);
/** Returns whether or not we are presently in a render pass. */
bool isInRenderPass() { return _renderPass != nullptr; }
/** Returns the render subpass that is currently active. */
MVKRenderSubpass* getSubpass();

2
MoltenVK/MoltenVK/GPUObjects/MVKQueryPool.mm
View File

@ -31,7 +31,7 @@ using namespace std;
#pragma mark MVKQueryPool
void MVKQueryPool::endQuery(uint32_t query, MVKCommandEncoder* cmdEncoder) {
uint32_t queryCount = cmdEncoder->getSubpass()->getViewCountInMetalPass(cmdEncoder->getMultiviewPassIndex());
uint32_t queryCount = cmdEncoder->isInRenderPass() ? cmdEncoder->getSubpass()->getViewCountInMetalPass(cmdEncoder->getMultiviewPassIndex()) : 1;
lock_guard<mutex> lock(_availabilityLock);
for (uint32_t i = query; i < query + queryCount; ++i) {
_availability[i] = DeviceAvailable;