diff options
| author |  egdaniel <egdaniel@google.com> | 2015-11-06 06:57:12 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-06 06:57:12 -0800 |
| commit | f3bace939287ca7bb02eaeb38ab51939d7e1ae98 (patch) | |
| tree | 3d53664dc0fae8509d3577015ebaed95e36c92da /src/gpu/gl/builders/GrGLProgramBuilder.cpp | |
| parent | cf1d19805a289c612532cf2d4505bb348b78ba77 (diff) | |
Add addFragPosUniform to GrGLrogramBuilder
BUG=skia:
Review URL: https://codereview.chromium.org/1434483002
Diffstat (limited to 'src/gpu/gl/builders/GrGLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index aca8e53f85..232c7ba0c2 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -56,7 +56,6 @@ GrGLProgramBuilder::GrGLProgramBuilder(GrGLGpu* gpu, const DrawArgs& args) : fVS(this) , fGS(this) , fFS(this, args.fDesc->header().fFragPosKey) - , fOutOfStage(true) , fStageIndex(-1) , fGeometryProcessor(nullptr) , fXferProcessor(nullptr) @@ -107,13 +106,13 @@ GrGLProgramBuilder::SeparableVaryingHandle GrGLProgramBuilder::addSeparableVaryi return SeparableVaryingHandle(varyingInfo.fLocation); } -void GrGLProgramBuilder::nameVariable(SkString* out, char prefix, const char* name) { +void GrGLProgramBuilder::nameVariable(SkString* out, char prefix, const char* name, bool mangle) { if ('\0' == prefix) { *out = name; } else { out->printf("%c%s", prefix, name); } - if (!fOutOfStage) { + if (mangle) { if (out->endsWith('_')) { // Names containing "__" are reserved. out->append("x"); @@ -122,11 +121,12 @@ void GrGLProgramBuilder::nameVariable(SkString* out, char prefix, const char* na } } -GrGLSLProgramDataManager::UniformHandle GrGLProgramBuilder::addUniformArray( +GrGLSLProgramDataManager::UniformHandle GrGLProgramBuilder::internalAddUniformArray( uint32_t visibility, GrSLType type, GrSLPrecision precision, const char* name, + bool mangleName, int count, const char** outName) { SkASSERT(name && strlen(name)); @@ -148,7 +148,7 @@ GrGLSLProgramDataManager::UniformHandle GrGLProgramBuilder::addUniformArray( if ('u' == name[0]) { prefix = '\0'; } - this->nameVariable(uni.fVariable.accessName(), prefix, name); + this->nameVariable(uni.fVariable.accessName(), prefix, name, mangleName); uni.fVariable.setArrayCount(count); uni.fVisibility = visibility; uni.fVariable.setPrecision(precision); |