diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-23 21:32:32 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-23 21:32:32 +0000 |
| commit | 1f0f1a3b5ef4404da11ccf937ee270ea6ddb41e2 (patch) | |
| tree | b64131a98b39b42a9671dfc6106ba10443975f5f /src | |
| parent | 6b5388e71b0fb93b900e2705348cf9a6bfd3df9d (diff) | |
Fix bug introduced in r7348, deleting wrapped resources.
git-svn-id: http://skia.googlecode.com/svn/trunk@7354 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index dc41fbbd1b..670f6acfa4 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -507,7 +507,6 @@ GrTexture* GrGpuGL::onWrapBackendTexture(const GrBackendTextureDesc& desc) { glRTDesc.fRTFBOID = 0; glRTDesc.fTexFBOID = 0; glRTDesc.fMSColorRenderbufferID = 0; - glRTDesc.fIsWrapped = false; glRTDesc.fConfig = desc.fConfig; glRTDesc.fSampleCnt = desc.fSampleCnt; if (!this->createRenderTargetObjects(glTexDesc.fWidth, @@ -550,10 +549,10 @@ GrRenderTarget* GrGpuGL::onWrapBackendRenderTarget(const GrBackendRenderTargetDe format.fPacked = false; format.fStencilBits = desc.fStencilBits; format.fTotalBits = desc.fStencilBits; - static const bool kIsWrapped = false; + static const bool kIsSBWrapped = false; GrGLStencilBuffer* sb = SkNEW_ARGS(GrGLStencilBuffer, (this, - kIsWrapped, + kIsSBWrapped, 0, desc.fWidth, desc.fHeight, @@ -943,7 +942,6 @@ GrTexture* GrGpuGL::onCreateTexture(const GrTextureDesc& desc, glTexDesc.fHeight = desc.fHeight; glTexDesc.fConfig = desc.fConfig; glTexDesc.fSampleCnt = desc.fSampleCnt; - glTexDesc.fIsWrapped = false; glRTDesc.fMSColorRenderbufferID = 0; |