diff options
author | 2017-05-03 09:49:07 -0400 | |
---|---|---|
committer | 2017-05-03 14:13:41 +0000 | |
commit | 796001c82eca5651bc6a221204f6186918781daf (patch) | |
tree | 6afce852c893eab7c313cb3c5f869c56e3a6d5e1 /src/core | |
parent | 131154be103d3706470aa3ce2c17fafde3493490 (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 'src/core')
-rw-r--r-- | src/core/SkLightingShader.cpp | 2 | ||||
-rw-r--r-- | src/core/SkNormalMapSource.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp index 600134ded3..0442913025 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/core/SkLightingShader.cpp @@ -168,7 +168,7 @@ public: fragBuilder->codeAppendf("vec4 diffuseColor = %s;", args.fInputColor); SkString dstNormalName("dstNormal"); - this->emitChild(0, nullptr, &dstNormalName, args); + this->emitChild(0, &dstNormalName, args); fragBuilder->codeAppendf("vec3 normal = %s.xyz;", dstNormalName.c_str()); diff --git a/src/core/SkNormalMapSource.cpp b/src/core/SkNormalMapSource.cpp index 65c5c89268..fb133da1b7 100644 --- a/src/core/SkNormalMapSource.cpp +++ b/src/core/SkNormalMapSource.cpp @@ -47,7 +47,7 @@ public: kDefault_GrSLPrecision, "Xform", &xformUniName); SkString dstNormalColorName("dstNormalColor"); - this->emitChild(0, nullptr, &dstNormalColorName, args); + this->emitChild(0, &dstNormalColorName, args); fragBuilder->codeAppendf("vec3 normal = normalize(%s.rgb - vec3(0.5));", dstNormalColorName.c_str()); |