diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-07-28 15:19:46 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-28 20:43:03 +0000 |
| commit | 5af9ea399d5e0344cc4b7da4e97b5dc5b3c74f64 (patch) | |
| tree | df906a3af0b954b130340589f24d128ce655bb01 /src/core/SkColorMatrixFilterRowMajor255.cpp | |
| parent | 0edfbb78244739cb6e695f240edb7f659a543160 (diff) | |
renamed SkSL types in preparation for killing precision modifiers
Bug: skia:
Change-Id: Iff0289e25355a89cdc289a0892ed755dd1b1c900
Reviewed-on: https://skia-review.googlesource.com/27703
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/core/SkColorMatrixFilterRowMajor255.cpp')
| -rw-r--r-- | src/core/SkColorMatrixFilterRowMajor255.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index 94e3c7e030..9262e5bf5d 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -210,14 +210,15 @@ private: if (nullptr == args.fInputColor) { // could optimize this case, but we aren't for now. - args.fInputColor = "vec4(1)"; + args.fInputColor = "float4(1)"; } GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder; // The max() is to guard against 0 / 0 during unpremul when the incoming color is // transparent black. fragBuilder->codeAppendf("\tfloat nonZeroAlpha = max(%s.a, 0.00001);\n", args.fInputColor); - fragBuilder->codeAppendf("\t%s = %s * vec4(%s.rgb / nonZeroAlpha, nonZeroAlpha) + %s;\n", + fragBuilder->codeAppendf("\t%s = %s * float4(%s.rgb / nonZeroAlpha, nonZeroAlpha) + " + "%s;\n", args.fOutputColor, uniformHandler->getUniformCStr(fMatrixHandle), args.fInputColor, |