From: Brian <brian@yutani.localnet.net>
Date: Sun, 25 Feb 2007 01:27:46 +0000 (-0700)
Subject: Revert "option to test mipmapping"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=32fbbf38b4358acd46569fd3c2b21fbc21e417a8;p=mesa.git

Revert "option to test mipmapping"

This reverts commit a127537efb8a39cc341a09aacd3d86d50350e667.
Meant to do this on the trunk.
---

diff --git a/progs/demos/cubemap.c b/progs/demos/cubemap.c
index ccd079cf44c..ef5d2355509 100644
--- a/progs/demos/cubemap.c
+++ b/progs/demos/cubemap.c
@@ -47,7 +47,6 @@ static GLfloat Xrot = 0, Yrot = 0;
 static GLfloat EyeDist = 10;
 static GLboolean use_vertex_arrays = GL_FALSE;
 static GLboolean anim = GL_TRUE;
-static GLboolean Mipmap = GL_FALSE;
 
 #define eps1 0.99
 #define br   20.0  /* box radius */
@@ -336,14 +335,8 @@ static void init_checkers( void )
          }
       }
 
-      if (Mipmap) {
-         gluBuild2DMipmaps(targets[f], GL_RGB, CUBE_TEX_SIZE, CUBE_TEX_SIZE,
-                           GL_RGB, GL_UNSIGNED_BYTE, image);
-      }
-      else {
-         glTexImage2D(targets[f], 0, GL_RGB, CUBE_TEX_SIZE, CUBE_TEX_SIZE, 0,
-                      GL_RGB, GL_UNSIGNED_BYTE, image);
-      }
+      glTexImage2D(targets[f], 0, GL_RGB, CUBE_TEX_SIZE, CUBE_TEX_SIZE, 0,
+                   GL_RGB, GL_UNSIGNED_BYTE, image);
    }
 }
 
@@ -434,16 +427,8 @@ static void init( GLboolean useImageFiles )
       filter = GL_NEAREST;
    }
 
-   if (Mipmap) {
-      glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,
-                      GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-      glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB,
-                      GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   }
-   else {
-      glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, filter);
-      glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, filter);
-   }
+   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, filter);
+   glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, filter);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
    glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);