commit bed683addbd2f31da05dc19f24f3257bee30ee8c
author Ethan Nicholas <ethannicholas@google.com> Tue Sep 26 14:23:59 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 26 19:17:46 2017 +0000
tree 9aca6c54e84244393aced6d32fa9f855145445b5
parent e9242ca695a390445690cb32f67eedef85f54099

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>

src/gpu/ccpr/GrCCPRCoverageProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp
index a295f05..4a0dd26 100644
--- a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp
@@ -145,7 +145,7 @@
             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);

src/gpu/ccpr/GrCCPRCubicProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPRCubicProcessor.cpp b/src/gpu/ccpr/GrCCPRCubicProcessor.cpp
index 6070527..ac8359b 100644
--- a/src/gpu/ccpr/GrCCPRCubicProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRCubicProcessor.cpp
@@ -46,10 +46,10 @@
 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);");

src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp b/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp
index 9b85783..2a56b22 100644
--- a/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRQuadraticProcessor.cpp
@@ -45,9 +45,9 @@
                                                     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, "

src/gpu/ccpr/GrCCPRTriangleProcessor.cpp

diff --git a/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp b/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp
index 489138e..1aac0ed 100644
--- a/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPRTriangleProcessor.cpp
@@ -25,9 +25,9 @@
 
 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*/,