diff options
| -rw-r--r-- | src/gpu/GrDrawingManager.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/GrOpList.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrOpList.h | 4 | ||||
| -rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 1aaa6f7ad2..cce5471aaa 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -129,7 +129,7 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*, } #endif -#ifdef ENABLE_MDB_SORT +#ifndef SK_DISABLE_RENDER_TARGET_SORTING SkDEBUGCODE(bool result =) SkTTopoSort<GrOpList, GrOpList::TopoSortTraits>(&fOpLists); SkASSERT(result); @@ -177,7 +177,7 @@ GrSemaphoresSubmitted GrDrawingManager::internalFlush(GrSurfaceProxy*, fOpLists[i]->gatherProxyIntervals(&alloc); } -#ifdef MDB_ALLOC_RESOURCES +#ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION alloc.assign(); #endif } diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp index 902ab89b7c..8fe053172e 100644 --- a/src/gpu/GrOpList.cpp +++ b/src/gpu/GrOpList.cpp @@ -32,7 +32,7 @@ GrOpList::GrOpList(GrResourceProvider* resourceProvider, fTarget.setProxy(sk_ref_sp(surfaceProxy), kWrite_GrIOType); 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 // 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 diff --git a/src/gpu/GrOpList.h b/src/gpu/GrOpList.h index cd0b50035e..d41b940e35 100644 --- a/src/gpu/GrOpList.h +++ b/src/gpu/GrOpList.h @@ -15,10 +15,10 @@ // 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 -//#define ENABLE_MDB_SORT 1 +#define SK_DISABLE_RENDER_TARGET_SORTING class GrAuditTrail; class GrCaps; diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index fd82920d34..ecb325af27 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -158,7 +158,7 @@ GrRenderTargetContext::GrRenderTargetContext(GrContext* context, , fInstancedPipelineInfo(fRenderTargetProxy.get()) , fSurfaceProps(SkSurfacePropsCopyOrDefault(surfaceProps)) , 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 // world we need to get the correct opList here so that it, in turn, can grab and hold // its rendertarget. |