Merge commit 'origin/st-shader-varients'

[mesa.git] / progs / fp / tri-tex.c

diff --git a/progs/fp/tri-tex.c b/progs/fp/tri-tex.c
index 12fdc3730ad4886573371fef8b8e82237ab1fce9..64299e945314afdce1b67bfb309ec70bba5bf40e 100644 (file)
--- a/progs/fp/tri-tex.c
+++ b/progs/fp/tri-tex.c
@@ -1,32 +1,9 @@
-/*
- * Copyright (c) 1991, 1992, 1993 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the name of
- * Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF
- * ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#define GL_GLEXT_PROTOTYPES
+#include <GL/glew.h>
 #include <GL/glut.h>
 
 #include "readtex.c"
@@ -35,7 +12,6 @@
 #define TEXTURE_FILE "../images/girl.rgb"
 
 
-GLenum doubleBuffer;
 
 static void Init( void )
 {
@@ -47,7 +23,7 @@ static void Init( void )
    GLuint modulateProg;
    GLuint Texture;
 
-   if (!glutExtensionSupported("GL_ARB_fragment_program")) {
+   if (!GLEW_ARB_fragment_program) {
       printf("Error: GL_ARB_fragment_program not supported!\n");
       exit(1);
    }
@@ -100,7 +76,7 @@ static void Key(unsigned char key, int x, int y)
       case 27:
        exit(1);
       default:
-       return;
+       break;
     }
 
     glutPostRedisplay();
@@ -123,30 +99,8 @@ static void Draw(void)
    glEnd();
 
    glFlush();
-
-   if (doubleBuffer) {
-      glutSwapBuffers();
-   }
 }
 
-static GLenum Args(int argc, char **argv)
-{
-    GLint i;
-
-    doubleBuffer = GL_FALSE;
-
-    for (i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "-sb") == 0) {
-           doubleBuffer = GL_FALSE;
-       } else if (strcmp(argv[i], "-db") == 0) {
-           doubleBuffer = GL_TRUE;
-       } else {
-           fprintf(stderr, "%s (Bad option).\n", argv[i]);
-           return GL_FALSE;
-       }
-    }
-    return GL_TRUE;
-}
 
 int main(int argc, char **argv)
 {
@@ -154,20 +108,20 @@ int main(int argc, char **argv)
 
     glutInit(&argc, argv);
 
-    if (Args(argc, argv) == GL_FALSE) {
-       exit(1);
-    }
+
 
     glutInitWindowPosition(0, 0); glutInitWindowSize( 250, 250);
 
     type = GLUT_RGB;
-    type |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;
+    type |= GLUT_SINGLE;
     glutInitDisplayMode(type);
 
     if (glutCreateWindow("First Tri") == GL_FALSE) {
        exit(1);
     }
 
+    glewInit();
+
     Init();
 
     glutReshapeFunc(Reshape);