Bug fix for es 3.00 fb fetch

Bug fix for es 3.00 fb fetch


patch for es 300 shader fb fetch

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/b4384b9bba6f3473a3f024150bfe307cdd1753c7

[joshualitt, 2014-10-21 17:07:29]

joshualitt@google.com changed reviewers:
+ egdaniel@google.com, joshualitt@google.com

[joshualitt, 2014-10-21 17:57:20]

feedback inc

[joshualitt, 2014-10-21 18:12:03]

feedback inc

[egdaniel, 2014-10-21 18:22:07]

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/GrGLCaps.h
File src/gpu/gl/GrGLCaps.h (right):

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/GrGLCaps.h#ne...
src/gpu/gl/GrGLCaps.h:370: // TODO(joshualitt) encapsulate the FB Fetch logic in
a feature object
do you still want this todo?

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/builders/GrGL...
File src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp (right):

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/builders/GrGL...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp:180: if (-1 ==
fCustomColorOutputIndex) {
do we need this if? Isn't it true that (-1 == fCustomColorOutputIndex)
==(!fHasCustomColorOutput))

We can either remove this if, or change enableCustomOuptut back to an SkASSERT
and add an additional check to the enableCustomOutput call in
cobmineColorAndCoverage.

[joshualitt, 2014-10-21 18:29:24]

feedback inc

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/GrGLCaps.h
File src/gpu/gl/GrGLCaps.h (right):

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/GrGLCaps.h#ne...
src/gpu/gl/GrGLCaps.h:370: // TODO(joshualitt) encapsulate the FB Fetch logic in
a feature object
On 2014/10/21 18:22:06, egdaniel wrote:
> do you still want this todo?

yea, I still intend to do this

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/builders/GrGL...
File src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp (right):

https://codereview.chromium.org/665893008/diff/80001/src/gpu/gl/builders/GrGL...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.cpp:180: if (-1 ==
fCustomColorOutputIndex) {
On 2014/10/21 18:22:06, egdaniel wrote:
> do we need this if? Isn't it true that (-1 == fCustomColorOutputIndex)
> ==(!fHasCustomColorOutput))
> 
> We can either remove this if, or change enableCustomOuptut back to an SkASSERT
> and add an additional check to the enableCustomOutput call in
> cobmineColorAndCoverage.

Acknowledged.

[egdaniel, 2014-10-21 18:33:51]

lgtm

[joshualitt, 2014-10-21 19:43:26]

The CQ bit was checked by joshualitt@google.com

[commit-bot: I haz the power, 2014-10-21 19:44:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/665893008/100001

[commit-bot: I haz the power, 2014-10-21 19:53:20]

Committed patchset #6 (id:100001) as b4384b9bba6f3473a3f024150bfe307cdd1753c7