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

Totally block trying to flush a ddl drawmgr

Browse Source 
This should never be possible.

Bug: skia:10877
Change-Id: I476ece42182b2296da528a2b3a3a2587c5bfedea
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/332719
Auto-Submit: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Adlai Holler 2020-11-06 12:34:56 -05:00 committed by Skia Commit-Bot
parent b8123cc877
commit aee25fd65a
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gpu/GrDrawingManager.cpp
View File

@ -208,15 +208,7 @@ bool GrDrawingManager::flush(
} }
auto direct = fContext->asDirectContext(); auto direct = fContext->asDirectContext();
if (!direct) { SkASSERT(direct);
if (info.fSubmittedProc) {
info.fSubmittedProc(info.fSubmittedContext, false);
}
if (info.fFinishedProc) {
info.fFinishedProc(info.fFinishedContext);
}
return false; // Can't flush while DDL recording
}
direct->priv().clientMappedBufferManager()->process(); direct->priv().clientMappedBufferManager()->process();
GrGpu* gpu = direct->priv().getGpu(); GrGpu* gpu = direct->priv().getGpu();
@ -534,16 +526,7 @@ GrSemaphoresSubmitted GrDrawingManager::flushSurfaces(
SkASSERT(!numProxies || proxies); SkASSERT(!numProxies || proxies);
auto direct = fContext->asDirectContext(); auto direct = fContext->asDirectContext();
if (!direct) { SkASSERT(direct);
if (info.fSubmittedProc) {
info.fSubmittedProc(info.fSubmittedContext, false);
}
if (info.fFinishedProc) {
info.fFinishedProc(info.fFinishedContext);
}
return GrSemaphoresSubmitted::kNo; // Can't flush while DDL recording
}
GrGpu* gpu = direct->priv().getGpu(); GrGpu* gpu = direct->priv().getGpu();
// We have a non abandoned and direct GrContext. It must have a GrGpu. // We have a non abandoned and direct GrContext. It must have a GrGpu.
SkASSERT(gpu); SkASSERT(gpu);