Changeset 364 for trunk/src/gl

Timestamp:

05/15/15 12:52:52 (10 years ago)

Author:

epyon

Message:

• fixed compilation on clang
• cleared all clang warnings (except fix_me's)

Location:

trunk/src/gl

Files:

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

trunk/src/gl/gl_context.cc

@@ -734 +734 @@
                 if ( slots[i] > OUTPUT_7 ) buffers[i] = 0;
         }
-        glDrawBuffers( count, buffers );
+        glDrawBuffers( (GLsizei)count, buffers );
 }
 

trunk/src/gl/gl_device.cc

@@ -56 +56 @@
 {
         load_sdl_image_library();
-        SDL_Surface* image = IMG_LoadTyped_RW( SDL_RWFromMem( (void*)data, size ), 1, "tga" );
+        SDL_Surface* image = IMG_LoadTyped_RW( SDL_RWFromMem( (void*)data, (int)size ), 1, "png" );
         if ( !image )
         {
@@ -402 +402 @@
 
         const char* pc = shader_code.data();
-        int l = shader_code.length();
+        int l = (int)shader_code.length();
 
         glShaderSource( glid, 1, &pc, &l );