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/gpu/glsl/GrGLSLProgramBuilder.cpp | |
| 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/gpu/glsl/GrGLSLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/glsl/GrGLSLProgramBuilder.cpp index 45570c2d40..9201da946c 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/glsl/GrGLSLProgramBuilder.cpp @@ -255,8 +255,7 @@ void GrGLSLProgramBuilder::nameExpression(GrGLSLExpr4* output, const char* baseN *output = outName; } -void GrGLSLProgramBuilder::appendUniformDecls(ShaderVisibility visibility, - SkString* out) const { +void GrGLSLProgramBuilder::appendUniformDecls(GrShaderFlags visibility, SkString* out) const { this->uniformHandler()->appendUniformDecls(visibility, out); } @@ -265,7 +264,7 @@ void GrGLSLProgramBuilder::addRTAdjustmentUniform(GrSLPrecision precision, const char** outName) { SkASSERT(!fUniformHandles.fRTAdjustmentUni.isValid()); fUniformHandles.fRTAdjustmentUni = - this->uniformHandler()->addUniform(GrGLSLUniformHandler::kVertex_Visibility, + this->uniformHandler()->addUniform(kVertex_GrShaderFlag, kVec4f_GrSLType, precision, name, @@ -276,7 +275,7 @@ void GrGLSLProgramBuilder::addRTHeightUniform(const char* name, const char** out SkASSERT(!fUniformHandles.fRTHeightUni.isValid()); GrGLSLUniformHandler* uniformHandler = this->uniformHandler(); fUniformHandles.fRTHeightUni = - uniformHandler->internalAddUniformArray(GrGLSLUniformHandler::kFragment_Visibility, + uniformHandler->internalAddUniformArray(kFragment_GrShaderFlag, kFloat_GrSLType, kDefault_GrSLPrecision, name, false, 0, outName); } @@ -289,7 +288,7 @@ void GrGLSLProgramBuilder::cleanupFragmentProcessors() { void GrGLSLProgramBuilder::finalizeShaders() { this->varyingHandler()->finalize(); - fVS.finalize(GrGLSLUniformHandler::kVertex_Visibility); - fFS.finalize(GrGLSLUniformHandler::kFragment_Visibility); + fVS.finalize(kVertex_GrShaderFlag); + fFS.finalize(kFragment_GrShaderFlag); } |