print UNDEFINED MODE over samples that are undefined in the GL spec

diff --git a/progs/demos/texenv.c b/progs/demos/texenv.c
index e5394ae487a7bc9d06824c1772fafa9338772f67..fe8975ed0d8c7175d74b8956a4cf35662a1b19bc 100644 (file)
--- a/progs/demos/texenv.c
+++ b/progs/demos/texenv.c
@@ -587,7 +587,18 @@ static void drawSample( int x, int y, int w, int h,
    glShadeModel( GL_FLAT );
    glDisable( GL_TEXTURE_2D );
 
-   if ( displayLevelInfo ) {
+   if ( envMode->mode == GL_DECAL &&
+        (format->baseFormat == GL_ALPHA ||
+         format->baseFormat == GL_LUMINANCE ||
+         format->baseFormat == GL_LUMINANCE_ALPHA ||
+         format->baseFormat == GL_INTENSITY)) {
+      /* undefined format/mode combination */
+      begin2D( w, h );
+      drawStringOutline( "UNDEFINED MODE", 15, h / 2,
+                         labelLevelColor0, labelLevelColor1 );
+      end2D();
+   }
+   else if ( displayLevelInfo ) {
       GLint width, height, border, components;
       GLint redSize, greenSize, blueSize, alphaSize;
       GLint luminanceSize, intensitySize;