diff options
author | Robert Phillips <robertphillips@google.com> | 2017-05-08 15:18:47 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-08 15:18:53 +0000 |
commit | 05814de6ba5087ad71f189d6413246ef1d518e4b (patch) | |
tree | 3c1595c0def853196f7bcad34b8f00a5aad8e5be /include | |
parent | 9bb75afed422f087ee68a53956c46b83c0aade34 (diff) |
Revert "Re-enable deferred proxies in Chrome"
This reverts commit 555c49c3479edf1692579c06a5c13c39d3741692.
Reason for revert: layout tests
Original change's description:
> Re-enable deferred proxies in Chrome
>
> Now that https://skia-review.googlesource.com/c/14605/ (Allow TextureSamplers to have null GrTexture pointer) has landed we should be able to re-enable deferred proxies in Chrome.
>
> Bug: 715488
> Change-Id: Ibd38e5ddf0558b94f09e29f17837e6abfd22fa34
> Reviewed-on: https://skia-review.googlesource.com/15252
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ie90e64a2e4d5efc4b6909a04f8a862dd3a708d97
Reviewed-on: https://skia-review.googlesource.com/15809
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/private/GrSurfaceProxy.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index b2ccfe0b7f..94490603bc 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -24,6 +24,8 @@ class GrSurfaceProxyPriv; class GrTextureOpList; class GrTextureProxy; +//#define SK_DISABLE_DEFERRED_PROXIES 1 + // This class replicates the functionality GrIORef<GrSurface> but tracks the // utilitization for later resource allocation (for the deferred case) and // forwards on the utilization in the wrapped case |