Changeset 323 for trunk/src/gl

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

Location:

trunk/src/gl

Files:

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

trunk/src/gl/gl_device.cc

@@ -132 +132 @@
         texture result = m_textures.create();
         gl_texture_info* info = m_textures.get( result );
-        info->format  = aformat;
-        info->sampler = asampler;
-        info->size    = size;
-        info->glid    = glid;
+        info->format   = aformat;
+        info->tsampler = asampler;
+        info->size     = size;
+        info->glid     = glid;
         return result;
 }

trunk/src/gl/gl_enum.cc

@@ -232 +232 @@
         case BYTE_VECTOR_3  : return GL_INT_VEC3;
         case BYTE_VECTOR_4  : return GL_INT_VEC4;
-        NV_RETURN_COVERED_DEFAULT( 0 );
+        default : return 0; // TODO: throw!
         }
 }

trunk/src/gl/gl_window.cc

@@ -19 +19 @@
 
 #if NV_SDL_VERSION == NV_SDL_20
-        uint32 ucode = ke.keysym.sym;
-#else
-        uint32 ucode = ke.keysym.unicode;
+        uint32 ucode = (uint32)ke.keysym.sym;
+#else
+        uint32 ucode = (uint32)ke.keysym.unicode;
 #endif
 
@@ -34 +34 @@
                         int capslock = !!(ke.keysym.mod & KMOD_CAPS);
                         if ((shifted ^ capslock) != 0) {
-                                kevent.key.ascii = (char8)SDL_toupper(ucode);
+                                kevent.key.ascii = (char8)SDL_toupper((int)ucode);
                         }
                 }