Fixed soft-light composition mode in raster and OpenGL1.

Updated the soft-light composition mode implementation in the raster
and OpenGL1 engines to use the equations in the SVG specification as of
April 2009.

Task-number: QTBUG-3193
Reviewed-by: Trond

2 files changed, 361 insertions, 339 deletions

diff --git a/src/opengl/util/composition_mode_softlight.glsl b/src/opengl/util/composition_mode_softlight.glsl
index 4777b74..e4c1f89 100644
--- a/src/opengl/util/composition_mode_softlight.glsl
+++ b/src/opengl/util/composition_mode_softlight.glsl
@@ -1,18 +1,22 @@
-// Dca' = 2.Sca < Sa ?
-//        Dca.(Sa - (1 - Dca/Da).(2.Sca - Sa)) + Sca.(1 - Da) + Dca.(1 - Sa) :
-//          (8.Dca <= Da ?
-//           Dca.(Sa - (1 - Dca/Da).(2.Sca - Sa).(3 - 8.Dca/Da)) + Sca.(1 - Da) + Dca.(1 - Sa) :
-//           (Dca.Sa + ((Dca/Da)^(0.5).Da - Dca).(2.Sca - Sa)) + Sca.(1 - Da) + Dca.(1 - Sa))
+// if 2.Sca <= Sa
+//     Dca' = Dca.(Sa + (2.Sca - Sa).(1 - Dca/Da)) + Sca.(1 - Da) + Dca.(1 - Sa)
+// otherwise if 2.Sca > Sa and 4.Dca <= Da
+//     Dca' = Dca.Sa + Da.(2.Sca - Sa).(4.Dca/Da.(4.Dca/Da + 1).(Dca/Da - 1) + 7.Dca/Da) + Sca.(1 - Da) + Dca.(1 - Sa)
+// otherwise if 2.Sca > Sa and 4.Dca > Da
+//     Dca' = Dca.Sa + Da.(2.Sca - Sa).((Dca/Da)^0.5 - Dca/Da) + Sca.(1 - Da) + Dca.(1 - Sa)
 // Da'  = Sa + Da - Sa.Da 
+
 vec4 composite(vec4 src, vec4 dst)
 {
     vec4 result;
     float da = max(dst.a, 0.00001);
-    result.rgb = mix(dst.rgb * (src.a - (1.0 - dst.rgb / da) * (2.0 * src.rgb - src.a)),
-                     mix(dst.rgb * (src.a - (1.0 - dst.rgb / da) * (2.0 * src.rgb - src.a) * (3.0 - 8.0 * dst.rgb / da)),
-                         (dst.rgb * src.a + (sqrt(dst.rgb / da) * dst.a - dst.rgb) * (2.0 * src.rgb - src.a)),
-                         step(dst.a, 8.0 * dst.rgb)),
-                     step(src.a, 2.0 * src.rgb)) + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a);
+    vec3 dst_np = dst.rgb / da;
+    result.rgb = mix(dst.rgb * (src.a + (2.0 * src.rgb - src.a) * (1.0 - dst_np)),
+                     mix(dst.rgb * src.a + dst.a * (2.0 * src.rgb - src.a) * ((16.0 * dst_np - 12.0) * dst_np + 3.0) * dst_np,
+                         dst.rgb * src.a + dst.a * (2.0 * src.rgb - src.a) * (sqrt(dst_np) - dst_np),
+                         step(dst.a, 4.0 * dst.rgb)),
+                     step(src.a, 2.0 * src.rgb))
+                 + src.rgb * (1.0 - dst.a) + dst.rgb * (1.0 - src.a);
     result.a = src.a + dst.a - src.a * dst.a;
     return result;
 }
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index 9154c6e..2241057 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -519,8 +519,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..3],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -530,30 +530,31 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MUL R0.xy, fragment.position, c[1];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MAX R1.x, R0.w, c[4].z;\n"
-    "RCP R1.w, R1.x;\n"
-    "MUL R1.xyz, R0, R1.w;\n"
-    "MUL R4.xyz, -R1, c[4].w;\n"
-    "RSQ R2.x, R1.x;\n"
-    "RSQ R2.z, R1.z;\n"
-    "RSQ R2.y, R1.y;\n"
-    "MAD R1.xyz, -R0, R1.w, c[4].x;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R3.xyz, R0.w, R2, -R0;\n"
-    "MAD R2.xyz, fragment.color.primary, c[4].y, -fragment.color.primary.w;\n"
-    "MUL R3.xyz, R2, R3;\n"
-    "ADD R5.xyz, R4, c[5].x;\n"
-    "MUL R4.xyz, R1, R2;\n"
-    "MAD R1.xyz, -R1, R2, fragment.color.primary.w;\n"
+    "RCP R1.x, R1.x;\n"
+    "MUL R2.xyz, R0, R1.x;\n"
+    "MAD R1.xyz, R2, c[5].x, -c[5].y;\n"
+    "MAD R3.xyz, R2, R1, c[5].z;\n"
+    "MAD R1.xyz, fragment.color.primary, c[4].y, -fragment.color.primary.w;\n"
+    "MUL R4.xyz, R0.w, R1;\n"
+    "MUL R5.xyz, R4, R3;\n"
+    "RSQ R1.w, R2.x;\n"
+    "RSQ R2.w, R2.z;\n"
+    "RCP R3.x, R1.w;\n"
+    "RSQ R1.w, R2.y;\n"
+    "MUL R5.xyz, R2, R5;\n"
+    "RCP R3.z, R2.w;\n"
+    "RCP R3.y, R1.w;\n"
+    "ADD R3.xyz, -R2, R3;\n"
+    "MUL R3.xyz, R4, R3;\n"
+    "ADD R2.xyz, -R2, c[4].x;\n"
+    "MAD R1.xyz, R1, R2, fragment.color.primary.w;\n"
     "MUL R2.xyz, fragment.color.primary, c[4].y;\n"
