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

Update MDB flags to match switches in Chrome & Android

Browse Source 
Change-Id: Ifea5879ab83499c9b1a3572747088f9233b20074
Reviewed-on: https://skia-review.googlesource.com/69540
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2017-11-09 13:57:06 -05:00 committed by Skia Commit-Bot
parent 8325366277
commit 2188e09490
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gpu/GrDrawingManager.cpp
View File

@ -129,7 +129,7 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*,
} }
#endif #endif
#ifdef ENABLE_MDB_SORT #ifndef SK_DISABLE_RENDER_TARGET_SORTING
SkDEBUGCODE(bool result =) SkDEBUGCODE(bool result =)
SkTTopoSort<GrOpList, GrOpList::TopoSortTraits>(&fOpLists); SkTTopoSort<GrOpList, GrOpList::TopoSortTraits>(&fOpLists);
SkASSERT(result); SkASSERT(result);
@ -177,7 +177,7 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*,
fOpLists[i]->gatherProxyIntervals(&alloc); fOpLists[i]->gatherProxyIntervals(&alloc);
} }
#ifdef MDB_ALLOC_RESOURCES #ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION
alloc.assign(); alloc.assign();
#endif #endif
} }

2
src/gpu/GrOpList.cpp
View File

@ -32,7 +32,7 @@ GrOpList::GrOpList(GrResourceProvider* resourceProvider,
fTarget.setProxy(sk_ref_sp(surfaceProxy), kWrite_GrIOType); fTarget.setProxy(sk_ref_sp(surfaceProxy), kWrite_GrIOType);
fTarget.get()->setLastOpList(this); fTarget.get()->setLastOpList(this);
#ifndef MDB_ALLOC_RESOURCES #ifdef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION
// MDB TODO: remove this! We are currently moving to having all the ops that target // MDB TODO: remove this! We are currently moving to having all the ops that target
// the RT as a dest (e.g., clear, etc.) rely on the opList's 'fTarget' pointer // the RT as a dest (e.g., clear, etc.) rely on the opList's 'fTarget' pointer
// for the IO Ref. This works well but until they are all swapped over (and none // for the IO Ref. This works well but until they are all swapped over (and none

4
src/gpu/GrOpList.h
View File

@ -15,10 +15,10 @@
// Turn on/off the explicit distribution of GPU resources at flush time // Turn on/off the explicit distribution of GPU resources at flush time
//#define MDB_ALLOC_RESOURCES 1 #define SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION
// Turn on/off the sorting of opLists at flush time // Turn on/off the sorting of opLists at flush time
//#define ENABLE_MDB_SORT 1 #define SK_DISABLE_RENDER_TARGET_SORTING
class GrAuditTrail; class GrAuditTrail;
class GrCaps; class GrCaps;

2
src/gpu/GrRenderTargetContext.cpp
View File

@ -158,7 +158,7 @@ GrRenderTargetContext::GrRenderTargetContext(GrContext* context,
, fInstancedPipelineInfo(fRenderTargetProxy.get()) , fInstancedPipelineInfo(fRenderTargetProxy.get())
, fSurfaceProps(SkSurfacePropsCopyOrDefault(surfaceProps)) , fSurfaceProps(SkSurfacePropsCopyOrDefault(surfaceProps))
, fManagedOpList(managedOpList) { , fManagedOpList(managedOpList) {
#ifndef MDB_ALLOC_RESOURCES #ifdef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION
// MDB TODO: to ensure all resources still get allocated in the correct order in the hybrid // MDB TODO: to ensure all resources still get allocated in the correct order in the hybrid
// world we need to get the correct opList here so that it, in turn, can grab and hold // world we need to get the correct opList here so that it, in turn, can grab and hold
// its rendertarget. // its rendertarget.