diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-02-07 08:37:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-07 14:22:58 +0000 |
| commit | ed858ec0951a10bc8bef1f883c925e1ac5e5766f (patch) | |
| tree | b1b12d3ccd7778b9d96cf1b172f638c3b951ab00 /include/private/GrOpList.h | |
| parent | 14962b7f1341941ec1f2e759c4783f28fd0330c6 (diff) | |
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>
Diffstat (limited to 'include/private/GrOpList.h')
| -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 c9abd6d4e5..5359a42930 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: - SkDEBUGCODE(bool isInstantiated() const;) + bool isInstantiated() const; GrSurfaceProxyRef fTarget; GrAuditTrail* fAuditTrail; |