Tweak the shader functions in Renderer

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

diff --git a/source/renderer.h b/source/renderer.h
index dd54ca1691dfaf49233608ff85f2ff5de9e69440..5536702b751a6d83288f14307eb6b6609b185dab 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -85,8 +85,16 @@ public:
        void set_texture(const Texture *);
        void set_texturing(const Texturing *);
        void set_material(const Material *);
-       void set_shader(const Program *, const ProgramData *);
-       void add_shader_data(const ProgramData *);
+
+       /** Sets the shader program to use.  An initial set of data can be set as
+       well, with the same semantics as add_shader_data. */
+       void set_shader_program(const Program *prog, const ProgramData *data = 0);
+
+       /** Adds another set of data to be use with shader programs.  The data is
+       independent of any shader program changes and remains in effect until the
+       Renderer state is popped. */
+       void add_shader_data(const ProgramData &data);
+
        void set_vertex_array(const VertexArray *);
        void set_element_buffer(const Buffer *);
        void set_winding_test(const WindingTest *);