Changeset 292 for trunk/src/gl/gl_device.cc

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

File:

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

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 );