Some fixes for saturation computation XferEffect.

src/core/SkXfermode.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkXfermode.h"
@@ skipping 1287 matching lines @@
                 GrGLShaderVar("sat", kFloat_GrSLType),
             };
             helperArgs[0].setTypeModifier(GrGLShaderVar::kInOut_TypeModifier);
             helperArgs[1].setTypeModifier(GrGLShaderVar::kInOut_TypeModifier);
             helperArgs[2].setTypeModifier(GrGLShaderVar::kInOut_TypeModifier);
             SkString helperBody;
             helperBody.append("\tif (minComp < maxComp) {\n"
                               "\t\tmidComp = sat * (midComp - minComp) / (maxComp - minComp);\n"
                               "\t\tmaxComp = sat;\n"
                               "\t} else {\n"
-                              "\t\tmidComp = midComp = 0.0;\n"
+                              "\t\tmidComp = maxComp = 0.0;\n"
                               "\t}\n"
                               "\tminComp = 0.0;\n");
             builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType,
                                   kVoid_GrSLType,
                                   "set_saturation_helper",
                                   SK_ARRAY_COUNT(helperArgs), helperArgs,
                                   helperBody.c_str(),
                                   &helperFunction);
 
             GrGLShaderVar setSatArgs[] = {
                 GrGLShaderVar("hueLumColor", kVec3f_GrSLType),
                 GrGLShaderVar("satColor", kVec3f_GrSLType),
             };
             const char* helpFunc = helperFunction.c_str();
             SkString setSatBody;
             setSatBody.appendf("\tfloat sat = %s(satColor);\n"
                                "\tif (hueLumColor.r <= hueLumColor.g) {\n"
                                "\t\tif (hueLumColor.g <= hueLumColor.b) {\n"
                                "\t\t\t%s(hueLumColor.r, hueLumColor.g, hueLumColor.b, sat);\n"
+                               "\t\t} else if (hueLumColor.r <= hueLumColor.b) {\n"
+                               "\t\t\t%s(hueLumColor.r, hueLumColor.b, hueLumColor.g, sat);\n"
                                "\t\t} else {\n"
-                               "\t\t\t%s(hueLumColor.r, hueLumColor.b, hueLumColor.g, sat);\n"
+                               "\t\t\t%s(hueLumColor.b, hueLumColor.r, hueLumColor.g, sat);\n"
                                "\t\t}\n"
                                "\t} else if (hueLumColor.r <= hueLumColor.b) {\n"
                                "\t\t%s(hueLumColor.g, hueLumColor.r, hueLumColor.b, sat);\n"
                                "\t} else if (hueLumColor.g <= hueLumColor.b) {\n"
                                "\t\t%s(hueLumColor.g, hueLumColor.b, hueLumColor.r, sat);\n"
                                "\t} else {\n"
                                "\t\t%s(hueLumColor.b, hueLumColor.g, hueLumColor.r, sat);\n"
                                "\t}\n"
                                "\treturn hueLumColor;",
-                               getFunction.c_str(), helpFunc, helpFunc, helpFunc, helpFunc,\
-                               helpFunc);
+                               getFunction.c_str(), helpFunc, helpFunc, helpFunc, helpFunc,
+                               helpFunc, helpFunc);
             builder->emitFunction(GrGLShaderBuilder::kFragment_ShaderType,
                                   kVec3f_GrSLType,
                                   "set_saturation",
                                   SK_ARRAY_COUNT(setSatArgs), setSatArgs,
                                   setSatBody.c_str(),
                                   setSatFunction);
 
         }
 
         typedef GrGLEffect INHERITED;
@@ skipping 613 matching lines @@
     return proc16;
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkClearXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkSrcXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDstInXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDstOutXfermode)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END