Force checking of all color, stencil and FBO allocations for SkSurface_Gpu. This fixes the software…

Force checking of all color, stencil and FBO allocations for SkSurface_Gpu. This fixes the software canvas fallback in Chrome.

R=bsalomon@google.com

Committed: https://code.google.com/p/skia/source/detail?r=9487

[Stephen White, 2013-06-07 14:56:17]

Brian: PTAL. Thanks!

[bsalomon, 2013-06-10 13:21:47]

lgtm we a few nits inline.

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (right):

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:541: GrGLenum checkAllocError(const GrTextureDesc& desc,
const GrGLInterface* interface) {
could you namespace {} and_rename_this_to_this_style?

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:812: if (desc->fCheckAllocation ||
!this->glCaps().isConfigVerifiedColorAttachment(desc->fConfig)) {
can you wrap this if and the next one?

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:896: glRTDesc.fCheckAllocation = 0 != (desc.fFlags &
kCheckAllocation_GrTextureFlagBit);
SkToBool(desc.fFlags & ...)

[Stephen White, 2013-06-10 13:53:14]

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (right):

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:541: GrGLenum checkAllocError(const GrTextureDesc& desc,
const GrGLInterface* interface) {
On 2013/06/10 13:21:47, bsalomon wrote:
> could you namespace {}

It already is.

> and_rename_this_to_this_style?

Done.

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:812: if (desc->fCheckAllocation ||
!this->glCaps().isConfigVerifiedColorAttachment(desc->fConfig)) {
On 2013/06/10 13:21:47, bsalomon wrote:
> can you wrap this if and the next one?

Done.

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:896: glRTDesc.fCheckAllocation = 0 != (desc.fFlags &
kCheckAllocation_GrTextureFlagBit);
On 2013/06/10 13:21:47, bsalomon wrote:
> SkToBool(desc.fFlags & ...)

Done. Want me to do the line below?  :)

[bsalomon, 2013-06-10 14:04:42]

lgtm

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (right):

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:896: glRTDesc.fCheckAllocation = 0 != (desc.fFlags &
kCheckAllocation_GrTextureFlagBit);
On 2013/06/10 13:53:14, Stephen White wrote:
> On 2013/06/10 13:21:47, bsalomon wrote:
> > SkToBool(desc.fFlags & ...)
> 
> Done. Want me to do the line below?  :)

Yes, please! Much of the GPU code doesn't use SkToBool()... there was no
GrToBool() before the merger of gpu code into skia.

[Stephen White, 2013-06-10 14:54:39]

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp
File src/gpu/gl/GrGpuGL.cpp (right):

https://codereview.chromium.org/15643013/diff/1/src/gpu/gl/GrGpuGL.cpp#newcod...
src/gpu/gl/GrGpuGL.cpp:896: glRTDesc.fCheckAllocation = 0 != (desc.fFlags &
kCheckAllocation_GrTextureFlagBit);
On 2013/06/10 14:04:42, bsalomon wrote:
> On 2013/06/10 13:53:14, Stephen White wrote:
> > On 2013/06/10 13:21:47, bsalomon wrote:
> > > SkToBool(desc.fFlags & ...)
> > 
> > Done. Want me to do the line below?  :)
> 
> Yes, please! Much of the GPU code doesn't use SkToBool()... there was no
> GrToBool() before the merger of gpu code into skia.

Done (here and two other places in this file).

[bsalomon, 2013-06-10 14:56:03]

lgtm

[Stephen White, 2013-06-10 15:06:17]

Committed patchset #3 manually as r9487 (presubmit successful).