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

Timestamp:

08/07/14 10:10:24 (11 years ago)

Author:

epyon

Message:

• all bind and update function for graphics objects are done via context (will simplify directx device, and allow for handles instead of objects)

File:

• trunk/src/gl/gl_texture2d.cc (modified) (1 diff)

trunk/src/gl/gl_texture2d.cc

@@ -31 +31 @@
         if (data)
         {
-                assign(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 );
         }
 }
 
-void nv::gl_texture2d::assign( void* 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 );
-}
-
-void nv::gl_texture2d::bind( size_t slot )
-{
-        glActiveTexture( GL_TEXTURE0 + static_cast< GLenum >( slot ) );
-        glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
-}
-
-void nv::gl_texture2d::unbind()
-{
-        glBindTexture( GL_TEXTURE_2D, 0 );
-}
-
-bool nv::gl_texture2d::is_valid() const
-{
-        return m_name.is_valid();
-}