AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix GPU capture for Metal test apps.

Browse Source 
Creating the next command buffer immediately seems to confuse
the Metal GPU capture command in Xcode. If the command buffer isn't
used until the next frame it apparently doesn't include it in the
capture. The solution is to delay creation until we first need it.

Change-Id: I95fea78a68356d319418ca15bd852e34d9efa12b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/329416
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2020-10-23 15:14:38 -04:00 committed by Skia Commit-Bot
parent 189ecd485a
commit ddb3c34cd5
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpu/mtl/GrMtlGpu.h
View File

@ -48,10 +48,7 @@ public:
GrMtlResourceProvider& resourceProvider() { return fResourceProvider; }
GrMtlCommandBuffer* commandBuffer() {
SkASSERT(fCurrentCmdBuffer);
return fCurrentCmdBuffer.get();
}
GrMtlCommandBuffer* commandBuffer();
enum SyncQueue {
kForce_SyncQueue,

33
src/gpu/mtl/GrMtlGpu.mm
View File

@ -192,6 +192,16 @@ GrOpsRenderPass* GrMtlGpu::getOpsRenderPass(
return new GrMtlOpsRenderPass(this, renderTarget, origin, colorInfo, stencilInfo);
}
GrMtlCommandBuffer* GrMtlGpu::commandBuffer() {
if (!fCurrentCmdBuffer) {
// Create a new command buffer for the next submit
fCurrentCmdBuffer = GrMtlCommandBuffer::Make(fQueue);
}
SkASSERT(fCurrentCmdBuffer);
return fCurrentCmdBuffer.get();
}
void GrMtlGpu::takeOwnershipOfBuffer(sk_sp<GrGpuBuffer> buffer) {
SkASSERT(fCurrentCmdBuffer);
fCurrentCmdBuffer->addGrBuffer(std::move(buffer));
@ -204,8 +214,7 @@ void GrMtlGpu::submit(GrOpsRenderPass* renderPass) {
}
bool GrMtlGpu::submitCommandBuffer(SyncQueue sync) {
SkASSERT(fCurrentCmdBuffer);
if (!fCurrentCmdBuffer->hasWork()) {
if (!fCurrentCmdBuffer || !fCurrentCmdBuffer->hasWork()) {
if (sync == SyncQueue::kForce_SyncQueue) {
// wait for the last command buffer we've submitted to finish
OutstandingCommandBuffer* back =
@ -217,10 +226,13 @@ bool GrMtlGpu::submitCommandBuffer(SyncQueue sync) {
}
// We need to manually call the finishedCallbacks since we don't add this
// to the OutstandingCommandBuffer list
fCurrentCmdBuffer->callFinishedCallbacks();
if (fCurrentCmdBuffer) {
fCurrentCmdBuffer->callFinishedCallbacks();
}
return true;
}
SkASSERT(fCurrentCmdBuffer);
GrFence fence = this->insertFence();
new (fOutstandingCommandBuffers.push_back()) OutstandingCommandBuffer(
fCurrentCmdBuffer, fence);
@ -229,15 +241,16 @@ bool GrMtlGpu::submitCommandBuffer(SyncQueue sync) {
return false;
}
// Create a new command buffer for the next submit
fCurrentCmdBuffer = GrMtlCommandBuffer::Make(fQueue);
// We don't create a new command buffer here because we may end up using it
// in the next frame, and that confuses the GPU debugger. Instead we
// create when we next need one.
fCurrentCmdBuffer = nullptr;
// This should be done after we have a new command buffer in case the freeing of any
// resources held by a finished command buffer causes us to send a new command to the gpu
// (like changing the resource state).
// If the freeing of any resources held by a finished command buffer causes us to send
// a new command to the gpu (like changing the resource state) we'll create the new
// command buffer in commandBuffer(), above.
this->checkForFinishedCommandBuffers();
SkASSERT(fCurrentCmdBuffer);
return true;
}
@ -278,7 +291,7 @@ void GrMtlGpu::addFinishedCallback(sk_sp<GrRefCntedCallback> finishedCallback) {
if (back) {
back->fCommandBuffer->addFinishedCallback(finishedCallback);
}
fCurrentCmdBuffer->addFinishedCallback(std::move(finishedCallback));
commandBuffer()->addFinishedCallback(std::move(finishedCallback));
}
bool GrMtlGpu::onSubmitToGpu(bool syncCpu) {