diff options
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGpuGL_program.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index c1643578ad..850f0bb134 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -1013,7 +1013,7 @@ bool GrGLProgram::bindOutputsAttribsAndLinkProgram(const GrGLShaderBuilder& buil } const GrGLShaderBuilder::AttributePair* attribEnd = builder.getEffectAttributes().end(); - for (const GrGLShaderBuilder::AttributePair* attrib = builder.getEffectAttributes().begin(); + for (const GrGLShaderBuilder::AttributePair* attrib = builder.getEffectAttributes().begin(); attrib != attribEnd; ++attrib) { GL_CALL(BindAttribLocation(fProgramID, attrib->fIndex, attrib->fName.c_str())); diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 1a238ae04b..b3b09cc477 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -539,13 +539,13 @@ GrGLEffect* GrGLShaderBuilder::createAndEmitGLEffect( const SkString* GrGLShaderBuilder::getEffectAttributeName(int attributeIndex) const { const AttributePair* attribEnd = this->getEffectAttributes().end(); - for (const AttributePair* attrib = this->getEffectAttributes().begin(); + for (const AttributePair* attrib = this->getEffectAttributes().begin(); attrib != attribEnd; ++attrib) { if (attrib->fIndex == attributeIndex) { return &attrib->fName; } - } + } return NULL; } diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index a717b8650b..5081089216 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -19,7 +19,7 @@ static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidU GrGpuGL::ProgramCache::ProgramCache(const GrGLContext& gl) : fCount(0) , fCurrLRUStamp(0) - , fGL(gl) + , fGL(gl) #ifdef PROGRAM_CACHE_STATS , fTotalRequests(0) , fCacheMisses(0) |