Integrate modern shaders and VAOs with Renderer

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

diff --git a/source/renderer.h b/source/renderer.h
index a45b2943004d0beb96c654ad0f6796de4b673e3a..f736447e12fce15c7bf9555cd9be7333cd01b2ae 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "matrix.h"
+#include "programdata.h"
 #include "tag.h"
 
 namespace Msp {
@@ -13,9 +14,9 @@ class Batch;
 class Buffer;
 class Camera;
 class Material;
+class Mesh;
 class Lighting;
 class Program;
-class ProgramData;
 class Renderable;
 class Texture;
 class Texturing;
@@ -69,6 +70,7 @@ private:
                Matrix lighting_matrix;
                const Program *shprog;
                unsigned shdata_count;
+               const Mesh *mesh;
                const WindingTest *winding_test;
                bool reverse_winding;
 
@@ -92,6 +94,7 @@ private:
        std::vector<State> state_stack;
        State *state;
        bool lighting_changed;
+       ProgramData standard_shdata;
        std::vector<const ProgramData *> shdata_stack;
        bool shdata_changed;
        const Buffer *element_buffer;
@@ -120,6 +123,7 @@ public:
        Renderer state is popped. */
        void add_shader_data(const ProgramData &data);
 
+       void set_mesh(const Mesh *);
        void set_element_buffer(const Buffer *);
        void set_winding_test(const WindingTest *);
        void set_reverse_winding(bool);