aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-05-03 09:49:07 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-03 14:13:41 +0000
commit796001c82eca5651bc6a221204f6186918781daf (patch)
tree6afce852c893eab7c313cb3c5f869c56e3a6d5e1 /tests
parent131154be103d3706470aa3ce2c17fafde3493490 (diff)
Revert "Revert "eliminated GrGLSLExpr""
This reverts commit 5e550ab57e0204bfadd2cb69c47d2a85e38d6a4c. Bug: skia: Change-Id: I4705e47dbd209aa8f43db3d28c856bd3aa9e49ab Reviewed-on: https://skia-review.googlesource.com/15187 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/GLProgramsTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 25cd3125b9..6e9bef9fc8 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -113,7 +113,7 @@ private:
class GLFP : public GrGLSLFragmentProcessor {
public:
void emitCode(EmitArgs& args) override {
- this->emitChild(0, nullptr, args);
+ this->emitChild(0, args);
}
private: