summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-27 16:06:20 -0600
committerBrian <brian@yutani.localnet.net>2007-03-27 16:06:48 -0600
commit0420d8505a2a3e92d3ef252ed2910f00501bce43 (patch)
tree3463196281c9aac1bf452d32544ae743156dadcf /progs
parent05e6fd8398843ac0d6609a5efd1555ad1bf6a829 (diff)
downloadexternal_mesa3d-0420d8505a2a3e92d3ef252ed2910f00501bce43.zip
external_mesa3d-0420d8505a2a3e92d3ef252ed2910f00501bce43.tar.gz
external_mesa3d-0420d8505a2a3e92d3ef252ed2910f00501bce43.tar.bz2
disable MakeTexture()
Diffstat (limited to 'progs')
-rw-r--r--progs/demos/fslight.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/progs/demos/fslight.c b/progs/demos/fslight.c
index b03ba23..736cc48 100644
--- a/progs/demos/fslight.c
+++ b/progs/demos/fslight.c
@@ -23,6 +23,8 @@
#include "extfuncs.h"
+#define TEXTURE 0
+
static GLint CoordAttrib = 0;
static char *FragProgFile = NULL;
@@ -281,11 +283,12 @@ TestFunctions(void)
}
+#if TEXTURE
static void
MakeTexture(void)
{
-#define SZ0 128
-#define SZ1 64
+#define SZ0 64
+#define SZ1 32
GLubyte image0[SZ0][SZ0][SZ0][4];
GLubyte image1[SZ1][SZ1][SZ1][4];
GLuint i, j, k;
@@ -348,6 +351,7 @@ MakeTexture(void)
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
+#endif
static void
@@ -540,7 +544,9 @@ Init(void)
CurList = SphereList;
+#if TEXTURE
MakeTexture();
+#endif
printf("GL_RENDERER = %s\n",(const char *) glGetString(GL_RENDERER));
printf("Press p to toggle between per-pixel and per-vertex lighting\n");