diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-06 17:50:02 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-06 17:50:02 +0000 |
| commit | f954d8dd9a4e75aa97e7da79692f5a7add039e68 (patch) | |
| tree | a4d0cbc377940968a589c018cbb6616aaa105e72 /gpu/src/GrGLTexture.cpp | |
| parent | 7cf3dcd90275dcd23fa0d9230e144ee71852ef3a (diff) | |
Add isMultisampled() to GrRenderTarget. Cleanup MSAA vs smooth lines logic in GrGpuGL.
Skia issue: 178
Review URL: http://codereview.appspot.com/4382041/
git-svn-id: http://skia.googlecode.com/svn/trunk@1067 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGLTexture.cpp')
| -rw-r--r-- | gpu/src/GrGLTexture.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gpu/src/GrGLTexture.cpp b/gpu/src/GrGLTexture.cpp index ce9345b7ed..6a5a005142 100644 --- a/gpu/src/GrGLTexture.cpp +++ b/gpu/src/GrGLTexture.cpp @@ -24,9 +24,11 @@ GrGLRenderTarget::GrGLRenderTarget(GrGpuGL* gpu, const GLRenderTargetIDs& ids, GrGLTexID* texID, GrGLuint stencilBits, + bool isMultisampled, const GrGLIRect& viewport, GrGLTexture* texture) - : INHERITED(gpu, texture, viewport.fWidth, viewport.fHeight, stencilBits) { + : INHERITED(gpu, texture, viewport.fWidth, + viewport.fHeight, stencilBits, isMultisampled) { fRTFBOID = ids.fRTFBOID; fTexFBOID = ids.fTexFBOID; fStencilRenderbufferID = ids.fStencilRenderbufferID; @@ -96,7 +98,6 @@ const GrGLenum* GrGLTexture::WrapMode2GLWrap() { } }; - GrGLTexture::GrGLTexture(GrGpuGL* gpu, const GLTextureDesc& textureDesc, const GLRenderTargetIDs& rtIDs, @@ -131,6 +132,7 @@ GrGLTexture::GrGLTexture(GrGpuGL* gpu, fRenderTarget = new GrGLRenderTarget(gpu, rtIDs, fTexIDObj, textureDesc.fStencilBits, + rtIDs.fRTFBOID != rtIDs.fTexFBOID, vp, this); } } |