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

Timestamp:

01/12/17 19:15:29 (8 years ago)

Author:

epyon

Message:

• unified pixel_format instead of image_format

File:

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

trunk/src/gl/gl_device.cc

@@ -36 +36 @@
         }
         // TODO: BGR vs RGB, single channel
-        pixel_format pformat = RGBA;
+        pixel_format pformat = RGBA8;
         switch ( image->format->BytesPerPixel )
         {
-        case 4: pformat = RGBA; break;
-        case 3: pformat = RGB; break;
-        case 1: pformat = RED; break;
+        case 4: pformat = RGBA8; break;
+        case 3: pformat = RGB8; break;
+        case 1: pformat = R8; break;
         default: NV_ASSERT( false, "BytesPerPixel != 4,3 or 1!" );
         }
-        image_format format( pformat, UBYTE );
-        image_data* data = new image_data( format, ivec2( image->w, image->h ), static_cast<nv::uint8*>( image->pixels ) );
+        image_data* data = new image_data( pformat, ivec2( image->w, image->h ), static_cast<nv::uint8*>( image->pixels ) );
         return data;
 }
@@ -62 +61 @@
         // TODO: BGR vs RGB, single channel
         NV_ASSERT( image->format->BytesPerPixel > 2, "bytes per pixel > 2!" );
-        image_format format( image->format->BytesPerPixel == 3 ? RGB : RGBA, UBYTE );
+        pixel_format format( image->format->BytesPerPixel == 3 ? RGB8 : RGBA8 );
         image_data* idata = new image_data( format, ivec2( image->w, image->h ), static_cast<nv::uint8*>( image->pixels ) );
         return idata;