diff options
author | bsalomon <bsalomon@google.com> | 2014-08-26 13:11:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 13:11:11 -0700 |
commit | a2b0af82f02a74749b0ae8c315202a810a89bcb8 (patch) | |
tree | 1f3b8fdb8dc30a897119f3ce25e347cdaad94391 | |
parent | d68b3e491bb765beb7ca5e4ac8e0c80dedf5a83b (diff) |
Revert of Make GrGpuResources register with GrResourceCache2 after fully constructed. (patchset #3 of https://codereview.chromium.org/504313002/)
Reason for revert:
Breaking the bots
Original issue's description:
> Make GrGpuResources register with GrResourceCache2 after fully constructed.
>
> Committed: https://skia.googlesource.com/skia/+/d68b3e491bb765beb7ca5e4ac8e0c80dedf5a83b
R=robertphillips@google.com
TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/488463004
-rw-r--r-- | bench/GrResourceCacheBench.cpp | 2 | ||||
-rw-r--r-- | include/gpu/GrGpuResource.h | 5 | ||||
-rw-r--r-- | src/gpu/GrGpuResource.cpp | 5 | ||||
-rw-r--r-- | src/gpu/GrPathRange.h | 1 | ||||
-rw-r--r-- | src/gpu/GrResourceCache2.cpp | 2 | ||||
-rw-r--r-- | src/gpu/GrResourceCache2.h | 6 | ||||
-rw-r--r-- | src/gpu/GrStencilAndCoverTextContext.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLIndexBuffer.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLPath.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLRenderTarget.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLStencilBuffer.h | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLTexture.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLVertexArray.cpp | 1 | ||||
-rw-r--r-- | src/gpu/gl/GrGLVertexBuffer.cpp | 1 | ||||
-rw-r--r-- | tests/ResourceCacheTest.cpp | 1 |
15 files changed, 1 insertions, 29 deletions
diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index 068aff22d4..84e0e5d4c8 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -27,7 +27,6 @@ public: StencilResource(GrGpu* gpu, int id) : INHERITED(gpu, false) , fID(id) { - this->registerWithCache(); } virtual ~StencilResource() { this->release(); } @@ -52,7 +51,6 @@ public: TextureResource(GrGpu* gpu, int id) : INHERITED(gpu, false) , fID(id) { - this->registerWithCache(); } virtual ~TextureResource() { this->release(); } diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h index 17cdfc9a4c..8b162823bf 100644 --- a/include/gpu/GrGpuResource.h +++ b/include/gpu/GrGpuResource.h @@ -90,11 +90,6 @@ public: uint32_t getUniqueID() const { return fUniqueID; } protected: - - // This must be called by every GrGpuObject. It should be called once the object is fully - // initialized (i.e. not in a base class constructor). - void registerWithCache(); - GrGpuResource(GrGpu*, bool isWrapped); virtual ~GrGpuResource(); diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp index a0a72785d9..7a19c25e46 100644 --- a/src/gpu/GrGpuResource.cpp +++ b/src/gpu/GrGpuResource.cpp @@ -28,9 +28,6 @@ GrGpuResource::GrGpuResource(GrGpu* gpu, bool isWrapped) } else { fFlags = 0; } -} - -void GrGpuResource::registerWithCache() { get_resource_cache2(fGpu)->insertResource(this); } @@ -40,7 +37,7 @@ GrGpuResource::~GrGpuResource() { SkASSERT(this->wasDestroyed()); } -void GrGpuResource::release() { +void GrGpuResource::release() { if (NULL != fGpu) { this->onRelease(); get_resource_cache2(fGpu)->removeResource(this); diff --git a/src/gpu/GrPathRange.h b/src/gpu/GrPathRange.h index b52fef170c..c53b987382 100644 --- a/src/gpu/GrPathRange.h +++ b/src/gpu/GrPathRange.h @@ -38,7 +38,6 @@ public: : INHERITED(gpu, kIsWrapped), fSize(size), fStroke(stroke) { - this->registerWithCache(); } size_t getSize() const { return fSize; } diff --git a/src/gpu/GrResourceCache2.cpp b/src/gpu/GrResourceCache2.cpp index c325efd40d..0b6944ee85 100644 --- a/src/gpu/GrResourceCache2.cpp +++ b/src/gpu/GrResourceCache2.cpp @@ -17,13 +17,11 @@ GrResourceCache2::~GrResourceCache2() { void GrResourceCache2::insertResource(GrGpuResource* resource) { SkASSERT(NULL != resource); SkASSERT(!resource->wasDestroyed()); - SkASSERT(!this->isInCache(resource)); fResources.addToHead(resource); ++fCount; } void GrResourceCache2::removeResource(GrGpuResource* resource) { - SkASSERT(this->isInCache(resource)); fResources.remove(resource); --fCount; } diff --git a/src/gpu/GrResourceCache2.h b/src/gpu/GrResourceCache2.h index 8e79c09e39..1262c805ac 100644 --- a/src/gpu/GrResourceCache2.h +++ b/src/gpu/GrResourceCache2.h @@ -33,12 +33,6 @@ public: void releaseAll(); private: -#ifdef SK_DEBUG - bool isInCache(const GrGpuResource* r) const { - return fResources.isInList(r); - } -#endif - int fCount; SkTInternalLList<GrGpuResource> fResources; }; diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp index 4f5cab3e89..af4ba64343 100644 --- a/src/gpu/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/GrStencilAndCoverTextContext.cpp @@ -43,7 +43,6 @@ public: glyphs.reset(SkNEW_ARGS(GlyphPathRange, (context, cache->getDescriptor(), stroke))); context->addResourceToCache(resourceKey, glyphs); } - glyphs->registerWithCache(); return glyphs.detach(); } diff --git a/src/gpu/gl/GrGLIndexBuffer.cpp b/src/gpu/gl/GrGLIndexBuffer.cpp index 5991c09613..a137348ef7 100644 --- a/src/gpu/gl/GrGLIndexBuffer.cpp +++ b/src/gpu/gl/GrGLIndexBuffer.cpp @@ -11,7 +11,6 @@ GrGLIndexBuffer::GrGLIndexBuffer(GrGpuGL* gpu, const Desc& desc) : INHERITED(gpu, desc.fIsWrapped, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID) , fImpl(gpu, desc, GR_GL_ELEMENT_ARRAY_BUFFER) { - this->registerWithCache(); } void GrGLIndexBuffer::onRelease() { diff --git a/src/gpu/gl/GrGLPath.cpp b/src/gpu/gl/GrGLPath.cpp index 972a7af39b..8c76b5922a 100644 --- a/src/gpu/gl/GrGLPath.cpp +++ b/src/gpu/gl/GrGLPath.cpp @@ -136,7 +136,6 @@ GrGLPath::GrGLPath(GrGpuGL* gpu, const SkPath& path, const SkStrokeRec& stroke) // FIXME: try to account for stroking, without rasterizing the stroke. fBounds.outset(stroke.getWidth(), stroke.getWidth()); } - this->registerWithCache(); } GrGLPath::~GrGLPath() { diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp index 6143f34b95..2486396186 100644 --- a/src/gpu/gl/GrGLRenderTarget.cpp +++ b/src/gpu/gl/GrGLRenderTarget.cpp @@ -21,7 +21,6 @@ void GrGLRenderTarget::init(const Desc& desc, fMSColorRenderbufferID = desc.fMSColorRenderbufferID; fViewport = viewport; fTexIDObj.reset(SkSafeRef(texID)); - this->registerWithCache(); } namespace { diff --git a/src/gpu/gl/GrGLStencilBuffer.h b/src/gpu/gl/GrGLStencilBuffer.h index 024890ddd7..1cb0a3301a 100644 --- a/src/gpu/gl/GrGLStencilBuffer.h +++ b/src/gpu/gl/GrGLStencilBuffer.h @@ -32,7 +32,6 @@ public: : GrStencilBuffer(gpu, isWrapped, width, height, format.fStencilBits, sampleCnt) , fFormat(format) , fRenderbufferID(rbid) { - this->registerWithCache(); } virtual ~GrGLStencilBuffer(); diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index bc013bc0ec..255cdd9631 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -33,7 +33,6 @@ void GrGLTexture::init(GrGpuGL* gpu, fRenderTarget.reset(SkNEW_ARGS(GrGLRenderTarget, (gpu, *rtDesc, vp, fTexIDObj, this))); } - this->registerWithCache(); } GrGLTexture::GrGLTexture(GrGpuGL* gpu, diff --git a/src/gpu/gl/GrGLVertexArray.cpp b/src/gpu/gl/GrGLVertexArray.cpp index 39fd48cb89..66feb82053 100644 --- a/src/gpu/gl/GrGLVertexArray.cpp +++ b/src/gpu/gl/GrGLVertexArray.cpp @@ -73,7 +73,6 @@ GrGLVertexArray::GrGLVertexArray(GrGpuGL* gpu, GrGLint id, int attribCount) , fID(id) , fAttribArrays(attribCount) , fIndexBufferIDIsValid(false) { - this->registerWithCache(); } void GrGLVertexArray::onAbandon() { diff --git a/src/gpu/gl/GrGLVertexBuffer.cpp b/src/gpu/gl/GrGLVertexBuffer.cpp index d6b630191c..a13ad126ec 100644 --- a/src/gpu/gl/GrGLVertexBuffer.cpp +++ b/src/gpu/gl/GrGLVertexBuffer.cpp @@ -11,7 +11,6 @@ GrGLVertexBuffer::GrGLVertexBuffer(GrGpuGL* gpu, const Desc& desc) : INHERITED(gpu, desc.fIsWrapped, desc.fSizeInBytes, desc.fDynamic, 0 == desc.fID) , fImpl(gpu, desc, GR_GL_ARRAY_BUFFER) { - this->registerWithCache(); } void GrGLVertexBuffer::onRelease() { diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index ae140e2846..4b43d4f48d 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -69,7 +69,6 @@ public: , fToDelete(NULL) , fSize(size) { ++fAlive; - this->registerWithCache(); } ~TestResource() { |