diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-18 02:01:32 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-18 02:24:07 +0000 |
| commit | 56fbbd65807d1c4ff63b5233764c6e15cba51bb4 (patch) | |
| tree | ac7cc908e2fb7898eb87be61e32a8ad53ba0fba6 /src/gpu | |
| parent | f3eac7140aebda2e0c3b570f23b94b222d7664aa (diff) | |
Revert "Minor fixes to SkSL precisions"
This reverts commit 9752c3c3079140d7dbcf1fb2feb513f1e139a03a.
Reason for revert: prerequisite to reverting 05d5a13fea6246648de7e41358ed338d53c85ea2
Original change's description:
> Minor fixes to SkSL precisions
>
> No-Presubmit: true
> No-Tree-Checks: true
> Bug: skia:
> Change-Id: Ife95d3ba457f79c00bf4fdd54af898a3a50402aa
> Reviewed-on: https://skia-review.googlesource.com/47241
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:
Change-Id: Ib1ef28bc94263154e54c01fd172d83ee48a797a8
Reviewed-on: https://skia-review.googlesource.com/47720
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/ccpr/GrCCPRCubicProcessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/ccpr/GrCCPRCubicProcessor.cpp b/src/gpu/ccpr/GrCCPRCubicProcessor.cpp index 1fc2a29342..fcf2076c1c 100644 --- a/src/gpu/ccpr/GrCCPRCubicProcessor.cpp +++ b/src/gpu/ccpr/GrCCPRCubicProcessor.cpp @@ -124,7 +124,7 @@ void GrCCPRCubicProcessor::emitPerVertexGeometryCode(SkString* fnBody, const cha const char* /*coverage*/, const char* /*wind*/) const { fnBody->appendf("highfloat3 klm = highfloat3(%s, 1) * %s;", position, fKLMMatrix.c_str()); - fnBody->appendf("highfloat d = dot(highfloat3(%s, 1), %s);", + fnBody->appendf("highfloat d = dot(float3(%s, 1), %s);", position, fEdgeDistanceEquation.c_str()); fnBody->appendf("%s = highfloat4(klm, d);", fKLMD.gsOut()); this->onEmitPerVertexGeometryCode(fnBody); @@ -202,7 +202,7 @@ void GrCCPRCubicCornerProcessor::emitShaderCoverage(GrGLSLFragmentBuilder* f, // Use software msaa to estimate actual coverage at the corner pixels. const int sampleCount = this->defineSoftSampleLocations(f, "samples"); - f->codeAppendf("highfloat4 klmd_center = highfloat4(%s.xyz, %s.w + 0.5);", + f->codeAppendf("highfloat4 klmd_center = float4(%s.xyz, %s.w + 0.5);", fKLMD.fsIn(), fKLMD.fsIn()); f->codeAppendf("for (int i = 0; i < %i; ++i) {", sampleCount); f->codeAppend ( "highfloat4 klmd = grad_klmd * samples[i] + klmd_center;"); |