summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-06-13 18:45:54 +0000
committerBrian Paul <[email protected]>2000-06-13 18:45:54 +0000
commitd27e256f4971375f956a5f2599dbd120b3a4eefd (patch)
treee35cc2f9b1fad415e13a62977820c919ce6a3d28 /progs
parente7268d83414cdefe93fb0974ff7d5122f2c41d4c (diff)
use GL_CLAMP_TO_EDGE
Diffstat (limited to 'progs')
-rw-r--r--progs/demos/cubemap.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/progs/demos/cubemap.c b/progs/demos/cubemap.c
index 620a2d65330..268c431f147 100644
--- a/progs/demos/cubemap.c
+++ b/progs/demos/cubemap.c
@@ -1,4 +1,4 @@
-/* $Id: cubemap.c,v 1.1 2000/05/30 01:18:29 brianp Exp $ */
+/* $Id: cubemap.c,v 1.2 2000/06/13 18:45:54 brianp Exp $ */
/*
* GL_ARB_texture_cube_map demo
@@ -203,12 +203,15 @@ static void init( void )
GL_RGB, GL_UNSIGNED_BYTE, image);
}
- /*
- glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- */
+#if 1
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+#else
+ glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+#endif
+ 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);
glEnable(GL_TEXTURE_CUBE_MAP_ARB);