Revert "Always explicitly allocate except in Android Framework (take 2)"
This reverts commit 88b93da63d46600f78c34759a83f47bc250d5456.
Reason for revert: Chrome
Original change's description:
> Always explicitly allocate except in Android Framework (take 2)
>
> This will turn on explicit allocation (w/o opList sorting) in Chrome. It leaves the old allocation system in place in Android Framework and some of Skia's older bots.
>
> We want:
> Flutter and Chrome to always explicitly allocate but not sort opLists outside of DDLs
> Android to never explicitly allocate and, thus, automatically never sort opLists
>
> This cannot land until after the following Chrome CL lands:
>
> https://chromium-review.googlesource.com/c/chromium/src/+/1516096 (Disable opList sorting within Skia)
>
>
> Change-Id: Ic7d6a1a77a08f2fe42324773f62cccf8175ab3d7
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/199931
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: Ida481ee9833d6db366b3d315fb4e9850d7c005ab
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/200506
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrLegacyDirectContext.cpp b/src/gpu/GrLegacyDirectContext.cpp
index d5bce1b..75fb6e1 100644
--- a/src/gpu/GrLegacyDirectContext.cpp
+++ b/src/gpu/GrLegacyDirectContext.cpp
@@ -24,12 +24,6 @@
#include "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,7 +73,7 @@
return false;
}
- bool sortOpLists = kDefaultSortOpLists;
+ bool sortOpLists = this->explicitlyAllocateGPUResources();
if (GrContextOptions::Enable::kNo == this->options().fSortRenderTargets) {
sortOpLists = false;
} else if (GrContextOptions::Enable::kYes == this->options().fSortRenderTargets) {