diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-09-26 14:23:59 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-26 19:17:46 +0000 |
| commit | bed683addbd2f31da05dc19f24f3257bee30ee8c (patch) | |
| tree | 9aca6c54e84244393aced6d32fa9f855145445b5 /src/gpu/ccpr | |
| parent | e9242ca695a390445690cb32f67eedef85f54099 (diff) | |
switched gl_Position and gl_PointSize to sk_*
Bug: skia:
Change-Id: Ie7508991aa975c1400bac23ae49d81041a313968
Reviewed-on: https://skia-review.googlesource.com/51320
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu/ccpr')
| -rw-r--r-- | src/gpu/ccpr/GrCCPRCoverageProcessor.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCPRCubicProcessor.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCPRTriangleProcessor.cpp | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp index a295f05d47..4a0dd2666a 100644 --- a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp +++ b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp @@ -145,7 +145,7 @@ void PrimitiveProcessor::emitGeometryShader(const GrCCPRCoverageProcessor& proc, fnBody.appendf("%s = %s * %s;", fFragCoverageTimesWind.gsOut(), coverage, fGeomWind.c_str()); } - fnBody.append ("gl_Position = float4(position, 0, 1);"); + fnBody.append ("sk_Position = float4(position, 0, 1);"); fnBody.append ("EmitVertex();"); return fnBody; }().c_str(), &emitVertexFn); diff --git a/src/gpu/ccpr/GrCCPRCubicProcessor.cpp b/src/gpu/ccpr/GrCCPRCubicProcessor.cpp index 6070527401..ac8359b3df 100644 --- a/src/gpu/ccpr/GrCCPRCubicProcessor.cpp +++ b/src/gpu/ccpr/GrCCPRCubicProcessor.cpp @@ -46,10 +46,10 @@ void GrCCPRCubicProcessor::emitWind(GrGLSLGeometryBuilder* g, const char* rtAdju void GrCCPRCubicProcessor::onEmitGeometryShader(GrGLSLGeometryBuilder* g, const char* emitVertexFn, const char* wind, const char* rtAdjust) const { // Prepend bezierpts at the start of the shader. - g->codePrependf("float4x2 bezierpts = float4x2(sk_in[0].gl_Position.xy, " - "sk_in[1].gl_Position.xy, " - "sk_in[2].gl_Position.xy, " - "sk_in[3].gl_Position.xy);"); + g->codePrependf("float4x2 bezierpts = float4x2(sk_in[0].sk_Position.xy, " + "sk_in[1].sk_Position.xy, " + "sk_in[2].sk_Position.xy, " + "sk_in[3].sk_Position.xy);"); // Evaluate the cubic at T=.5 for an mid-ish point. g->codeAppendf("float2 midpoint = bezierpts * float4(.125, .375, .375, .125);"); diff --git a/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp b/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp index 9b85783afd..2a56b22227 100644 --- a/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp +++ b/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp @@ -45,9 +45,9 @@ void GrCCPRQuadraticProcessor::onEmitGeometryShader(GrGLSLGeometryBuilder* g, const char* emitVertexFn, const char* wind, const char* rtAdjust) const { // Prepend bezierpts at the start of the shader. - g->codePrependf("float3x2 bezierpts = float3x2(sk_in[0].gl_Position.xy, " - "sk_in[1].gl_Position.xy, " - "sk_in[2].gl_Position.xy);"); + g->codePrependf("float3x2 bezierpts = float3x2(sk_in[0].sk_Position.xy, " + "sk_in[1].sk_Position.xy, " + "sk_in[2].sk_Position.xy);"); g->declareGlobal(fCanonicalMatrix); g->codeAppendf("%s = float3x3(0.0, 0, 1, " diff --git a/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp b/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp index 489138ecbd..1aac0ed9c2 100644 --- a/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp +++ b/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp @@ -25,9 +25,9 @@ void GrCCPRTriangleProcessor::onEmitVertexShader(const GrCCPRCoverageProcessor& void GrCCPRTriangleProcessor::defineInputVertices(GrGLSLGeometryBuilder* g) const { // Prepend in_vertices at the start of the shader. - g->codePrependf("float3x2 in_vertices = float3x2(sk_in[0].gl_Position.xy, " - "sk_in[1].gl_Position.xy, " - "sk_in[2].gl_Position.xy);"); + g->codePrependf("float3x2 in_vertices = float3x2(sk_in[0].sk_Position.xy, " + "sk_in[1].sk_Position.xy, " + "sk_in[2].sk_Position.xy);"); } void GrCCPRTriangleProcessor::emitWind(GrGLSLGeometryBuilder* g, const char* /*rtAdjust*/, |