Refactor GrGLUniformManager::UniformHandle to initialize itself by default
Refactor GrGLUniformManager::UniformHandle to initialize itself to
"invalid" state by default. This simplifies the effect
constructors. In the future, it should also help catch potential
uninitialized uniform variable usage.
Remove unneeded explicit uniform handle validity assertions before the
handle usage. The assertion will always be made when handle is
converted to index.
BUG=skia:1492
R=bsalomon@google.com
Author: kkinnunen@nvidia.com
Review URL: https://chromiumcodereview.appspot.com/22340010
git-svn-id: http://skia.googlecode.com/svn/trunk@10713 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index 36eb6d5..5ed8f0d 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -110,9 +110,6 @@
, fUsesGS(false)
#endif
, fSetupFragPosition(false)
- , fRTHeightUniform(GrGLUniformManager::kInvalidUniformHandle)
- , fDstCopyTopLeftUniform (GrGLUniformManager::kInvalidUniformHandle)
- , fDstCopyScaleUniform (GrGLUniformManager::kInvalidUniformHandle)
, fTopLeftFragPosRead(kTopLeftFragPosRead_FragPosKey == desc.getHeader().fFragPosKey) {
const GrGLProgramDesc::KeyHeader& header = desc.getHeader();
@@ -391,7 +388,7 @@
GrAssert(0 != visibility);
BuilderUniform& uni = fUniforms.push_back();
- UniformHandle h = index_to_handle(fUniforms.count() - 1);
+ UniformHandle h = GrGLUniformManager::UniformHandle::CreateFromUniformIndex(fUniforms.count() - 1);
GR_DEBUGCODE(UniformHandle h2 =)
fUniformManager.appendUniform(type, count);
// We expect the uniform manager to initially have no uniforms and that all uniforms are added
@@ -418,10 +415,6 @@
return h;
}
-const GrGLShaderVar& GrGLShaderBuilder::getUniformVariable(UniformHandle u) const {
- return fUniforms[handle_to_index(u)].fVariable;
-}
-
bool GrGLShaderBuilder::addAttribute(GrSLType type,
const char* name) {
for (int i = 0; i < fVSAttrs.count(); ++i) {
@@ -512,7 +505,7 @@
// temporarily change the stage index because we're inserting non-stage code.
CodeStage::AutoStageRestore csar(&fCodeStage, NULL);
- GrAssert(GrGLUniformManager::kInvalidUniformHandle == fRTHeightUniform);
+ GrAssert(!fRTHeightUniform.isValid());
const char* rtHeightName;
fRTHeightUniform = this->addUniform(kFragment_ShaderType,
@@ -524,7 +517,7 @@
kCoordName, rtHeightName);
fSetupFragPosition = true;
}
- GrAssert(GrGLUniformManager::kInvalidUniformHandle != fRTHeightUniform);
+ GrAssert(fRTHeightUniform.isValid());
return kCoordName;
}
}