diff options
| author |  robertphillips <robertphillips@google.com> | 2015-06-23 12:36:12 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-23 12:36:12 -0700 |
| commit | b607767703ff7898611cf88c1218d5d69535e984 (patch) | |
| tree | 35b366932bc31df7a6a468261b704e1368bbdfb2 /include | |
| parent | e582a5a89102dde5c5bda4654cb07eca1da8efcd (diff) | |
Revert of Refactor GrBufferAllocPools to use resource cache (patchset #15 id:280001 of https://codereview.chromium.org/1139753002/)
Reason for revert:
Will reland after Chromium branch
Original issue's description:
> Refactor GrBufferAllocPools to use resource cache
>
> Committed: https://skia.googlesource.com/skia/+/e935f1a0e2351373c33600b8388492ce1218014a
TBR=bsalomon@google.com,joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1204773003
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrCaps.h | 3 | ||||
| -rw-r--r-- | include/gpu/GrTextureProvider.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 9ad20e53e4..10e100f8aa 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -185,7 +185,6 @@ public: // recycled in the texture cache. This is to prevent ghosting by drivers // (in particular for deferred architectures). bool reuseScratchTextures() const { return fReuseScratchTextures; } - bool reuseScratchBuffers() const { return fReuseScratchBuffers; } int maxRenderTargetSize() const { return fMaxRenderTargetSize; } int maxTextureSize() const { return fMaxTextureSize; } @@ -230,12 +229,10 @@ protected: bool fStencilWrapOpsSupport : 1; bool fDiscardRenderTargetSupport : 1; bool fReuseScratchTextures : 1; - bool fReuseScratchBuffers : 1; bool fGpuTracingSupport : 1; bool fCompressedTexSubImageSupport : 1; bool fOversizedStencilSupport : 1; bool fTextureBarrierSupport : 1; - // Driver workaround bool fUseDrawInsteadOfClear : 1; bool fUseDrawInsteadOfPartialRenderTargetWrite : 1; diff --git a/include/gpu/GrTextureProvider.h b/include/gpu/GrTextureProvider.h index 28fda48c43..b91809c6ea 100644 --- a/include/gpu/GrTextureProvider.h +++ b/include/gpu/GrTextureProvider.h @@ -158,12 +158,12 @@ protected: GrGpu* gpu() { return fGpu; } const GrGpu* gpu() const { return fGpu; } +private: bool isAbandoned() const { SkASSERT(SkToBool(fGpu) == SkToBool(fCache)); return !SkToBool(fCache); } -private: GrResourceCache* fCache; GrGpu* fGpu; }; |