Require texture data to be uploaded in a format matching the storage

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

diff --git a/source/renderer.h b/source/renderer.h
index b2fcf4c4e6fba065980c7739ecf375a5a4bbda87..a1217c77833216266e51a014c4984e0f4a056a59 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -77,30 +77,24 @@ private:
                Matrix clipping_matrix;
                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;
        std::vector<State> state_stack;
        State *state;
        ProgramData standard_shdata;
@@ -108,16 +102,13 @@ private:
        std::set<const Renderable *> excluded;
 
 public:
-       Renderer(const Camera *);
+       Renderer();
+       DEPRECATED Renderer(const Camera *);
+private:
+       void init();
+public:
        ~Renderer();
 
-       /** Resets all internal state and restarts rendering.  There must be no
-       unpopped state in the stack.  It is permissible to call begin() multiple
-       times without an intervening end().
-
-       Deprecated; use end() and set_camera() instead.*/
-       void begin(const Camera *);
-
        /** Sets the camera to render from.  The modelview matrix is reset to the
        camera's view matrix. */
        void set_camera(const Camera &);
@@ -150,11 +141,15 @@ public:
        Renderer state is popped. */
        void add_shader_data(const ProgramData &data);
 
-       void set_mesh(const Mesh *);
+       void flush_shader_data();
+
        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();
 
@@ -172,6 +167,7 @@ public:
 
        void render(const Renderable &, const Tag & = Tag());
        void draw(const Batch &);
+       void draw_instanced(const Batch &, unsigned);
 
 private:
        void apply_state();