| commit | 5e58ceea8569f0d90ff7e3daf5de2def50407212 | [log] [tgz] |
|---|---|---|
| author | cdalton <cdalton@nvidia.com> | Thu Feb 11 12:49:47 2016 -0800 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Feb 11 12:49:47 2016 -0800 |
| tree | bbe7f5ff37b6ef7e38830e85e8f4a392ddb75903 | |
| parent | ddb64c81fbe05ef7188135564bbd695edea9fdf0 [diff] [blame] |
Add GrShaderFlags enum Replaces GrGLSLUniformHandler::ShaderVisibility with GrShaderFlags. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684063006 Review URL: https://codereview.chromium.org/1684063006
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index e2b7922..ec306cc 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -539,7 +539,7 @@ const GrDisplacementMapEffect& displacementMap = args.fFp.cast<GrDisplacementMapEffect>(); const GrTextureDomain& domain = displacementMap.domain(); - fScaleUni = args.fUniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fScaleUni = args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kVec2f_GrSLType, kDefault_GrSLPrecision, "Scale"); const char* scaleUni = args.fUniformHandler->getUniformCStr(fScaleUni); const char* dColor = "dColor";