-    "MAD R5.xyz, -R4, R5, fragment.color.primary.w;\n"
+    "MAD R4.xyz, fragment.color.primary.w, R0, R5;\n"
     "MAD R3.xyz, fragment.color.primary.w, R0, R3;\n"
-    "MAD R4.xyz, -R0, R5, R3;\n"
+    "ADD R5.xyz, R3, -R4;\n"
     "MUL R3.xyz, R0, c[4].w;\n"
-    "MUL R5.xyz, R0, R5;\n"
     "SGE R3.xyz, R3, R0.w;\n"
-    "MAD R3.xyz, R3, R4, R5;\n"
+    "MAD R3.xyz, R3, R5, R4;\n"
     "MAD R3.xyz, -R0, R1, R3;\n"
     "MUL R1.xyz, R0, R1;\n"
     "SGE R2.xyz, R2, fragment.color.primary.w;\n"
@@ -861,8 +862,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[3] = { program.local[0],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -872,30 +873,31 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MUL R0.xy, fragment.position, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MAX R1.x, R0.w, c[1].z;\n"
-    "RCP R1.w, R1.x;\n"
-    "MUL R1.xyz, R0, R1.w;\n"
-    "MUL R4.xyz, -R1, c[1].w;\n"
-    "RSQ R2.x, R1.x;\n"
-    "RSQ R2.z, R1.z;\n"
-    "RSQ R2.y, R1.y;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R3.xyz, R0.w, R2, -R0;\n"
-    "MAD R2.xyz, fragment.color.primary, c[1].y, -fragment.color.primary.w;\n"
-    "MUL R3.xyz, R2, R3;\n"
+    "RCP R1.x, R1.x;\n"
+    "MUL R2.xyz, R0, R1.x;\n"
+    "MAD R1.xyz, R2, c[2].x, -c[2].y;\n"
+    "MAD R3.xyz, R2, R1, c[2].z;\n"
+    "MAD R1.xyz, fragment.color.primary, c[1].y, -fragment.color.primary.w;\n"
+    "MUL R4.xyz, R0.w, R1;\n"
+    "MUL R5.xyz, R4, R3;\n"
+    "RSQ R1.w, R2.x;\n"
+    "RCP R3.x, R1.w;\n"
+    "RSQ R2.w, R2.z;\n"
+    "RSQ R1.w, R2.y;\n"
+    "MUL R5.xyz, R2, R5;\n"
+    "RCP R3.z, R2.w;\n"
+    "RCP R3.y, R1.w;\n"
+    "ADD R3.xyz, -R2, R3;\n"
+    "MUL R3.xyz, R4, R3;\n"
+    "ADD R2.xyz, -R2, c[1].x;\n"
+    "MAD R1.xyz, R1, R2, fragment.color.primary.w;\n"
+    "MUL R2.xyz, fragment.color.primary, c[1].y;\n"
+    "MAD R4.xyz, fragment.color.primary.w, R0, R5;\n"
     "MAD R3.xyz, fragment.color.primary.w, R0, R3;\n"
-    "MAD R1.xyz, -R0, R1.w, c[1].x;\n"
-    "ADD R5.xyz, R4, c[2].x;\n"
-    "MUL R4.xyz, R1, R2;\n"
-    "MAD R1.xyz, -R1, R2, fragment.color.primary.w;\n"
-    "MAD R5.xyz, -R4, R5, fragment.color.primary.w;\n"
-    "MAD R4.xyz, -R0, R5, R3;\n"
+    "ADD R5.xyz, R3, -R4;\n"
     "MUL R3.xyz, R0, c[1].w;\n"
-    "MUL R2.xyz, fragment.color.primary, c[1].y;\n"
-    "MUL R5.xyz, R0, R5;\n"
     "SGE R3.xyz, R3, R0.w;\n"
-    "MAD R3.xyz, R3, R4, R5;\n"
+    "MAD R3.xyz, R3, R5, R4;\n"
     "MAD R3.xyz, -R0, R1, R3;\n"
     "MUL R1.xyz, R0, R1;\n"
     "SGE R2.xyz, R2, fragment.color.primary.w;\n"
@@ -1457,7 +1459,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "!!ARBfp1.0\n"
     "PARAM c[11] = { program.local[0..8],\n"
     "		{ 2, 4, 1, 9.9999997e-006 },\n"
-    "		{ 8, 3 } };\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -1469,53 +1471,55 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
     "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MAX R0.w, R1, c[9];\n"
-    "RCP R2.w, R0.w;\n"
-    "MUL R5.xyz, R1, R2.w;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
     "ADD R0.z, R0, R0.w;\n"
     "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.y, R0.x, c[9].x;\n"
-    "MOV R0.x, c[9];\n"
-    "RSQ R2.x, R5.x;\n"
-    "RSQ R2.z, R5.z;\n"
-    "RSQ R2.y, R5.y;\n"
     "MUL R0.z, -R0, c[1].x;\n"
-    "MUL R0.z, R0, c[9].y;\n"
-    "MAD R0.z, R0.y, R0.y, -R0;\n"
-    "MUL R0.w, R0.x, c[1].x;\n"
-    "RSQ R0.z, R0.z;\n"
-    "RCP R0.x, R0.z;\n"
-    "RCP R0.z, R0.w;\n"
-    "ADD R0.x, -R0.y, R0;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
+    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MAD R0.y, R0.x, R0.x, -R0;\n"
+    "RSQ R0.y, R0.y;\n"
+    "RCP R0.y, R0.y;\n"
+    "ADD R0.y, -R0.x, R0;\n"
+    "MOV R0.x, c[9];\n"
+    "MUL R0.x, R0, c[1];\n"
+    "MAX R0.z, R1.w, c[9].w;\n"
+    "RCP R0.z, R0.z;\n"
+    "MUL R3.xyz, R1, R0.z;\n"
+    "MAD R4.xyz, R3, c[10].x, -c[10].y;\n"
+    "RCP R0.x, R0.x;\n"
+    "MUL R0.x, R0.y, R0;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MAD R3.xyz, R0, c[9].x, -R0.w;\n"
-    "MAD R6.xyz, -R5, c[10].x, c[10].y;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R1.w, R2, -R1;\n"
-    "MUL R2.xyz, R3, R2;\n"
-    "MAD R4.xyz, R0.w, R1, R2;\n"
-    "MAD R2.xyz, -R1, R2.w, c[9].z;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MAD R2.xyz, R0, c[9].x, -R0.w;\n"
+    "MAD R4.xyz, R3, R4, c[10].z;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[9].z;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[9].x;\n"
-    "MUL R4.xyz, R1, c[10].x;\n"
-    "SGE R3.xyz, R3, R0.w;\n"
-    "ADD R2.w, -R1, c[9].z;\n"
-    "MUL R6.xyz, R1, R6;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
+    "MAD R4.xyz, R0.w, R1, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
+    "MUL R4.xyz, R1, c[9].y;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
+    "SGE R3.xyz, R3, R0.w;\n"
     "MUL R2.xyz, R1, R2;\n"
+    "ADD R2.w, -R1, c[9].z;\n"
     "MAD R2.xyz, R3, R4, R2;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "ADD R0.x, -R0.w, c[9].z;\n"
@@ -2060,7 +2064,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "!!ARBfp1.0\n"
     "PARAM c[8] = { program.local[0..5],\n"
     "		{ 2, 4, 1, 9.9999997e-006 },\n"
-    "		{ 8, 3 } };\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -2072,49 +2076,51 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
     "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R1.xy, fragment.position, c[5];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MAX R0.w, R1, c[6];\n"
-    "RCP R2.w, R0.w;\n"
-    "MUL R5.xyz, R1, R2.w;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
     "ADD R0.z, R0, R0.w;\n"
     "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.y, R0.x, c[6].x;\n"
-    "MOV R0.x, c[6];\n"
-    "RSQ R2.x, R5.x;\n"
-    "RSQ R2.z, R5.z;\n"
-    "RSQ R2.y, R5.y;\n"
     "MUL R0.z, -R0, c[1].x;\n"
-    "MUL R0.z, R0, c[6].y;\n"
-    "MAD R0.z, R0.y, R0.y, -R0;\n"
-    "MUL R0.w, R0.x, c[1].x;\n"
-    "RSQ R0.z, R0.z;\n"
-    "RCP R0.x, R0.z;\n"
-    "RCP R0.z, R0.w;\n"
-    "ADD R0.x, -R0.y, R0;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MAD R0.y, R0.x, R0.x, -R0;\n"
+    "RSQ R0.y, R0.y;\n"
+    "RCP R0.y, R0.y;\n"
+    "ADD R0.y, -R0.x, R0;\n"
+    "MOV R0.x, c[6];\n"
+    "MUL R0.x, R0, c[1];\n"
+    "MAX R0.z, R1.w, c[6].w;\n"
+    "RCP R0.z, R0.z;\n"
+    "MUL R3.xyz, R1, R0.z;\n"
+    "MAD R4.xyz, R3, c[7].x, -c[7].y;\n"
+    "RCP R0.x, R0.x;\n"
+    "MUL R0.x, R0.y, R0;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAD R3.xyz, R0, c[6].x, -R0.w;\n"
-    "MAD R6.xyz, -R5, c[7].x, c[7].y;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R1.w, R2, -R1;\n"
-    "MUL R2.xyz, R3, R2;\n"
-    "MAD R4.xyz, R0.w, R1, R2;\n"
-    "MAD R2.xyz, -R1, R2.w, c[6].z;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
+    "MAD R2.xyz, R0, c[6].x, -R0.w;\n"
+    "MAD R4.xyz, R3, R4, c[7].z;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[6].z;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[6].x;\n"
-    "MUL R4.xyz, R1, c[7].x;\n"
-    "MUL R6.xyz, R1, R6;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
+    "MAD R4.xyz, R0.w, R1, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
+    "MUL R4.xyz, R1, c[6].y;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
     "MUL R2.xyz, R1, R2;\n"
     "SGE R3.xyz, R3, R0.w;\n"
@@ -2899,11 +2905,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
-    "PARAM c[12] = { program.local[0..7],\n"
+    "PARAM c[13] = { program.local[0..7],\n"
     "		{ 0.0020000001, -0.01348047, 0.05747731, 0.1212391 },\n"
     "		{ 0.1956359, 0.33299461, 0.99999559, 1.570796 },\n"
     "		{ 3.141593, 0.15915494, 1, 2 },\n"
-    "		{ 9.9999997e-006, 8, 3 } };\n"
+    "		{ 9.9999997e-006, 4, 16, 12 },\n"
+    "		{ 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -2940,41 +2947,43 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "ADD R0.w, -R0.z, c[10].x;\n"
     "CMP R0.x, R0, R0.w, R0.z;\n"
     "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
-    "CMP R0.x, -R0.y, -R0, R0;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MAX R0.y, R1.w, c[11].x;\n"
-    "RCP R2.w, R0.y;\n"
-    "MUL R5.xyz, R1, R2.w;\n"
-    "RSQ R2.x, R5.x;\n"
-    "RSQ R2.z, R5.z;\n"
-    "RSQ R2.y, R5.y;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MAX R0.z, R1.w, c[11].x;\n"
+    "RCP R2.x, R0.z;\n"
+    "MUL R3.xyz, R1, R2.x;\n"
+    "MAD R4.xyz, R3, c[11].z, -c[11].w;\n"
     "ADD R0.x, R0, c[0];\n"
     "MUL R0.x, R0, c[10].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MAD R3.xyz, R0, c[10].w, -R0.w;\n"
-    "MAD R6.xyz, -R5, c[11].y, c[11].z;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R1.w, R2, -R1;\n"
-    "MUL R2.xyz, R3, R2;\n"
-    "MAD R4.xyz, R0.w, R1, R2;\n"
-    "MAD R2.xyz, -R1, R2.w, c[10].z;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MAD R2.xyz, R0, c[10].w, -R0.w;\n"
+    "MAD R4.xyz, R3, R4, c[12].x;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[10].z;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[10].w;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
+    "MAD R4.xyz, R0.w, R1, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R1, c[11].y;\n"
-    "SGE R3.xyz, R3, R0.w;\n"
-    "ADD R2.w, -R1, c[10].z;\n"
-    "MUL R6.xyz, R1, R6;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
+    "SGE R3.xyz, R3, R0.w;\n"
     "MUL R2.xyz, R1, R2;\n"
+    "ADD R2.w, -R1, c[10].z;\n"
     "MAD R2.xyz, R3, R4, R2;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "ADD R0.x, -R0.w, c[10].z;\n"
@@ -3682,11 +3691,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[9] = { program.local[0..4],\n"
+    "PARAM c[10] = { program.local[0..4],\n"
     "		{ 0.0020000001, -0.01348047, 0.05747731, 0.1212391 },\n"
     "		{ 0.1956359, 0.33299461, 0.99999559, 1.570796 },\n"
     "		{ 3.141593, 0.15915494, 1, 2 },\n"
-    "		{ 9.9999997e-006, 8, 3 } };\n"
+    "		{ 9.9999997e-006, 4, 16, 12 },\n"
+    "		{ 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -3723,37 +3733,39 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "ADD R0.w, -R0.z, c[7].x;\n"
     "CMP R0.x, R0, R0.w, R0.z;\n"
     "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
-    "CMP R0.x, -R0.y, -R0, R0;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MAX R0.y, R1.w, c[8].x;\n"
-    "RCP R2.w, R0.y;\n"
-    "MUL R5.xyz, R1, R2.w;\n"
-    "RSQ R2.x, R5.x;\n"
-    "RSQ R2.z, R5.z;\n"
-    "RSQ R2.y, R5.y;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MAX R0.z, R1.w, c[8].x;\n"
+    "RCP R2.x, R0.z;\n"
+    "MUL R3.xyz, R1, R2.x;\n"
+    "MAD R4.xyz, R3, c[8].z, -c[8].w;\n"
     "ADD R0.x, R0, c[0];\n"
     "MUL R0.x, R0, c[7].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAD R3.xyz, R0, c[7].w, -R0.w;\n"
-    "MAD R6.xyz, -R5, c[8].y, c[8].z;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R1.w, R2, -R1;\n"
-    "MUL R2.xyz, R3, R2;\n"
-    "MAD R4.xyz, R0.w, R1, R2;\n"
-    "MAD R2.xyz, -R1, R2.w, c[7].z;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
+    "MAD R2.xyz, R0, c[7].w, -R0.w;\n"
+    "MAD R4.xyz, R3, R4, c[9].x;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[7].z;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[7].w;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
+    "MAD R4.xyz, R0.w, R1, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R1, c[8].y;\n"
-    "MUL R6.xyz, R1, R6;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
     "MUL R2.xyz, R1, R2;\n"
     "SGE R3.xyz, R3, R0.w;\n"
@@ -4356,8 +4368,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[10] = { program.local[0..7],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -4365,13 +4377,6 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xy, fragment.position, c[5];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MAX R0.w, R1, c[8].z;\n"
-    "RCP R2.w, R0.w;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "RSQ R0.w, R2.x;\n"
-    "MUL R5.xyz, -R2, c[8].w;\n"
     "MUL R0.xyz, fragment.position.y, c[2];\n"
     "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
     "ADD R0.xyz, R0, c[3];\n"
@@ -4379,32 +4384,40 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "RSQ R0.z, R2.y;\n"
-    "RSQ R0.y, R2.z;\n"
-    "MAD R2.xyz, -R1, R2.w, c[8].x;\n"
-    "RCP R3.x, R0.w;\n"
-    "RCP R3.y, R0.z;\n"
-    "RCP R3.z, R0.y;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
+    "MAX R0.z, R1.w, c[8];\n"
+    "RCP R0.z, R0.z;\n"
+    "MUL R3.xyz, R1, R0.z;\n"
+    "MAD R2.xyz, R3, c[9].x, -c[9].y;\n"
     "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MAD R4.xyz, R1.w, R3, -R1;\n"
-    "MAD R3.xyz, R0, c[8].y, -R0.w;\n"
-    "MUL R4.xyz, R3, R4;\n"
-    "ADD R6.xyz, R5, c[9].x;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MAD R4.xyz, R3, R2, c[9].z;\n"
+    "MAD R2.xyz, R0, c[8].y, -R0.w;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[8].x;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[8].y;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
     "MAD R4.xyz, R0.w, R1, R4;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R1, c[8].w;\n"
-    "SGE R3.xyz, R3, R0.w;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MUL R6.xyz, R1, R6;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
+    "SGE R3.xyz, R3, R0.w;\n"
     "MUL R2.xyz, R1, R2;\n"
+    "ADD R2.w, -R1, c[8].x;\n"
     "MAD R2.xyz, R3, R4, R2;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "ADD R0.x, -R0.w, c[8];\n"
@@ -4815,8 +4828,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[7] = { program.local[0..4],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -4824,13 +4837,6 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xy, fragment.position, c[4];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MAX R0.w, R1, c[5].z;\n"
-    "RCP R2.w, R0.w;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "RSQ R0.w, R2.x;\n"
-    "MUL R5.xyz, -R2, c[5].w;\n"
     "MUL R0.xyz, fragment.position.y, c[2];\n"
     "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
     "ADD R0.xyz, R0, c[3];\n"
@@ -4838,28 +4844,36 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "RSQ R0.z, R2.y;\n"
-    "RSQ R0.y, R2.z;\n"
-    "MAD R2.xyz, -R1, R2.w, c[5].x;\n"
-    "RCP R3.x, R0.w;\n"
-    "RCP R3.y, R0.z;\n"
-    "RCP R3.z, R0.y;\n"
+    "MUL R1.xy, fragment.position, c[4];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
+    "MAX R0.z, R1.w, c[5];\n"
+    "RCP R0.z, R0.z;\n"
+    "MUL R3.xyz, R1, R0.z;\n"
+    "MAD R2.xyz, R3, c[6].x, -c[6].y;\n"
     "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAD R4.xyz, R1.w, R3, -R1;\n"
-    "MAD R3.xyz, R0, c[5].y, -R0.w;\n"
-    "MUL R4.xyz, R3, R4;\n"
-    "ADD R6.xyz, R5, c[6].x;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MAD R4.xyz, R3, R2, c[6].z;\n"
+    "MAD R2.xyz, R0, c[5].y, -R0.w;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[5].x;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[5].y;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
     "MAD R4.xyz, R0.w, R1, R4;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R1, c[5].w;\n"
-    "MUL R6.xyz, R1, R6;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
     "MUL R2.xyz, R1, R2;\n"
     "SGE R3.xyz, R3, R0.w;\n"
@@ -5333,8 +5347,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[10] = { program.local[0..7],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -5342,44 +5356,45 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xy, fragment.position, c[5];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MAX R0.x, R1.w, c[8].z;\n"
-    "RCP R2.w, R0.x;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "RSQ R0.w, R2.x;\n"
-    "RCP R3.x, R0.w;\n"
-    "RSQ R0.w, R2.y;\n"
-    "MUL R5.xyz, -R2, c[8].w;\n"
     "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
     "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
     "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "RSQ R0.z, R2.z;\n"
-    "MAD R2.xyz, -R1, R2.w, c[8].x;\n"
-    "RCP R3.y, R0.w;\n"
-    "RCP R3.z, R0.z;\n"
+    "MAX R0.w, R1, c[8].z;\n"
+    "RCP R0.w, R0.w;\n"
+    "MUL R3.xyz, R1, R0.w;\n"
+    "MAD R2.xyz, R3, c[9].x, -c[9].y;\n"
     "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[2], 2D;\n"
-    "MAD R4.xyz, R1.w, R3, -R1;\n"
-    "MAD R3.xyz, R0, c[8].y, -R0.w;\n"
-    "MUL R4.xyz, R3, R4;\n"
-    "ADD R6.xyz, R5, c[9].x;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MAD R4.xyz, R3, R2, c[9].z;\n"
+    "MAD R2.xyz, R0, c[8].y, -R0.w;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[8].x;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[8].y;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
     "MAD R4.xyz, R0.w, R1, R4;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R1, c[8].w;\n"
-    "SGE R3.xyz, R3, R0.w;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MUL R6.xyz, R1, R6;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
+    "SGE R3.xyz, R3, R0.w;\n"
     "MUL R2.xyz, R1, R2;\n"
+    "ADD R2.w, -R1, c[8].x;\n"
     "MAD R2.xyz, R3, R4, R2;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "ADD R0.x, -R0.w, c[8];\n"
@@ -5768,8 +5783,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[7] = { program.local[0..4],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -5777,40 +5792,41 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xy, fragment.position, c[4];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MAX R0.x, R1.w, c[5].z;\n"
-    "RCP R2.w, R0.x;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "RSQ R0.w, R2.x;\n"
-    "RCP R3.x, R0.w;\n"
-    "RSQ R0.w, R2.y;\n"
-    "MUL R5.xyz, -R2, c[5].w;\n"
     "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MUL R1.xy, fragment.position, c[4];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
     "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
     "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "RSQ R0.z, R2.z;\n"
-    "MAD R2.xyz, -R1, R2.w, c[5].x;\n"
-    "RCP R3.y, R0.w;\n"
-    "RCP R3.z, R0.z;\n"
+    "MAX R0.w, R1, c[5].z;\n"
+    "RCP R0.w, R0.w;\n"
+    "MUL R3.xyz, R1, R0.w;\n"
+    "MAD R2.xyz, R3, c[6].x, -c[6].y;\n"
     "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
-    "MAD R4.xyz, R1.w, R3, -R1;\n"
-    "MAD R3.xyz, R0, c[5].y, -R0.w;\n"
-    "MUL R4.xyz, R3, R4;\n"
-    "ADD R6.xyz, R5, c[6].x;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MAD R4.xyz, R3, R2, c[6].z;\n"
+    "MAD R2.xyz, R0, c[5].y, -R0.w;\n"
+    "MUL R5.xyz, R1.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[5].x;\n"
+    "MAD R2.xyz, R2, R3, R0.w;\n"
     "MUL R3.xyz, R0, c[5].y;\n"
-    "MAD R6.xyz, -R5, R6, R0.w;\n"
+    "MAD R5.xyz, R0.w, R1, R6;\n"
     "MAD R4.xyz, R0.w, R1, R4;\n"
-    "MAD R5.xyz, -R1, R6, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R1, c[5].w;\n"
-    "MUL R6.xyz, R1, R6;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R1, R2, R4;\n"
     "MUL R2.xyz, R1, R2;\n"
     "SGE R3.xyz, R3, R0.w;\n"
@@ -6295,8 +6311,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[10] = { program.local[0..7],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -6304,46 +6320,47 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xy, fragment.position, c[5];\n"
-    "TEX R0, R0, texture[0], 2D;\n"
-    "MAX R1.w, R0, c[8].z;\n"
-    "RCP R2.w, R1.w;\n"
-    "MUL R2.xyz, R0, R2.w;\n"
-    "RSQ R1.w, R2.x;\n"
-    "MUL R5.xyz, -R2, c[8].w;\n"
-    "MUL R1.xyz, fragment.position.y, c[2];\n"
-    "MAD R1.xyz, fragment.position.x, c[1], R1;\n"
-    "ADD R1.xyz, R1, c[3];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
     "RCP R1.z, R1.z;\n"
     "MUL R1.xy, R1, R1.z;\n"
     "MUL R1.xy, R1, c[0];\n"
     "TEX R1.x, R1, texture[2], 2D;\n"
-    "RSQ R1.z, R2.y;\n"
-    "RSQ R1.y, R2.z;\n"
-    "MAD R2.xyz, -R0, R2.w, c[8].x;\n"
-    "RCP R3.x, R1.w;\n"
-    "RCP R3.y, R1.z;\n"
-    "RCP R3.z, R1.y;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MAX R1.z, R0.w, c[8];\n"
+    "RCP R1.z, R1.z;\n"
+    "MUL R3.xyz, R0, R1.z;\n"
+    "MAD R2.xyz, R3, c[9].x, -c[9].y;\n"
     "ADD R1.x, -R1, c[8];\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MAD R4.xyz, R0.w, R3, -R0;\n"
-    "MAD R3.xyz, R1, c[8].y, -R1.w;\n"
-    "MUL R4.xyz, R3, R4;\n"
-    "ADD R6.xyz, R5, c[9].x;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R1.w;\n"
+    "MAD R4.xyz, R3, R2, c[9].z;\n"
+    "MAD R2.xyz, R1, c[8].y, -R1.w;\n"
+    "MUL R5.xyz, R0.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[8].x;\n"
+    "MAD R2.xyz, R2, R3, R1.w;\n"
     "MUL R3.xyz, R1, c[8].y;\n"
-    "MAD R6.xyz, -R5, R6, R1.w;\n"
+    "MAD R5.xyz, R1.w, R0, R6;\n"
     "MAD R4.xyz, R1.w, R0, R4;\n"
-    "MAD R5.xyz, -R0, R6, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R0, c[8].w;\n"
-    "SGE R3.xyz, R3, R1.w;\n"
-    "ADD R2.w, -R0, c[8].x;\n"
-    "MUL R6.xyz, R0, R6;\n"
     "SGE R4.xyz, R4, R0.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R0, R2, R4;\n"
+    "SGE R3.xyz, R3, R1.w;\n"
     "MUL R2.xyz, R0, R2;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
     "MAD R2.xyz, R3, R4, R2;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
     "ADD R1.x, -R1.w, c[8];\n"
@@ -6755,8 +6772,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[7] = { program.local[0..4],\n"
-    "		{ 1, 2, 9.9999997e-006, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 2, 9.9999997e-006, 4 },\n"
+    "		{ 16, 12, 3 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -6764,42 +6781,43 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xy, fragment.position, c[4];\n"
-    "TEX R0, R0, texture[0], 2D;\n"
-    "MAX R1.w, R0, c[5].z;\n"
-    "RCP R2.w, R1.w;\n"
-    "MUL R2.xyz, R0, R2.w;\n"
-    "RSQ R1.w, R2.x;\n"
-    "MUL R5.xyz, -R2, c[5].w;\n"
-    "MUL R1.xyz, fragment.position.y, c[2];\n"
-    "MAD R1.xyz, fragment.position.x, c[1], R1;\n"
-    "ADD R1.xyz, R1, c[3];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
     "RCP R1.z, R1.z;\n"
     "MUL R1.xy, R1, R1.z;\n"
     "MUL R1.xy, R1, c[0];\n"
     "TEX R1.x, R1, texture[1], 2D;\n"
-    "RSQ R1.z, R2.y;\n"
-    "RSQ R1.y, R2.z;\n"
-    "MAD R2.xyz, -R0, R2.w, c[5].x;\n"
-    "RCP R3.x, R1.w;\n"
-    "RCP R3.y, R1.z;\n"
-    "RCP R3.z, R1.y;\n"
+    "MUL R0.xy, fragment.position, c[4];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MAX R1.z, R0.w, c[5];\n"
+    "RCP R1.z, R1.z;\n"
+    "MUL R3.xyz, R0, R1.z;\n"
+    "MAD R2.xyz, R3, c[6].x, -c[6].y;\n"
     "ADD R1.x, -R1, c[5];\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MAD R4.xyz, R0.w, R3, -R0;\n"
-    "MAD R3.xyz, R1, c[5].y, -R1.w;\n"
-    "MUL R4.xyz, R3, R4;\n"
-    "ADD R6.xyz, R5, c[6].x;\n"
-    "MUL R5.xyz, R2, R3;\n"
-    "MAD R2.xyz, -R2, R3, R1.w;\n"
+    "MAD R4.xyz, R3, R2, c[6].z;\n"
+    "MAD R2.xyz, R1, c[5].y, -R1.w;\n"
+    "MUL R5.xyz, R0.w, R2;\n"
+    "MUL R6.xyz, R5, R4;\n"
+    "RSQ R2.w, R3.x;\n"
+    "RCP R4.x, R2.w;\n"
+    "RSQ R2.w, R3.y;\n"
+    "RSQ R3.w, R3.z;\n"
+    "RCP R4.y, R2.w;\n"
+    "RCP R4.z, R3.w;\n"
+    "ADD R4.xyz, -R3, R4;\n"
+    "MUL R6.xyz, R3, R6;\n"
+    "MUL R4.xyz, R5, R4;\n"
+    "ADD R3.xyz, -R3, c[5].x;\n"
+    "MAD R2.xyz, R2, R3, R1.w;\n"
     "MUL R3.xyz, R1, c[5].y;\n"
-    "MAD R6.xyz, -R5, R6, R1.w;\n"
+    "MAD R5.xyz, R1.w, R0, R6;\n"
     "MAD R4.xyz, R1.w, R0, R4;\n"
-    "MAD R5.xyz, -R0, R6, R4;\n"
+    "ADD R6.xyz, R4, -R5;\n"
     "MUL R4.xyz, R0, c[5].w;\n"
-    "MUL R6.xyz, R0, R6;\n"
     "SGE R4.xyz, R4, R0.w;\n"
-    "MAD R4.xyz, R4, R5, R6;\n"
+    "MAD R4.xyz, R4, R6, R5;\n"
     "MAD R4.xyz, -R0, R2, R4;\n"
     "MUL R2.xyz, R0, R2;\n"
     "SGE R3.xyz, R3, R1.w;\n"