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

Timestamp:

08/07/14 12:11:16 (11 years ago)

Author:

epyon

Message:

• textures are now handled by lightweight handles
• textures now need to be manually released via context
• removed all old texture2d functionality
• unreleased textures will be auto-released
• textures are properly tracked via entity system
• detailed stats and checking now possible

File:

• trunk/src/gl/gl_context.cc (modified) (3 diffs)

trunk/src/gl/gl_context.cc

@@ -8 +8 @@
 #include "nv/lib/gl.hh"
 #include "nv/lib/sdl.hh"
-#include "nv/gl/gl_texture2d.hh"
+#include "nv/gl/gl_device.hh"
 #include "nv/gl/gl_program.hh"
 #include "nv/gl/gl_vertex_buffer.hh"
@@ -14 +14 @@
 using namespace nv;
 
-void gl_context::bind( texture2d* texture, texture_slot slot )
-{
-        GLuint id = static_cast< gl_texture2d* >( texture )->glid;
-        glActiveTexture( GL_TEXTURE0 + static_cast< GLenum >( slot ) );
-        glBindTexture( GL_TEXTURE_2D, id );
+void gl_context::bind( texture t, texture_slot slot )
+{
+        const gl_texture_info* info = static_cast< const gl_texture_info* >( m_device->get_texture_info( t ) );
+        if ( info )
+        {
+                glActiveTexture( GL_TEXTURE0 + static_cast< GLenum >( slot ) );
+                glBindTexture( GL_TEXTURE_2D, info->glid );
+        }
 }
 
@@ -94 +97 @@
 }
 
-void gl_context::update( texture2d* texture, void* data )
-{
-        GLuint id = static_cast< gl_texture2d* >( texture )->glid;
-        image_format format = texture->get_format();
-        ivec2        size   = texture->get_size();
-
-        glBindTexture( GL_TEXTURE_2D, id );
-        glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(format.format), size.x, size.y, 0, nv::image_format_to_enum(format.format), nv::datatype_to_gl_enum(format.type), data );
+void nv::gl_context::update( texture t, void* data )
+{
+        const gl_texture_info* info = static_cast< const gl_texture_info* >( m_device->get_texture_info( t ) );
+        if ( info )
+        {
+                image_format format = info->format;
+                ivec2        size   = info->size;
+
+                glBindTexture( GL_TEXTURE_2D, info->glid );
+                glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(format.format), size.x, size.y, 0, nv::image_format_to_enum(format.format), nv::datatype_to_gl_enum(format.type), data );
+        }
 }