summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-06-11 15:07:23 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-06-11 15:07:23 +0000
commit22dad683b18e822579fab03b2ae96b62f1a4e740 (patch)
treefb5c450ee9ffd5167cd76d4888016119b1c253c0 /progs
parent694b10ca6d73e710a3521990df498779f6807d05 (diff)
downloadexternal_mesa3d-22dad683b18e822579fab03b2ae96b62f1a4e740.zip
external_mesa3d-22dad683b18e822579fab03b2ae96b62f1a4e740.tar.gz
external_mesa3d-22dad683b18e822579fab03b2ae96b62f1a4e740.tar.bz2
don't pass GL_INTENSITY for <format> to glTexImage2D - it's illegal
Diffstat (limited to 'progs')
-rw-r--r--progs/demos/texenv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/progs/demos/texenv.c b/progs/demos/texenv.c
index d64ae2e..590867b 100644
--- a/progs/demos/texenv.c
+++ b/progs/demos/texenv.c
@@ -354,7 +354,8 @@ static void loadTexture( int width, int height,
break;
case GL_INTENSITY:
luminanceSize = 1;
- textureFormat = GL_INTENSITY;
+ /* Note: format=GL_INTENSITY for glTexImage is not legal */
+ textureFormat = GL_LUMINANCE;
break;
case GL_ALPHA:
alphaSize = 1;