diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-23 20:25:22 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-23 20:25:22 +0000 |
| commit | 728302281920727b96e6cec0bfc7575900f34a8b (patch) | |
| tree | e6db912047f689e3a89e8e26b55c1fab27a42ff3 /src/gpu/gl/GrGLTexture.cpp | |
| parent | f91c63e116fda7385d9265a00d3302f46baf25c2 (diff) | |
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
Diffstat (limited to 'src/gpu/gl/GrGLTexture.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLTexture.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp index 6c815e8a33..5c588e7f0d 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/gl/GrGLTexture.cpp @@ -25,7 +25,7 @@ void GrGLTexture::init(GrGpuGL* gpu, fTexIDObj = SkNEW_ARGS(GrGLTexID, (GPUGL->glInterface(), textureDesc.fTextureID, - textureDesc.fOwnsID)); + textureDesc.fIsWrapped)); if (NULL != rtDesc) { GrAssert(kBottomLeft_Origin == textureDesc.fOrigin); @@ -42,14 +42,14 @@ void GrGLTexture::init(GrGpuGL* gpu, GrGLTexture::GrGLTexture(GrGpuGL* gpu, const Desc& textureDesc) - : INHERITED(gpu, textureDesc, textureDesc.fOrigin) { + : INHERITED(gpu, textureDesc.fIsWrapped, textureDesc, textureDesc.fOrigin) { this->init(gpu, textureDesc, NULL); } GrGLTexture::GrGLTexture(GrGpuGL* gpu, const Desc& textureDesc, const GrGLRenderTarget::Desc& rtDesc) - : INHERITED(gpu, textureDesc, textureDesc.fOrigin) { + : INHERITED(gpu, textureDesc.fIsWrapped, textureDesc, textureDesc.fOrigin) { this->init(gpu, textureDesc, &rtDesc); } @@ -74,4 +74,3 @@ void GrGLTexture::onAbandon() { GrBackendObject GrGLTexture::getTextureHandle() const { return fTexIDObj->id(); } - |