diff options
| author |  bsalomon <bsalomon@google.com> | 2014-07-11 10:01:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-11 10:01:02 -0700 |
| commit | 848faf00ec33d39ab3e31e9a11d805cae6ac6562 (patch) | |
| tree | 3bc20e70f262fb5a7864796e890512b8006518ef /src/gpu/gl/GrGLShaderBuilder.cpp | |
| parent | 6ca0b6a46cbe9bef3e2b9b9db813ec864efd62de (diff) | |
This moves us towards variable length effect keys. The overall program key now allows for it. After the header it stores an array of offsets to effect keys. This allows us to grab the effect keys to pass to effects when they generate code. It also ensures that we can't get a collision by sets of keys that are different lengths but are the same when appended together.
R=robertphillips@google.com, jvanverth@google.com, egdaniel@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/356513003
Diffstat (limited to 'src/gpu/gl/GrGLShaderBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 4b7de02793..7a57d8e32e 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -194,15 +194,19 @@ bool GrGLShaderBuilder::genProgram(const GrEffectStage* colorStages[], /////////////////////////////////////////////////////////////////////////// // emit the per-effect code for both color and coverage effects + GrGLProgramDesc::EffectKeyProvider colorKeyProvider( + &this->desc(), GrGLProgramDesc::EffectKeyProvider::kColor_EffectType); fOutput.fColorEffects.reset(this->createAndEmitEffects(colorStages, - this->desc().getEffectKeys(), this->desc().numColorEffects(), + colorKeyProvider, &inputColor)); + GrGLProgramDesc::EffectKeyProvider coverageKeyProvider( + &this->desc(), GrGLProgramDesc::EffectKeyProvider::kCoverage_EffectType); fOutput.fCoverageEffects.reset(this->createAndEmitEffects(coverageStages, - this->desc().getEffectKeys() + this->desc().numColorEffects(), - this->desc().numCoverageEffects(), - &inputCoverage)); + this->desc().numCoverageEffects(), + coverageKeyProvider, + &inputCoverage)); this->emitCodeAfterEffects(); @@ -601,8 +605,8 @@ void GrGLShaderBuilder::appendUniformDecls(ShaderVisibility visibility, void GrGLShaderBuilder::createAndEmitEffects(GrGLProgramEffectsBuilder* programEffectsBuilder, const GrEffectStage* effectStages[], - const EffectKey effectKeys[], int effectCnt, + const GrGLProgramDesc::EffectKeyProvider& keyProvider, GrGLSLExpr4* fsInOutColor) { bool effectEmitted = false; @@ -632,7 +636,7 @@ void GrGLShaderBuilder::createAndEmitEffects(GrGLProgramEffectsBuilder* programE programEffectsBuilder->emitEffect(stage, - effectKeys[e], + keyProvider.get(e), outColor.c_str(), inColor.isOnes() ? NULL : inColor.c_str(), fCodeStage.stageIndex()); @@ -976,15 +980,15 @@ const SkString* GrGLFullShaderBuilder::getEffectAttributeName(int attributeIndex GrGLProgramEffects* GrGLFullShaderBuilder::createAndEmitEffects( const GrEffectStage* effectStages[], - const EffectKey effectKeys[], int effectCnt, + const GrGLProgramDesc::EffectKeyProvider& keyProvider, GrGLSLExpr4* inOutFSColor) { GrGLVertexProgramEffectsBuilder programEffectsBuilder(this, effectCnt); this->INHERITED::createAndEmitEffects(&programEffectsBuilder, effectStages, - effectKeys, effectCnt, + keyProvider, inOutFSColor); return programEffectsBuilder.finish(); } @@ -1093,16 +1097,16 @@ int GrGLFragmentOnlyShaderBuilder::addTexCoordSets(int count) { GrGLProgramEffects* GrGLFragmentOnlyShaderBuilder::createAndEmitEffects( const GrEffectStage* effectStages[], - const EffectKey effectKeys[], int effectCnt, + const GrGLProgramDesc::EffectKeyProvider& keyProvider, GrGLSLExpr4* inOutFSColor) { GrGLPathTexGenProgramEffectsBuilder pathTexGenEffectsBuilder(this, effectCnt); this->INHERITED::createAndEmitEffects(&pathTexGenEffectsBuilder, effectStages, - effectKeys, effectCnt, + keyProvider, inOutFSColor); return pathTexGenEffectsBuilder.finish(); } |