Remove support for legacy OpenGL features

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

diff --git a/source/renderer.h b/source/renderer.h
index 79557eab20b5e368c65be3b50d021cbb124d32a6..4899b4f330d8bb173898ff73dfc061a4d9471688 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -21,6 +21,7 @@ class Program;
 class Renderable;
 class Texture;
 class Texturing;
+class VertexSetup;
 class WindingTest;
 
 /**
@@ -77,28 +78,24 @@ private:
                const Program *shprog;
                unsigned shdata_count;
                const Mesh *mesh;
+               const VertexSetup *vertex_setup;
                const WindingTest *winding_test;
                bool reverse_winding;
+               unsigned object_lod_bias;
 
                State();
        };
 
        enum ChangeMask
        {
-               LEGACY_MATRIX = 1,
-               MODERN_MATRIX = 2,
-               MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-               LEGACY_LIGHTING = 4,
-               LEGACY_CLIPPING = 8,
+               MATRIX = 2,
                SHADER_DATA = 16,
                MATERIAL_SHDATA = 32,
-               STANDARD_SHDATA = 64,
-               LEGACY_PROJECTION = 128
+               STANDARD_SHDATA = 64
        };
 
+       const Camera *default_camera;
        unsigned char changed;
-       bool matrices_loaded;
-       unsigned shdata_applied;
        std::vector<State> state_stack;
        State *state;
        ProgramData standard_shdata;
@@ -148,10 +145,16 @@ public:
        Renderer state is popped. */
        void add_shader_data(const ProgramData &data);
 
+       void flush_shader_data();
+
        void set_mesh(const Mesh *);
+       void set_vertex_setup(const VertexSetup *);
        void set_winding_test(const WindingTest *);
        void set_reverse_winding(bool);
 
+       void set_object_lod_bias(unsigned);
+       unsigned get_object_lod_bias() const { return state->object_lod_bias; }
+
        /** Saves the current state so it can be restored later. */
        void push_state();
 
@@ -169,6 +172,7 @@ public:
 
        void render(const Renderable &, const Tag & = Tag());
        void draw(const Batch &);
+       void draw_instanced(const Batch &, unsigned);
 
 private:
        void apply_state();