commit 1fbdb61f1389f01ce1cf1b7950e03a84811a9f38
author Chris Dalton <csmartdalton@google.com> Tue Dec 12 12:48:47 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 13 14:29:42 2017 +0000
tree f2e952f809e3987f9e568b3e7d50374364b43fea
parent 250e6e880f26840b200c46396af8d50facf1f2ae

CCPR: Optimize Hull geometry

Conceptualizes hulls a as single entity, rather than a set of "wedges"
fanned around the midpoint. Optimizes GSImpl hulls to use less, better
triangles and not use the midpoint. This refactoring also paves the
way for VSImpl hulls.

Bug: skia:
Change-Id: I6a03c7b64811edfd1589f11a5d102e6ee56ea2d2
Reviewed-on: https://skia-review.googlesource.com/83962
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/ccpr/GrCCPRCubicShader.cpp

diff --git a/src/gpu/ccpr/GrCCPRCubicShader.cpp b/src/gpu/ccpr/GrCCPRCubicShader.cpp
index 4d63e98..0d34d37 100644
--- a/src/gpu/ccpr/GrCCPRCubicShader.cpp
+++ b/src/gpu/ccpr/GrCCPRCubicShader.cpp
@@ -8,13 +8,11 @@
 #include "GrCCPRCubicShader.h"
 
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
+#include "glsl/GrGLSLVertexGeoBuilder.h"
 
-void GrCCPRCubicShader::emitSetupCode(GrGLSLShaderBuilder* s, const char* pts,
-                                      const char* segmentId, const char* wind,
+void GrCCPRCubicShader::emitSetupCode(GrGLSLVertexGeoBuilder* s, const char* pts,
+                                      const char* repetitionID, const char* wind,
                                       GeometryVars* vars) const {
-    // Evaluate the cubic at T=.5 for an mid-ish point.
-    s->codeAppendf("float2 midpoint = %s * float4(.125, .375, .375, .125);", pts);
-
     // Find the cubic's power basis coefficients.
     s->codeAppendf("float2x4 C = float4x4(-1,  3, -3,  1, "
                                          " 3, -6,  3,  0, "
@@ -55,6 +53,9 @@
                                       "L[0], L[middlerow], L[3], "
                                       "M[0], M[middlerow], M[3]);", fKLMMatrix.c_str());
 
+    // Evaluate the cubic at T=.5 for a mid-ish point.
+    s->codeAppendf("float2 midpoint = %s * float4(.125, .375, .375, .125);", pts);
+
     // Orient the KLM matrix so we fill the correct side of the curve.
     s->codeAppendf("float2 orientation = sign(float3(midpoint, 1) * float2x3(%s[1], %s[2]));",
                    fKLMMatrix.c_str(), fKLMMatrix.c_str());
@@ -69,7 +70,7 @@
     s->codeAppendf("float2 edgept1 = %s[3 - edgeidx0];", pts);
     Shader::EmitEdgeDistanceEquation(s, "edgept0", "edgept1", fEdgeDistanceEquation.c_str());
 
-    this->onEmitSetupCode(s, pts, segmentId, vars);
+    this->onEmitSetupCode(s, pts, repetitionID, vars);
 }
 
 GrCCPRCubicShader::WindHandling
@@ -85,12 +86,6 @@
     return WindHandling::kNotHandled;
 }
 
-void GrCCPRCubicHullShader::onEmitSetupCode(GrGLSLShaderBuilder* s, const char* /*pts*/,
-                                            const char* /*wedgeId*/, GeometryVars* vars) const {
-    // "midpoint" was just defined by the base class.
-    vars->fHullVars.fAlternateMidpoint = "midpoint";
-}
-
 void GrCCPRCubicHullShader::onEmitVaryings(GrGLSLVaryingHandler* varyingHandler, SkString* code) {
     // "klm" was just defined by the base class.
     varyingHandler->addVarying("grad_matrix", &fGradMatrix);
@@ -109,9 +104,9 @@
     f->codeAppendf("%s += min(d, 0);", outputCoverage); // Flat closing edge.
 }
 
-void GrCCPRCubicCornerShader::onEmitSetupCode(GrGLSLShaderBuilder* s, const char* pts,
-                                              const char* cornerId, GeometryVars* vars) const {
-    s->codeAppendf("float2 corner = %s[%s * 3];", pts, cornerId);
+void GrCCPRCubicCornerShader::onEmitSetupCode(GrGLSLVertexGeoBuilder* s, const char* pts,
+                                              const char* repetitionID, GeometryVars* vars) const {
+    s->codeAppendf("float2 corner = %s[%s * 3];", pts, repetitionID);
     vars->fCornerVars.fPoint = "corner";
 }