commit 70132d0c73431320d4e637868e98d8b36da05eff
author Brian Salomon <bsalomon@google.com> Tue May 29 15:33:06 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed May 30 18:11:48 2018 +0000
tree 19e3f536a0312a48e6acf80ec4e58024bec2a0df
parent 8f480d91eea1421c1f9d7251699b710fd0cf2197

Make GrPrimitiveProcessor::Attribute a class, hide data members.

Change-Id: I008881d79c82fdde6bb68fe2218e62ccc9c538dd
Reviewed-on: https://skia-review.googlesource.com/130600
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrDefaultGeoProcFactory.cpp

diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/GrDefaultGeoProcFactory.cpp
index d7a5ea5..1448aec 100644
--- a/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -86,7 +86,7 @@
                 varyingHandler->addVarying("color", &varying);
 
                 // There are several optional steps to process the color. Start with the attribute:
-                vertBuilder->codeAppendf("half4 color = %s;", gp.inColor()->fName);
+                vertBuilder->codeAppendf("half4 color = %s;", gp.inColor()->name());
 
                 // Linearize
                 if (gp.linearizeColor()) {
@@ -102,10 +102,10 @@
                                               ": pow((x + 0.055) / 1.055, 2.4);",
                                               &srgbFuncName);
                     vertBuilder->codeAppendf("color = half4(%s(%s.r), %s(%s.g), %s(%s.b), %s.a);",
-                                             srgbFuncName.c_str(), gp.inColor()->fName,
-                                             srgbFuncName.c_str(), gp.inColor()->fName,
-                                             srgbFuncName.c_str(), gp.inColor()->fName,
-                                             gp.inColor()->fName);
+                                             srgbFuncName.c_str(), gp.inColor()->name(),
+                                             srgbFuncName.c_str(), gp.inColor()->name(),
+                                             srgbFuncName.c_str(), gp.inColor()->name(),
+                                             gp.inColor()->name());
                 }
 
                 // For SkColor, do a red/blue swap and premul
@@ -135,7 +135,7 @@
             this->writeOutputPosition(vertBuilder,
                                       uniformHandler,
                                       gpArgs,
-                                      gp.inPosition()->fName,
+                                      gp.inPosition()->name(),
                                       gp.viewMatrix(),
                                       &fViewMatrixUniform);