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/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/glsl/GrGLSLShaderBuilder.cpp index a2cf66c..c94a855 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLShaderBuilder.cpp
@@ -158,8 +158,7 @@ this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString(); this->compileAndAppendLayoutQualifiers(); SkASSERT(visibility); - fProgramBuilder->appendUniformDecls((GrGLSLUniformHandler::ShaderVisibility) visibility, - &this->uniforms()); + fProgramBuilder->appendUniformDecls((GrShaderFlags) visibility, &this->uniforms()); this->appendDecls(fInputs, &this->inputs()); this->appendDecls(fOutputs, &this->outputs()); this->onFinalize();