Fixing OpenGL compiler warning since Mavericks
authorTobias Markus <tobbi@mozilla-uk.org>
Mon, 3 Mar 2014 17:24:31 +0000 (18:24 +0100)
committerTobias Markus <tobbi@mozilla-uk.org>
Mon, 3 Mar 2014 17:24:31 +0000 (18:24 +0100)
src/video/gl/gl_texture.cpp

index 9e2b70d..599fb68 100644 (file)
@@ -138,17 +138,14 @@ GLTexture::GLTexture(SDL_Surface* image) :
       SDL_LockSurface(convert);
     }
 
-    if (true)
-    { // no not use mipmaps
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture_width,
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texture_width,
                  texture_height, 0, sdl_format,
                  GL_UNSIGNED_BYTE, convert->pixels);
-    }
-    else
-    { // build mipmaps
-      gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, texture_width,
-                        texture_height, sdl_format,
-                        GL_UNSIGNED_BYTE, convert->pixels);
+
+    // no not use mipmaps
+    if(false)
+    {
+      glGenerateMipmap(GL_TEXTURE_2D);
     }
 
     if(SDL_MUSTLOCK(convert))