diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrColorSpaceXform.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/glsl/GrGLSLShaderBuilder.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/GrColorSpaceXform.cpp b/src/gpu/GrColorSpaceXform.cpp index 1eb7328356..c7be3065f3 100644 --- a/src/gpu/GrColorSpaceXform.cpp +++ b/src/gpu/GrColorSpaceXform.cpp @@ -37,8 +37,7 @@ static inline bool matrix_is_almost_identity(const SkMatrix44& m, GrColorSpaceXform::GrColorSpaceXform(const SkMatrix44& srcToDst, SkAlphaType srcAlphaType) : fSrcAlphaType(srcAlphaType) { - // TODO: Fix this, and store things as column major! - srcToDst.asRowMajorf(fSrcToDst); + srcToDst.asColMajorf(fSrcToDst); } sk_sp<GrColorSpaceXform> GrColorSpaceXform::Make(SkColorSpace* src, SkColorSpace* dst, diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp index 8b004b265f..26a7761f32 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp @@ -149,7 +149,7 @@ void GrGLSLShaderBuilder::appendColorGamutXform(SkString* out, "\tcolor.rgb = color.rgb / nonZeroAlpha;\n"); } // Gamut xform, clamp to destination gamut - functionBody.append("\tcolor.rgb = clamp((vec4(color.rgb, 1.0) * xform).rgb, 0.0, 1.0);\n"); + functionBody.append("\tcolor.rgb = clamp((xform * vec4(color.rgb, 1.0)).rgb, 0.0, 1.0);\n"); if (kPremul_SkAlphaType == colorXformHelper->alphaType()) { // Re-multiply by alpha functionBody.append("\tcolor.rgb = color.rgb * nonZeroAlpha;\n"); |