commit 2188e09490d09c54e604bf9a3c2b6fe7912520f3
author Robert Phillips <robertphillips@google.com> Thu Nov 09 13:57:06 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 10 12:39:17 2017 +0000
tree 2017a10a9030791c3598a09931afc6f5d0be80fa
parent 832536627766185a3fa3baf2bbf145a545d001a1

Update MDB flags to match switches in Chrome & Android

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>

src/gpu/GrDrawingManager.cpp

diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 1aaa6f7..cce5471 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -129,7 +129,7 @@
     }
 #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 @@
             fOpLists[i]->gatherProxyIntervals(&alloc);
         }
 
-#ifdef MDB_ALLOC_RESOURCES
+#ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION
         alloc.assign();
 #endif
     }