Changeset 300 for trunk/src/gl/gl_texture2d.cc

Timestamp:

08/07/14 10:29:34 (11 years ago)

Author:

epyon

Message:

• removed gl_names - too much bloat for too little gain

File:

• trunk/src/gl/gl_texture2d.cc (modified) (2 diffs)

trunk/src/gl/gl_texture2d.cc

@@ -11 +11 @@
 
 nv::gl_texture2d::gl_texture2d( ivec2 size, pixel_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
-        : texture2d( size, aformat, adatatype, asampler ), m_name()
+        : texture2d( size, aformat, adatatype, asampler )
 {
-        glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
+        glGenTextures( 1, &glid );
+
+        glBindTexture( GL_TEXTURE_2D, glid );
 
         // Detect if mipmapping was requested
@@ -27 +29 @@
         glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, (int)nv::sampler_wrap_to_enum( m_sampler.wrap_t) );
 
-        glBindTexture( GL_TEXTURE_2D, 0 );
-
         if (data)
         {
-                glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
                 glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(m_format.format), m_size.x, m_size.y, 0, nv::image_format_to_enum(m_format.format), nv::datatype_to_gl_enum(m_format.type), data );
-                glBindTexture( GL_TEXTURE_2D, 0 );
+        }
+
+        glBindTexture( GL_TEXTURE_2D, 0 );
+}
+
+nv::gl_texture2d::~gl_texture2d()
+{
+        if ( glid != 0 )
+        {
+                glDeleteTextures( 1, &glid );
         }
 }