Remove the View and Framebuffer constructors from Sequence

[libs/gl.git] / source / render / renderer.cpp

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index b6775202f61d1e696d55e97b15daa4309923816d..6f7e9cba34d3c156a50e255372d0c59d078e8da9 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -21,7 +21,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Renderer::Renderer()
+Renderer::Renderer():
+       changed(0)
 {
        state_stack.reserve(16);
        state_stack.push_back(State());
@@ -88,7 +89,7 @@ void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
                        flush_textures();
        }
 
-       for(vector<BoundTexture>::iterator i=texture_stack.end(); i!=texture_stack.begin(); )
+       for(auto i=texture_stack.end(); i!=texture_stack.begin(); )
                if((--i)->tag==tag)
                {
                        i->replaced = texture_stack.size();
@@ -277,7 +278,7 @@ void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
        if(target.get_width()!=width || target.get_height()!=height)
                throw incompatible_data("Renderer::resolve_multisample");
 
-       apply_state();
+       pipeline_state.set_framebuffer(state->framebuffer);
        commands.resolve_multisample(target, buffers);
 }
 
@@ -318,15 +319,15 @@ void Renderer::apply_state()
        if(state->texture_count<texture_stack.size())
                flush_textures();
 
-       for(vector<BoundTexture>::const_iterator i=texture_stack.begin(); i!=texture_stack.end(); ++i)
+       for(const BoundTexture &t: texture_stack)
        {
-               int unit = (i->tag.id ? state->shprog->get_uniform_binding(i->tag) : i->unit);
+               int unit = (t.tag.id ? state->shprog->get_uniform_binding(t.tag) : t.unit);
                if(unit>=0)
-                       pipeline_state.set_texture(unit, i->texture, i->sampler);
+                       pipeline_state.set_texture(unit, t.texture, t.sampler);
        }
 
        bool shdata_changed = changed&SHADER_DATA;
-       for(vector<BoundProgramData>::const_iterator i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i)
+       for(auto i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i)
                shdata_changed = (i->shdata->get_generation()!=i->generation);
        bool extra_shdata = (shdata_stack.size()>state->shdata_count);
 
@@ -334,10 +335,10 @@ void Renderer::apply_state()
        {
                if(extra_shdata)
                        shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
-               for(vector<BoundProgramData>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
+               for(const BoundProgramData &d: shdata_stack)
                {
-                       i->shdata->apply(*state->shprog, pipeline_state);
-                       i->generation = i->shdata->get_generation();
+                       d.shdata->apply(*state->shprog, pipeline_state);
+                       d.generation = d.shdata->get_generation();
                }
                changed &= ~SHADER_DATA;
        }