Add non-separable xfer modes to GPU backend.

Add non-separable xfer modes to GPU backend.
Committed: https://code.google.com/p/skia/source/detail?r=8815

[bsalomon, 2013-04-22 14:19:31]

Add non-separable xfer modes to GPU backend.

[robertphillips, 2013-04-22 15:46:31]

lgtm + nits

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp
File src/core/SkXfermode.cpp (right):

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1073: AddLumFunction(builder, &setLum);
\n before dstColor?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1075: builder->fsCodeAppendf("\t\t%s.rgb = %s(%s(%s.rgb
* %s.a, dstSrcAlpha.rgb), dstSrcAlpha.a, dstSrcAlpha.rgb);\n",
\n before inputColor?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1085: AddLumFunction(builder, &setLum);
\n

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1087: builder->fsCodeAppendf("\t\t%s.rgb =
%s(%s(dstSrcAlpha.rgb, %s.rgb * %s.a), dstSrcAlpha.a, dstSrcAlpha.rgb);\n",
/n

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1096: AddLumFunction(builder, &setLum);
\n

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1107: AddLumFunction(builder, &setLum);
\n

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1223: 
It also emits "luminance" method

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1229: SkString getFunction;
Is the indent right after this {?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1230: {
one line?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1252: body.appendf("\tfloat outLum = %s(outColor);\n",
getFunction.c_str());
Is this code happy with black?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1270: 
functions that create?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1275: SkString getFunction;
// emit 'saturation' function?

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1291: SkString helper;
emit "set_saturation_helper" method?

[bsalomon, 2013-04-22 17:36:17]

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp
File src/core/SkXfermode.cpp (right):

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1073: AddLumFunction(builder, &setLum);
On 2013/04/22 15:46:31, robertphillips wrote:
> \n before dstColor?

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1075: builder->fsCodeAppendf("\t\t%s.rgb = %s(%s(%s.rgb
* %s.a, dstSrcAlpha.rgb), dstSrcAlpha.a, dstSrcAlpha.rgb);\n",
On 2013/04/22 15:46:31, robertphillips wrote:
> \n before inputColor?

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1085: AddLumFunction(builder, &setLum);
On 2013/04/22 15:46:31, robertphillips wrote:
> \n

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1087: builder->fsCodeAppendf("\t\t%s.rgb =
%s(%s(dstSrcAlpha.rgb, %s.rgb * %s.a), dstSrcAlpha.a, dstSrcAlpha.rgb);\n",
On 2013/04/22 15:46:31, robertphillips wrote:
> /n

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1096: AddLumFunction(builder, &setLum);
On 2013/04/22 15:46:31, robertphillips wrote:
> \n

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1107: AddLumFunction(builder, &setLum);
On 2013/04/22 15:46:31, robertphillips wrote:
> \n

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1223: 
On 2013/04/22 15:46:31, robertphillips wrote:
> It also emits "luminance" method

But it doesn't return the name of it, so it isn't visible to the caller. It's
used from the set function.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1229: SkString getFunction;
On 2013/04/22 15:46:31, robertphillips wrote:
> Is the indent right after this {?

I removed the blocks.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1230: {
On 2013/04/22 15:46:31, robertphillips wrote:
> one line?

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1252: body.appendf("\tfloat outLum = %s(outColor);\n",
getFunction.c_str());
On 2013/04/22 15:46:31, robertphillips wrote:
> Is this code happy with black?

yup

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1270: 
On 2013/04/22 15:46:31, robertphillips wrote:
> functions that create?

Changed to "Adds a function that creates"

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1275: SkString getFunction;
On 2013/04/22 15:46:31, robertphillips wrote:
> // emit 'saturation' function?

Done.

https://codereview.chromium.org/14371014/diff/1006/src/core/SkXfermode.cpp#ne...
src/core/SkXfermode.cpp:1291: SkString helper;
On 2013/04/22 15:46:31, robertphillips wrote:
> emit "set_saturation_helper" method?

Done.

[jvanverth1, 2013-04-22 20:55:57]

lgtm

[bsalomon, 2013-04-22 21:05:58]

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