diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-02-07 16:02:38 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-07 16:02:50 +0000 |
| commit | 8e546043c6d421b82c8f8945f9688e6d64c76a06 (patch) | |
| tree | f186323839b9216734b7b3ffbc6739006b7021d7 /include | |
| parent | 7558e4dbecac109c5e971f5d028b847070e773e7 (diff) | |
Revert "Re-enable explicit resource allocation in Skia (take 2)"
This reverts commit ed858ec0951a10bc8bef1f883c925e1ac5e5766f.
Reason for revert: Breaking some text GMs
Original change's description:
> Re-enable explicit resource allocation in Skia (take 2)
>
> Unsurprisingly, given how we're adding them to the opList's deferredProxy list, a proxy can appear twice.
>
> Change-Id: I474357a1c3ee8cedf51dbeffcd0e0a96f396375c
> Reviewed-on: https://skia-review.googlesource.com/103701
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com
Change-Id: I90aa30c37bfc506e5a8e4c2ccf3bd1b968fd9c5f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/105100
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/GrOpList.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/private/GrOpList.h b/include/private/GrOpList.h index 5359a42930..c9abd6d4e5 100644 --- a/include/private/GrOpList.h +++ b/include/private/GrOpList.h @@ -16,9 +16,9 @@ // Turn on/off the explicit distribution of GPU resources at flush time -//#ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION -// #define SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION -//#endif +#ifndef SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION + #define SK_DISABLE_EXPLICIT_GPU_RESOURCE_ALLOCATION +#endif // Turn on/off the sorting of opLists at flush time #ifndef SK_DISABLE_RENDER_TARGET_SORTING @@ -111,7 +111,7 @@ public: void setStencilLoadOp(GrLoadOp loadOp) { fStencilLoadOp = loadOp; } protected: - bool isInstantiated() const; + SkDEBUGCODE(bool isInstantiated() const;) GrSurfaceProxyRef fTarget; GrAuditTrail* fAuditTrail; |