Changeset 303 for trunk/src/gl/gl_context.cc

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/src/gl/gl_context.cc (modified) (6 diffs)

trunk/src/gl/gl_context.cc

@@ -9 +9 @@
 #include "nv/lib/sdl.hh"
 #include "nv/gl/gl_device.hh"
-#include "nv/gl/gl_program.hh"
 
 using namespace nv;
@@ -23 +22 @@
 }
 
-void nv::gl_context::bind( program* p )
-{
-        gl_program* glp = static_cast< gl_program* >( p );
-        glUseProgram( glp->glid );
-        glp->update_uniforms();
+void nv::gl_context::bind( program p )
+{
+        gl_program_info* info = ((gl_device*)m_device)->m_programs.get( p );
+        if ( info )
+        {
+                glUseProgram( info->glid );
+                ((gl_device*)m_device)->update_uniforms( info );
+        }
 }
 
@@ -41 +43 @@
 void nv::gl_context::bind( vertex_array va )
 {
-        vertex_array_info* info = get_vertex_array_info( va );
+        const vertex_array_info* info = m_device->get_vertex_array_info( va );
         if ( info )
         {
@@ -68 +70 @@
 }
 
-void nv::gl_context::unbind( program* )
+void nv::gl_context::unbind( program )
 {
         glUseProgram( 0 );
@@ -84 +86 @@
 void nv::gl_context::unbind( vertex_array va )
 {
-        vertex_array_info* info = get_vertex_array_info( va );
+        const vertex_array_info* info = m_device->get_vertex_array_info( va );
         if ( info )
         {
@@ -483 +485 @@
 }
 
-void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array va, size_t count )
+void nv::gl_context::apply_engine_uniforms( program p, const scene_state& s )
+{
+        gl_program_info* info = ((gl_device*)m_device)->m_programs.get( p );
+        if ( info )
+        {
+                for ( auto u : info->m_engine_uniforms )
+                {
+                        u->set( this, &s );
+                }
+        }
+}
+
+void gl_context::draw( primitive prim, const render_state& rs, program p, vertex_array va, size_t count )
 {
         apply_render_state( rs );
-        vertex_array_info* info = get_vertex_array_info( va );
+        const vertex_array_info* info = m_device->get_vertex_array_info( va );
         if ( count > 0 && info )
         {