diff options
| author |  cdalton <cdalton@nvidia.com> | 2016-02-11 12:49:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-11 12:49:47 -0800 |
| commit | 5e58ceea8569f0d90ff7e3daf5de2def50407212 (patch) | |
| tree | bbe7f5ff37b6ef7e38830e85e8f4a392ddb75903 /src/core | |
| parent | ddb64c81fbe05ef7188135564bbd695edea9fdf0 (diff) | |
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
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkColorMatrixFilterRowMajor255.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkLightingShader.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index 33bf042233..3b79d7f42c 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -257,10 +257,10 @@ public: void emitCode(EmitArgs& args) override { GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; - fMatrixHandle = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fMatrixHandle = uniformHandler->addUniform(kFragment_GrShaderFlag, kMat44f_GrSLType, kDefault_GrSLPrecision, "ColorMatrix"); - fVectorHandle = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fVectorHandle = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_GrSLType, kDefault_GrSLPrecision, "ColorMatrixVector"); diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp index a9fcac3b83..a68553e661 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/core/SkLightingShader.cpp @@ -185,22 +185,22 @@ public: // add uniforms const char* lightDirUniName = nullptr; - fLightDirUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fLightDirUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec3f_GrSLType, kDefault_GrSLPrecision, "LightDir", &lightDirUniName); const char* lightColorUniName = nullptr; - fLightColorUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fLightColorUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec3f_GrSLType, kDefault_GrSLPrecision, "LightColor", &lightColorUniName); const char* ambientColorUniName = nullptr; - fAmbientColorUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fAmbientColorUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec3f_GrSLType, kDefault_GrSLPrecision, "AmbientColor", &ambientColorUniName); const char* xformUniName = nullptr; - fXformUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fXformUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec2f_GrSLType, kDefault_GrSLPrecision, "Xform", &xformUniName); |