Use C++11 features with containers

[libs/gl.git] / source / core / pipelinestate.cpp

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 318522d6563b547eebcf6b823ed3e5ddbb9c0305..30d2ab1c5ce5f5968f9c10f7e6fd0c204fa6bfe5 100644 (file)
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -110,7 +110,7 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp
        if((tex!=0)!=(samp!=0))
                throw invalid_argument("PipelineState::set_texture");
 
-       vector<BoundTexture>::iterator i = lower_bound_member(textures, binding, &BoundTexture::binding);
+       auto i = lower_bound_member(textures, binding, &BoundTexture::binding);
        if(i==textures.end() || i->binding!=binding)
                i = textures.insert(i, BoundTexture(binding));
        if(tex!=i->texture || samp!=i->sampler)
@@ -134,7 +134,7 @@ void PipelineState::set_uniform_block(unsigned binding, const BufferBackedUnifor
 
 void PipelineState::set_uniform_block_(int binding, const UniformBlock *block)
 {
-       vector<BoundUniformBlock>::iterator i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
+       auto i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
        if(i==uniform_blocks.end() || i->binding!=binding)
                i = uniform_blocks.insert(i, BoundUniformBlock(binding));
        if(block!=i->block || binding<0)
@@ -248,49 +248,49 @@ void PipelineState::apply(unsigned mask) const
 
        if(mask&TEXTURES)
        {
-               for(vector<BoundTexture>::const_iterator i=textures.begin(); i!=textures.end(); ++i)
-                       if(i->changed || mask==~0U)
+               for(const BoundTexture &t: textures)
+                       if(t.changed || mask==~0U)
                        {
-                               if(i->texture && i->sampler)
+                               if(t.texture && t.sampler)
                                {
                                        if(ARB_direct_state_access)
-                                               glBindTextureUnit(i->binding, i->texture->get_id());
+                                               glBindTextureUnit(t.binding, t.texture->get_id());
                                        else
                                        {
-                                               glActiveTexture(GL_TEXTURE0+i->binding);
-                                               if(bound_tex_targets[i->binding] && static_cast<int>(i->texture->get_target())!=bound_tex_targets[i->binding])
-                                                       glBindTexture(bound_tex_targets[i->binding], 0);
-                                               glBindTexture(i->texture->get_target(), i->texture->get_id());
+                                               glActiveTexture(GL_TEXTURE0+t.binding);
+                                               if(bound_tex_targets[t.binding] && static_cast<int>(t.texture->get_target())!=bound_tex_targets[t.binding])
+                                                       glBindTexture(bound_tex_targets[t.binding], 0);
+                                               glBindTexture(t.texture->get_target(), t.texture->get_id());
                                        }
 
-                                       bound_tex_targets[i->binding] = i->texture->get_target();
+                                       bound_tex_targets[t.binding] = t.texture->get_target();
 
-                                       glBindSampler(i->binding, i->sampler->get_id());
-                                       i->sampler->refresh();
+                                       glBindSampler(t.binding, t.sampler->get_id());
+                                       t.sampler->refresh();
                                }
 
-                               i->changed = false;
+                               t.changed = false;
                        }
        }
 
        if(mask&UNIFORMS)
        {
-               for(vector<BoundUniformBlock>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-                       if(i->changed || mask==~0U)
+               for(const BoundUniformBlock &u: uniform_blocks)
+                       if(u.changed || mask==~0U)
                        {
-                               if(i->block)
+                               if(u.block)
                                {
-                                       if(i->binding>=0)
+                                       if(u.binding>=0)
                                        {
-                                               const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(i->block);
-                                               glBindBufferRange(GL_UNIFORM_BUFFER, i->binding, block->get_buffer()->get_id(), block->get_offset(), block->get_data_size());
-                                               bound_uniform_blocks[i->binding] = 1;
+                                               const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(u.block);
+                                               glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, block->get_buffer()->get_id(), block->get_offset(), block->get_data_size());
+                                               bound_uniform_blocks[u.binding] = 1;
                                        }
                                        else
-                                               static_cast<const DefaultUniformBlock *>(i->block)->apply();
+                                               static_cast<const DefaultUniformBlock *>(u.block)->apply();
                                }
 
-                               i->changed = false;
+                               u.changed = false;
                        }
        }