commit ee33873325ce1d492d967bc9644e78e3243055d9
author Ethan Nicholas <ethannicholas@google.com> Mon Jul 17 15:13:45 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 17 19:36:00 2017 +0000
tree d1041a4db635c8a5540232bac0eaa9cd036bb57c
parent c2bd631c431c6ee865b709bd11e26a9bdceaf5cd

fixed skslc vec4 uniforms

Bug: skia:
Change-Id: I40ad3d0e73dbeedcd150b0d0a7f12c636f01cf33
Reviewed-on: https://skia-review.googlesource.com/24100
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/sksl/SkSLCPPCodeGenerator.cpp

diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index 3da7e8e..235c9d8 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -442,7 +442,7 @@
             const char* name = u->fName.c_str();
             if (u->fType == *fContext.fVec4_Type) {
                 this->writef("        const SkRect %sValue = _outer.%s();\n"
-                             "        %s.set4fv(%sVar, 4, (float*) &%sValue);\n",
+                             "        %s.set4fv(%sVar, 1, (float*) &%sValue);\n",
                              name, name, pdman, HCodeGenerator::FieldName(name).c_str(), name);
             } else if (u->fType == *fContext.fMat4x4_Type) {
                 this->writef("        float %sValue[16];\n"

tests/SkSLFPTest.cpp

diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index a5a1a6e..bf8e835 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -205,7 +205,7 @@
             "fColorVar = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_GrSLType, "
                                                          "kDefault_GrSLPrecision, \"color\");",
             "const SkRect colorValue = _outer.color();",
-            "pdman.set4fv(fColorVar, 4, (float*) &colorValue);"
+            "pdman.set4fv(fColorVar, 1, (float*) &colorValue);"
          });
 }