Remove support for legacy OpenGL features

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index c5fe3c64a8baca0d39b7966d43edc61c3efa9be4..302d943727a2812e66bd6b85f748f398117bd4d9 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -25,7 +25,6 @@ namespace GL {
 Renderer::Renderer(const Camera *c):
        default_camera(c),
        changed(0),
-       matrices_loaded(false),
        state_stack(1)
 {
        state_stack.reserve(16);
@@ -58,7 +57,7 @@ void Renderer::set_camera(const Camera &c)
        state->camera = &c;
        standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
        standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix());
-       changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+       changed |= STANDARD_SHDATA;
        set_matrix(state->camera->get_view_matrix());
 }
 
@@ -106,7 +105,6 @@ void Renderer::set_lighting(const Lighting *l)
                l->update_shader_data(standard_shdata, state->lighting_matrix);
                changed |= STANDARD_SHDATA;
        }
-       changed |= LEGACY_LIGHTING;
 }
 
 void Renderer::set_clipping(const Clipping *c)
@@ -118,7 +116,6 @@ void Renderer::set_clipping(const Clipping *c)
                c->update_shader_data(standard_shdata, state->clipping_matrix);
                changed |= STANDARD_SHDATA;
        }
-       changed |= LEGACY_CLIPPING;
 }
 
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
@@ -202,7 +199,7 @@ void Renderer::pop_state()
                        standard_shdata.uniform("projection_matrix", Matrix());
                        standard_shdata.uniform("eye_world_matrix", Matrix());
                }
-               changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+               changed |= STANDARD_SHDATA;
        }
        /* This actually should compare the relevant matrices rather than check for
        camera, but in practice lighting and clipping is set right after the camera
@@ -214,7 +211,6 @@ void Renderer::pop_state()
                        state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
                        changed |= STANDARD_SHDATA;
                }
-               changed |= LEGACY_LIGHTING;
        }
        if(state->clipping!=old_clipping || camera_changed)
        {
@@ -223,7 +219,6 @@ void Renderer::pop_state()
                        state->clipping->update_shader_data(standard_shdata, state->clipping_matrix);
                        changed |= STANDARD_SHDATA;
                }
-               changed |= LEGACY_CLIPPING;
        }
 }
 
@@ -243,20 +238,11 @@ void Renderer::end()
        Mesh::unbind();
        Texturing::unbind();
        Texture::unbind_from(0);
-       Material::unbind();
-       Lighting::unbind();
        Clipping::unbind();
        Program::unbind();
        VertexSetup::unbind();
        Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
        WindingTest::unbind();
-
-       if(matrices_loaded)
-       {
-               MatrixStack::projection().pop();
-               MatrixStack::modelview().pop();
-               matrices_loaded = false;
-       }
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -294,54 +280,19 @@ void Renderer::apply_state()
        /* We (mostly) let the objects themselves figure out if the binding has
        changed */
 
-       bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
-       bool legacy_textures = !state->shprog;
-
        if(state->texturing)
-               state->texturing->bind(legacy_textures);
+               state->texturing->bind();
        else
        {
                Texturing::unbind();
                if(state->texture)
-                       state->texture->bind_to(0, legacy_textures);
+                       state->texture->bind_to(0);
                else
                        Texture::unbind_from(0);
        }
 
-       if(legacy_bindings)
-       {
-               if(state->material)
-                       state->material->bind();
-               else
-                       Material::unbind();
-
-               if(changed&LEGACY_LIGHTING)
-               {
-                       if(state->lighting)
-                       {
-                               MatrixStack::modelview() = state->lighting_matrix;
-                               state->lighting->bind();
-                               changed = (changed&~LEGACY_LIGHTING)|LEGACY_MATRIX;
-                       }
-                       else
-                               Lighting::unbind();
-               }
-       }
-
        if(state->clipping)
-       {
-               if(legacy_bindings)
-               {
-                       if(changed&LEGACY_CLIPPING)
-                       {
-                               MatrixStack::modelview() = state->clipping_matrix;
-                               state->clipping->bind(true);
-                               changed = (changed&~LEGACY_CLIPPING)|LEGACY_MATRIX;
-                       }
-               }
-               else
-                       state->clipping->bind(false);
-       }
+               state->clipping->bind();
        else
                Clipping::unbind();
 
@@ -350,28 +301,25 @@ void Renderer::apply_state()
                bool shprog_changed = (state->shprog!=Program::current());
                state->shprog->bind();
 
-               if(!legacy_bindings)
+               if(changed&MATRIX)
+               {
+                       standard_shdata.uniform("eye_obj_matrix", state->modelview_matrix);
+                       LinAl::SquareMatrix<float, 3> nm = state->modelview_matrix.block<3, 3>(0, 0);
+                       nm = transpose(invert(nm));
+                       standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0));
+                       changed = (changed&~MATRIX)|STANDARD_SHDATA;
+               }
+
+               if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
                {
-                       if(changed&MODERN_MATRIX)
-                       {
-                               standard_shdata.uniform("eye_obj_matrix", state->modelview_matrix);
-                               LinAl::SquareMatrix<float, 3> nm = state->modelview_matrix.block<3, 3>(0, 0);
-                               nm = transpose(invert(nm));
-                               standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0));
-                               changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
-                       }
-
-                       if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
-                       {
-                               state->material->get_shader_data().apply();
-                               changed &= ~MATERIAL_SHDATA;
-                       }
-
-                       if((changed&STANDARD_SHDATA) || shprog_changed)
-                       {
-                               standard_shdata.apply();
-                               changed &= ~STANDARD_SHDATA;
-                       }
+                       state->material->get_shader_data().apply();
+                       changed &= ~MATERIAL_SHDATA;
+               }
+
+               if((changed&STANDARD_SHDATA) || shprog_changed)
+               {
+                       standard_shdata.apply();
+                       changed &= ~STANDARD_SHDATA;
                }
 
                bool extra_shdata = (shdata_stack.size()>state->shdata_count);
@@ -389,19 +337,7 @@ void Renderer::apply_state()
                Program::unbind();
 
        if(state->mesh)
-       {
-               if(legacy_bindings)
-               {
-                       Mesh::unbind();
-                       state->mesh->get_vertices().apply();
-                       if(const Buffer *ibuf = state->mesh->get_index_buffer())
-                               ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-                       else
-                               Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-               }
-               else
-                       state->mesh->bind();
-       }
+               state->mesh->bind();
        else
        {
                Mesh::unbind();
@@ -421,28 +357,6 @@ void Renderer::apply_state()
        }
        else
                WindingTest::unbind();
-
-       if(legacy_bindings)
-       {
-               if(!matrices_loaded)
-               {
-                       MatrixStack::modelview().push();
-                       MatrixStack::projection().push();
-                       matrices_loaded = true;
-               }
-
-               if(changed&LEGACY_PROJECTION)
-               {
-                       MatrixStack::projection() = state->camera->get_projection_matrix();
-                       changed &= ~LEGACY_PROJECTION;
-               }
-
-               if(changed&LEGACY_MATRIX)
-               {
-                       MatrixStack::modelview() = state->modelview_matrix;
-                       changed &= ~LEGACY_MATRIX;
-               }
-       }
 }