diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2005-10-21 18:33:53 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-10-21 18:33:53 +0000 |
commit | f28cbb6a7f3132ba7455b158bcb8269b51d74daa (patch) | |
tree | 5a5e53305493f8f8a889964a6a3eacb52383c8a9 /progs/fp/tri-tex.c | |
parent | 32a7ab2197fc6df066b87940cc36cc537e44319c (diff) | |
download | external_mesa3d-f28cbb6a7f3132ba7455b158bcb8269b51d74daa.zip external_mesa3d-f28cbb6a7f3132ba7455b158bcb8269b51d74daa.tar.gz external_mesa3d-f28cbb6a7f3132ba7455b158bcb8269b51d74daa.tar.bz2 |
simplify, remove sgi messages
Diffstat (limited to 'progs/fp/tri-tex.c')
-rw-r--r-- | progs/fp/tri-tex.c | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/progs/fp/tri-tex.c b/progs/fp/tri-tex.c index 12fdc37..87f6389 100644 --- a/progs/fp/tri-tex.c +++ b/progs/fp/tri-tex.c @@ -1,26 +1,3 @@ -/* - * 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> @@ -35,7 +12,6 @@ #define TEXTURE_FILE "../images/girl.rgb" -GLenum doubleBuffer; static void Init( void ) { @@ -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,14 +108,12 @@ 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) { |