Make GrResource know whether 3D objects' lifetimes are managed by Skia or not.
Review URL: https://codereview.appspot.com/7201046
git-svn-id: http://skia.googlecode.com/svn/trunk@7348 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index 9bbc842..c68283e 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -20,7 +20,6 @@
fTexFBOID = desc.fTexFBOID;
fMSColorRenderbufferID = desc.fMSColorRenderbufferID;
fViewport = viewport;
- fOwnIDs = desc.fOwnIDs;
fTexIDObj = texID;
GrSafeRef(fTexIDObj);
}
@@ -46,6 +45,7 @@
GrGLTexID* texID,
GrGLTexture* texture)
: INHERITED(gpu,
+ desc.fIsWrapped,
texture,
MakeDesc(kNone_GrTextureFlags,
viewport.fWidth, viewport.fHeight,
@@ -69,6 +69,7 @@
const Desc& desc,
const GrGLIRect& viewport)
: INHERITED(gpu,
+ desc.fIsWrapped,
NULL,
MakeDesc(kNone_GrTextureFlags,
viewport.fWidth, viewport.fHeight,
@@ -79,7 +80,7 @@
void GrGLRenderTarget::onRelease() {
GPUGL->notifyRenderTargetDelete(this);
- if (fOwnIDs) {
+ if (!this->isWrapped()) {
if (fTexFBOID) {
GL_CALL(DeleteFramebuffers(1, &fTexFBOID));
}
@@ -108,4 +109,3 @@
}
INHERITED::onAbandon();
}
-