Changeset 292 for trunk/src/gl

Timestamp:

07/26/14 04:25:23 (11 years ago)

Author:

epyon

Message:

• nmd_loader now (temporarily) holds nmd dump code
• image_data now holds pixel format information
• minor cleanups

Location:

trunk/src/gl

Files:

• gl_device.cc (modified) (1 diff)
• gl_enum.cc (modified) (1 diff)
• gl_texture2d.cc (modified) (2 diffs)

trunk/src/gl/gl_device.cc

@@ -81 +81 @@
                 return nullptr;
         }
-        image_data* data = new image_data( glm::ivec2( image->w, image->h ), image->format->BytesPerPixel, (nv::uint8*)image->pixels );
+        // TODO: BGR vs RGB, single channel
+        assert( image->format->BytesPerPixel > 2 );
+        image_format format(image->format->BytesPerPixel == 3 ? RGB : RGBA, UBYTE );
+        image_data* data = new image_data( format, glm::ivec2( image->w, image->h ), (nv::uint8*)image->pixels );
         return data;
 }
 
-texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
+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 );

trunk/src/gl/gl_enum.cc

@@ -147 +147 @@
 }
 
-unsigned int nv::image_format_to_enum( image_format format )
+unsigned int nv::image_format_to_enum( pixel_format format )
 {
         switch( format )

trunk/src/gl/gl_texture2d.cc

@@ -10 +10 @@
 using namespace nv;
 
-nv::gl_texture2d::gl_texture2d( ivec2 size, image_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
+nv::gl_texture2d::gl_texture2d( ivec2 size, pixel_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
         : texture2d( size, aformat, adatatype, asampler ), m_name()
 {
@@ -38 +38 @@
 {
         glBindTexture( GL_TEXTURE_2D, m_name.get_value() );
-        glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(m_format), m_size.x, m_size.y, 0, nv::image_format_to_enum(m_format), nv::datatype_to_gl_enum(m_datatype), data );
+        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 );
 }