From 5e58ceea8569f0d90ff7e3daf5de2def50407212 Mon Sep 17 00:00:00 2001 From: cdalton Date: Thu, 11 Feb 2016 12:49:47 -0800 Subject: 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 --- src/core/SkLightingShader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/SkLightingShader.cpp') 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); -- cgit v1.2.3