Changeset 301 for trunk/src/gl/gl_device.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_device.cc (modified) (3 diffs)

trunk/src/gl/gl_device.cc

@@ -8 +8 @@
 #include "nv/gl/gl_program.hh"
 #include "nv/gl/gl_vertex_buffer.hh"
-#include "nv/gl/gl_texture2d.hh"
 #include "nv/logging.hh"
 #include "nv/lib/sdl.hh"
 #include "nv/lib/sdl_image.hh"
+#include "nv/gl/gl_enum.hh"
+#include "nv/lib/gl.hh"
 
 using namespace nv;
@@ -88 +89 @@
 }
 
-texture2d* gl_device::create_texture2d( ivec2 size, pixel_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
-{
-        return new gl_texture2d( size, aformat, adatatype, asampler, data );
-}
-
 uint32 gl_device::get_ticks()
 {
@@ -105 +101 @@
 gl_device::~gl_device()
 {
+        // TODO: better use release_texture
+        for ( auto& t : m_textures ) glDeleteTextures( 1, &t.glid );
+
         SDL_Quit();
 }
+
+nv::texture nv::gl_device::create_texture( ivec2 size, image_format aformat, sampler asampler, void* data /*= nullptr */ )
+{
+        unsigned glid = 0;
+        glGenTextures( 1, &glid );
+
+        glBindTexture( GL_TEXTURE_2D, glid );
+
+        // Detect if mipmapping was requested
+        if (( asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST ) ||
+                ( asampler.filter_max != sampler::LINEAR && asampler.filter_max != sampler::NEAREST ))
+        {
+                glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+        }
+
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (int)nv::sampler_filter_to_enum( asampler.filter_min ) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (int)nv::sampler_filter_to_enum( asampler.filter_max ) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, (int)nv::sampler_wrap_to_enum( asampler.wrap_s) );
+        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, (int)nv::sampler_wrap_to_enum( asampler.wrap_t) );
+
+        if (data)
+        {
+                glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(aformat.format), size.x, size.y, 0, nv::image_format_to_enum(aformat.format), nv::datatype_to_gl_enum(aformat.type), data );
+        }
+
+        glBindTexture( GL_TEXTURE_2D, 0 );
+
+        texture result = m_textures.create();
+        gl_texture_info* info = m_textures.get( result );
+        info->format  = aformat;
+        info->sampler = asampler;
+        info->size    = size;
+        info->glid    = glid;
+        return result;
+}
+
+void nv::gl_device::release_texture( texture t )
+{
+        gl_texture_info* info = m_textures.get( t );
+        if ( info )
+        {
+                glDeleteTextures( 1, &(info->glid) );
+                m_textures.destroy( t );
+        }
+}
+
+const texture_info* nv::gl_device::get_texture_info( texture t )
+{
+        return m_textures.get( t );
+}
+