Reorder members of Renderer and PipelineState

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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 044ab55db7d3404d0f7ac9db3181d1e3eb3e5281..3b28d8545b668b75fe2b0d580232dfe96a22e06b 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -34,6 +34,34 @@ Renderer::~Renderer()
        end();
 }
 
+void Renderer::end()
+{
+       if(state_stack.size()>1)
+               throw invalid_operation("Renderer::end");
+
+       *state = State();
+       shdata_stack.clear();
+       add_shader_data(standard_shdata);
+
+       commands.use_pipeline(0);
+}
+
+void Renderer::push_state()
+{
+       state_stack.push_back(state_stack.back());
+       state = &state_stack.back();
+}
+
+void Renderer::pop_state()
+{
+       if(state_stack.size()==1)
+               throw stack_underflow("Renderer::pop_state");
+
+       state_stack.pop_back();
+       state = &state_stack.back();
+       changed |= MATRIX;
+}
+
 void Renderer::set_camera(const Camera &c)
 {
        state->camera = &c;
@@ -68,6 +96,31 @@ void Renderer::set_scissor(const Rect *s)
        state->scissor = s;
 }
 
+void Renderer::set_shader_program(const Program *p, const ProgramData *d)
+{
+       state->shprog = p;
+       if(p && d)
+               add_shader_data(*d);
+}
+
+void Renderer::add_shader_data(const ProgramData &d)
+{
+       if(state->shdata_count<shdata_stack.size())
+       {
+               const BoundProgramData &top = shdata_stack.back();
+               if(top.shdata==&d && top.generation==d.get_generation())
+               {
+                       ++state->shdata_count;
+                       return;
+               }
+       }
+
+       flush_shader_data();
+       shdata_stack.push_back(&d);
+       state->shdata_count = shdata_stack.size();
+       changed |= SHADER_DATA;
+}
+
 void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
 {
        if(tex)
@@ -101,6 +154,12 @@ void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
        state->texture_count = texture_stack.size();
 }
 
+void Renderer::flush_shader_data()
+{
+       if(shdata_stack.size()>state->shdata_count)
+               shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+}
+
 void Renderer::flush_textures()
 {
        for(unsigned i=0; i<state->texture_count; ++i)
@@ -110,37 +169,6 @@ void Renderer::flush_textures()
        texture_stack.erase(texture_stack.begin()+state->texture_count, texture_stack.end());
 }
 
-void Renderer::set_shader_program(const Program *p, const ProgramData *d)
-{
-       state->shprog = p;
-       if(p && d)
-               add_shader_data(*d);
-}
-
-void Renderer::add_shader_data(const ProgramData &d)
-{
-       if(state->shdata_count<shdata_stack.size())
-       {
-               const BoundProgramData &top = shdata_stack.back();
-               if(top.shdata==&d && top.generation==d.get_generation())
-               {
-                       ++state->shdata_count;
-                       return;
-               }
-       }
-
-       flush_shader_data();
-       shdata_stack.push_back(&d);
-       state->shdata_count = shdata_stack.size();
-       changed |= SHADER_DATA;
-}
-
-void Renderer::flush_shader_data()
-{
-       if(shdata_stack.size()>state->shdata_count)
-               shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
-}
-
 void Renderer::set_vertex_setup(const VertexSetup *vs)
 {
        state->vertex_setup = vs;
@@ -176,34 +204,6 @@ void Renderer::set_object_lod_bias(unsigned b)
        state->object_lod_bias = b;
 }
 
-void Renderer::push_state()
-{
-       state_stack.push_back(state_stack.back());
-       state = &state_stack.back();
-}
-
-void Renderer::pop_state()
-{
-       if(state_stack.size()==1)
-               throw stack_underflow("Renderer::pop_state");
-
-       state_stack.pop_back();
-       state = &state_stack.back();
-       changed |= MATRIX;
-}
-
-void Renderer::end()
-{
-       if(state_stack.size()>1)
-               throw invalid_operation("Renderer::end");
-
-       *state = State();
-       shdata_stack.clear();
-       add_shader_data(standard_shdata);
-
-       commands.use_pipeline(0);
-}
-
 void Renderer::clear(const ClearValue *values)
 {
        pipeline_state.set_framebuffer(state->framebuffer);
@@ -259,6 +259,13 @@ void Renderer::apply_state()
        if(!state->shprog)
                throw invalid_operation("Renderer::apply_state");
 
+       pipeline_state.set_framebuffer(state->framebuffer);
+       pipeline_state.set_viewport(state->viewport);
+       pipeline_state.set_scissor(state->scissor);
+
+       bool shprog_changed = (state->shprog!=pipeline_state.get_shader_program());
+       pipeline_state.set_shader_program(state->shprog);
+
        if(changed&MATRIX)
        {
                standard_shdata.uniform("world_obj_matrix", state->model_matrix);
@@ -268,12 +275,22 @@ void Renderer::apply_state()
                changed &= ~MATRIX;
        }
 
-       pipeline_state.set_framebuffer(state->framebuffer);
-       pipeline_state.set_viewport(state->viewport);
-       pipeline_state.set_scissor(state->scissor);
+       bool shdata_changed = changed&SHADER_DATA;
+       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);
 
-       bool shprog_changed = (state->shprog!=pipeline_state.get_shader_program());
-       pipeline_state.set_shader_program(state->shprog);
+       if(shdata_changed || shprog_changed || extra_shdata)
+       {
+               if(extra_shdata)
+                       shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+               for(const BoundProgramData &d: shdata_stack)
+               {
+                       d.shdata->apply(*state->shprog, pipeline_state);
+                       d.generation = d.shdata->get_generation();
+               }
+               changed &= ~SHADER_DATA;
+       }
 
        if(state->vertex_setup)
        {
@@ -299,23 +316,6 @@ void Renderer::apply_state()
                                pipeline_state.set_texture(t.binding, t.texture, t.sampler);
                }
 
-       bool shdata_changed = changed&SHADER_DATA;
-       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);
-
-       if(shdata_changed || shprog_changed || extra_shdata)
-       {
-               if(extra_shdata)
-                       shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
-               for(const BoundProgramData &d: shdata_stack)
-               {
-                       d.shdata->apply(*state->shprog, pipeline_state);
-                       d.generation = d.shdata->get_generation();
-               }
-               changed &= ~SHADER_DATA;
-       }
-
        pipeline_state.set_depth_test(state->depth_test);
        pipeline_state.set_stencil_test(state->stencil_test);
        pipeline_state.set_blend(state->blend);