Changeset 398 for trunk/src/gl

Timestamp:

06/13/15 11:20:22 (10 years ago)

Author:

epyon

Message:

• cleanup of glm usage

Location:

trunk/src/gl

Files:

• gl_context.cc (modified) (1 diff)
• gl_device.cc (modified) (2 diffs)

trunk/src/gl/gl_context.cc

@@ -731 +731 @@
         }
         unsigned int buffers[8];
-        count = glm::min<uint32>( count, 8 );
+        count = nv::min<uint32>( count, 8 );
         for ( uint32 i = 0; i < count; ++i )
         {

trunk/src/gl/gl_device.cc

@@ -53 +53 @@
         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 );
+        image_data* data = new image_data( format, ivec2( image->w, image->h ), (nv::uint8*)image->pixels );
         return data;
 }
@@ -71 +71 @@
         assert( image->format->BytesPerPixel > 2 );
         image_format format( image->format->BytesPerPixel == 3 ? RGB : RGBA, UBYTE );
-        image_data* idata = new image_data( format, glm::ivec2( image->w, image->h ), ( nv::uint8* )image->pixels );
+        image_data* idata = new image_data( format, ivec2( image->w, image->h ), ( nv::uint8* )image->pixels );
         return idata;
 }