Remove the deprecated ProgramBuilder class

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

diff --git a/source/renderer.h b/source/renderer.h
index 973e1b00263330101aca291ccef3c38a75e5e82c..2854bc8ff181f3ead7f0f19ec9b0ec56d79b0470 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -19,6 +19,7 @@ class Mesh;
 class Lighting;
 class Program;
 class Renderable;
+class Sampler;
 class Texture;
 class Texturing;
 class VertexSetup;
@@ -68,6 +69,7 @@ private:
                const Camera *camera;
                Matrix modelview_matrix;
                const Texture *texture;
+               const Sampler *sampler;
                const Texturing *texturing;
                unsigned lowest_effect_texunit;
                const Material *material;
@@ -77,7 +79,6 @@ private:
                Matrix clipping_matrix;
                const Program *shprog;
                unsigned shdata_count;
-               const Mesh *mesh;
                const VertexSetup *vertex_setup;
                const WindingTest *winding_test;
                bool reverse_winding;
@@ -88,20 +89,14 @@ private:
 
        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;
@@ -109,16 +104,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 &);
@@ -134,7 +126,7 @@ public:
        /** Returns the current modelview matrix. */
        const Matrix &get_matrix() const { return state->modelview_matrix; }
 
-       void set_texture(const Texture *);
+       void set_texture(const Texture *, const Sampler * = 0);
        void set_texturing(const Texturing *);
        unsigned allocate_effect_texunit();
        void set_material(const Material *);
@@ -151,7 +143,8 @@ 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);