commit dabd98c390233d9f7daac3fbeb840c2ff759fe57
author Ben Wagner <bungeman@google.com> Wed Mar 25 15:17:18 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 26 16:23:30 2020 +0000
tree c937327ee8791ecd343e9c7a1e8bc2f0b87f8fe2
parent 17dc41870ae2667c08f1da7ace854ecf190844ba

Begin fixing GrShaderVar.

Remove as many setters as possible, make the constructors less
ambiguous, make it movable, remove USE_UNIFORM_FLOAT_ARRAYS.

Change-Id: I71397d04b5b5d6deb792d77cb98d629d42785f06
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/279218
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

gm/tessellation.cpp

diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp
index 76d0c1c..9ab09c3 100644
--- a/gm/tessellation.cpp
+++ b/gm/tessellation.cpp
@@ -72,7 +72,7 @@
             fViewMatrixUniform = args.fUniformHandler->addUniform(
                     kVertex_GrShaderFlag, kFloat3x3_GrSLType, "view_matrix", &viewMatrix);
             args.fVertBuilder->declareGlobal(
-                    GrShaderVar("P_", kFloat3_GrSLType, GrShaderVar::kOut_TypeModifier));
+                    GrShaderVar("P_", kFloat3_GrSLType, GrShaderVar::TypeModifier::Out));
             args.fVertBuilder->codeAppendf(R"(
                     P_.xy = (%s * float3(position.xy, 1)).xy;
                     P_.z = position.z;)", viewMatrix);
@@ -161,7 +161,7 @@
 void TessellationTestTriShader::Impl::writeFragmentShader(
         GrGLSLFPFragmentBuilder* f, const char* color, const char* coverage) {
     f->declareGlobal(
-            GrShaderVar("barycentric_coord", kFloat3_GrSLType, GrShaderVar::kIn_TypeModifier));
+            GrShaderVar("barycentric_coord", kFloat3_GrSLType, GrShaderVar::TypeModifier::In));
     f->codeAppendf(R"(
             half3 d = half3(1 - barycentric_coord/fwidth(barycentric_coord));
             half coverage = max(max(d.x, d.y), d.z);
@@ -186,7 +186,7 @@
             fViewMatrixUniform = args.fUniformHandler->addUniform(
                     kVertex_GrShaderFlag, kFloat3x3_GrSLType, "view_matrix", &viewMatrix);
             args.fVertBuilder->declareGlobal(
-                    GrShaderVar("M_", kFloat3x3_GrSLType, GrShaderVar::kOut_TypeModifier));
+                    GrShaderVar("M_", kFloat3x3_GrSLType, GrShaderVar::TypeModifier::Out));
             args.fVertBuilder->codeAppendf("M_ = %s;", viewMatrix);
             // GrGLProgramBuilder will call writeTess*ShaderGLSL when it is compiling.
             this->writeFragmentShader(args.fFragBuilder, args.fOutputColor, args.fOutputCoverage);
@@ -267,7 +267,7 @@
 void TessellationTestRectShader::Impl::writeFragmentShader(
         GrGLSLFPFragmentBuilder* f, const char* color, const char* coverage) {
     f->declareGlobal(GrShaderVar("barycentric_coord", kFloat4_GrSLType,
-                                 GrShaderVar::kIn_TypeModifier));
+                                 GrShaderVar::TypeModifier::In));
     f->codeAppendf(R"(
             float4 fwidths = fwidth(barycentric_coord);
             half coverage = 0;