commit d425dee662d15a074da981c2fa85d38dc5fd094c
author Robert Phillips <robertphillips@google.com> Fri Apr 26 11:12:24 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Apr 29 14:00:46 2019 +0000
tree cbae1858a3d29e617ecd3214c292cf9d4965f048
parent bc94e79eb7b6c0f370101012199c4753a336cc18

Enable opList sorting everywhere

This should have very little impact until we enable opList-splitting-reduction.

Change-Id: Iacc3d1b34c390b65b5ee185bcbdd118d5023aaa7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/210630
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

gn/flutter_defines.gni

diff --git a/gn/flutter_defines.gni b/gn/flutter_defines.gni
index e288410..ac79aad 100644
--- a/gn/flutter_defines.gni
+++ b/gn/flutter_defines.gni
@@ -3,7 +3,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 flutter_defines = [
-  "SK_DISABLE_OPLIST_SORTING",
   "SK_LEGACY_SKCODEC_NONE_ENUM",
 
   # Flutter always wants this https://github.com/flutter/flutter/issues/11402

include/gpu/GrContextOptions.h

diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 9c674ac..70bdc19 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -146,14 +146,7 @@
     Enable fUseDrawInsteadOfClear = Enable::kDefault;
 
     /**
-     * Allow Ganesh to sort the opLists prior to allocating resources. This is an optional
-     * behavior but, eventually, this will just be what is done and will not be optional.
-     */
-    Enable fSortRenderTargets = Enable::kDefault;
-
-    /**
-     * Allow Ganesh to more aggressively reorder operations. This is an optional
-     * behavior that is only relevant when 'fSortRenderTargets' is enabled.
+     * Allow Ganesh to more aggressively reorder operations.
      * Eventually this will just be what is done and will not be optional.
      */
     Enable fReduceOpListSplitting = Enable::kDefault;

src/gpu/GrLegacyDirectContext.cpp

diff --git a/src/gpu/GrLegacyDirectContext.cpp b/src/gpu/GrLegacyDirectContext.cpp
index 6fccc6b..d187b2a 100644
--- a/src/gpu/GrLegacyDirectContext.cpp
+++ b/src/gpu/GrLegacyDirectContext.cpp
@@ -24,12 +24,6 @@
 #include "src/gpu/vk/GrVkGpu.h"
 #endif
 
-#ifdef SK_DISABLE_OPLIST_SORTING
-static const bool kDefaultSortOpLists = false;
-#else
-static const bool kDefaultSortOpLists = true;
-#endif
-
 class SK_API GrLegacyDirectContext : public GrContext {
 public:
     GrLegacyDirectContext(GrBackendApi backend, const GrContextOptions& options)
@@ -79,14 +73,7 @@
             return false;
         }
 
-        bool sortOpLists = kDefaultSortOpLists;
-        if (GrContextOptions::Enable::kNo == this->options().fSortRenderTargets) {
-            sortOpLists = false;
-        } else if (GrContextOptions::Enable::kYes == this->options().fSortRenderTargets) {
-            sortOpLists = true;
-        }
-
-        this->setupDrawingManager(sortOpLists);
+        this->setupDrawingManager(true);
 
         SkASSERT(this->caps());