diff options
| author |  vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-07-26 03:44:05 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-07-26 03:44:05 +0000 |
| commit | ec36471096d50ed24e259aca2c61e3406ed1a4f5 (patch) | |
| tree | 37022f4b1019466556ce5de8d9c88e59f9b65440 /gpu/src/GrGLTexture.cpp | |
| parent | 1f1658985586b30c913dbc935f17ce1aabcdf7b5 (diff) | |
Revert "Add sizeInBytes to GrResource, make GrRenderTarget aware of its pixel config (r1951)"
Temporarily revert this change in order to roll other changes into Chrome.
TBR=bsalomon@google.com
Review URL: http://codereview.appspot.com/4807051
git-svn-id: http://skia.googlecode.com/svn/trunk@1958 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGLTexture.cpp')
| -rw-r--r-- | gpu/src/GrGLTexture.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gpu/src/GrGLTexture.cpp b/gpu/src/GrGLTexture.cpp index c5375c9f34..bbca5ed175 100644 --- a/gpu/src/GrGLTexture.cpp +++ b/gpu/src/GrGLTexture.cpp @@ -23,14 +23,12 @@ GrGLRenderTarget::GrGLRenderTarget(GrGpuGL* gpu, const GLRenderTargetIDs& ids, GrGLTexID* texID, - GrPixelConfig config, GrGLuint stencilBits, bool isMultisampled, const GrGLIRect& viewport, GrGLTexture* texture) : INHERITED(gpu, texture, viewport.fWidth, - viewport.fHeight, config, - stencilBits, isMultisampled) { + viewport.fHeight, stencilBits, isMultisampled) { fRTFBOID = ids.fRTFBOID; fTexFBOID = ids.fTexFBOID; fStencilRenderbufferID = ids.fStencilRenderbufferID; @@ -133,7 +131,6 @@ GrGLTexture::GrGLTexture(GrGpuGL* gpu, vp.fBottom = textureDesc.fAllocHeight - textureDesc.fContentHeight; fRenderTarget = new GrGLRenderTarget(gpu, rtIDs, fTexIDObj, - textureDesc.fFormat, textureDesc.fStencilBits, rtIDs.fRTFBOID != rtIDs.fTexFBOID, vp, this); @@ -229,7 +226,7 @@ void GrGLTexture::uploadTextureData(int x, } } -intptr_t GrGLTexture::getTextureHandle() const { +intptr_t GrGLTexture::getTextureHandle() { return fTexIDObj->id(); } |