AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This may potentially fix a chromium issue and shouldn't hurt, so if anyone agrees that this fix should be harmless, we can try merging it in to see if it's enough to fix "Invalid pointer write in GrRenderTarget::onRelease".

Browse Source 
R=bsalomon@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/14607003

git-svn-id: http://skia.googlecode.com/svn/trunk@8982 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
sugoi@google.com 2013-05-03 13:52:32 +00:00
parent 6b0cf0273f
commit 6ba0b0f9ad
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gpu/gl/GrGpuGL.cpp
View File

@ -931,6 +931,11 @@ GrTexture* GrGpuGL::onCreateTexture(const GrTextureDesc& desc,
if (glTexDesc.fWidth > maxRTSize || glTexDesc.fHeight > maxRTSize) {
return return_null_texture();
}
} else {
int maxSize = this->caps()->maxTextureSize();
if (glTexDesc.fWidth > maxSize || glTexDesc.fHeight > maxSize) {
return return_null_texture();
}
}
GL_CALL(GenTextures(1, &glTexDesc.fTextureID));
@ -1004,8 +1009,8 @@ namespace {
const GrGLuint kUnknownBitCount = GrGLStencilBuffer::kUnknownBitCount;
void inline get_stencil_rb_sizes(const GrGLInterface* gl,
GrGLuint rb,
GrGLStencilBuffer::Format* format) {
// we shouldn't ever know one size and not the other
GrAssert((kUnknownBitCount == format->fStencilBits) ==
(kUnknownBitCount == format->fTotalBits));
@ -1071,7 +1076,7 @@ bool GrGpuGL::createStencilBufferForRenderTarget(GrRenderTarget* rt,
// After sized formats we attempt an unsized format and take
// whatever sizes GL gives us. In that case we query for the size.
GrGLStencilBuffer::Format format = sFmt;
get_stencil_rb_sizes(this->glInterface(), sbID, &format);
get_stencil_rb_sizes(this->glInterface(), &format);
static const bool kIsWrapped = false;
SkAutoTUnref<GrStencilBuffer> sb(SkNEW_ARGS(GrGLStencilBuffer,
(this, kIsWrapped, sbID, width, height,