Changeset 303 for trunk/nv/gl/gl_context.hh

Timestamp:

08/08/14 13:18:41 (11 years ago)

Author:

epyon

Message:

• program is now handle-based
• all device constructs are now handle-based and do not dynamically allocate

File:

• trunk/nv/gl/gl_context.hh (modified) (2 diffs)

trunk/nv/gl/gl_context.hh

@@ -24 +24 @@
                 ~gl_context();
                 virtual void bind( texture t, texture_slot slot );
-                virtual void bind( program* p );
+                virtual void bind( program p );
                 virtual void bind( buffer b );
                 virtual void bind( vertex_array va );
-                virtual void unbind( program* p );
+                virtual void unbind( program p );
                 virtual void unbind( buffer b );
                 virtual void unbind( vertex_array va );
@@ -36 +36 @@
                 virtual void clear( const clear_state& cs );
                 // temporary
-                virtual void draw( primitive prim, const render_state& rs, program* p, vertex_array va, size_t count );
+                virtual void draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count );
                 virtual const ivec4& get_viewport();
                 virtual void set_viewport( const ivec4& viewport );
                 virtual void apply_render_state( const render_state& state );
+                virtual void apply_engine_uniforms( program p, const scene_state& s );
+
         protected:
                 void force_apply_render_state( const render_state& state );