X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=apps%2Fgl%2Ftri.c;h=faa794b7f7bfed43cdbbd54c5ead1abe505ebf53;hb=38312abe136ffc40c2a90304d956abf52eb8f2e8;hp=005c227e5e029bed60358ff5a1f96e6b03ee81a8;hpb=1902daf4c77939649b15ad49cdecd475c33264c0;p=apitrace-tests

diff --git a/apps/gl/tri.c b/apps/gl/tri.c
index 005c227..faa794b 100644
--- a/apps/gl/tri.c
+++ b/apps/gl/tri.c
@@ -38,44 +38,57 @@
 #endif
 
 
-#define CI_OFFSET_1 16
-#define CI_OFFSET_2 32
-
-
 static GLboolean doubleBuffer = GL_TRUE;
 static int win;
 
-static void Init(void)
+
+static void parseArgs(int argc, char** argv)
 {
-   fprintf(stdout, "GL_RENDERER   = %s\n", (char *) glGetString(GL_RENDERER));
-   fprintf(stdout, "GL_VERSION    = %s\n", (char *) glGetString(GL_VERSION));
-   fprintf(stdout, "GL_VENDOR     = %s\n", (char *) glGetString(GL_VENDOR));
-   fflush(stdout);
+   int i;
 
-   glClearColor(0.3, 0.1, 0.3, 0.0);
+   for (i = 1; i < argc; ++i) {
+      const char *arg = argv[i];
+      if (strcmp(arg, "-sb") == 0) {
+         doubleBuffer = GL_FALSE;
+      } else if (strcmp(arg, "-db") == 0) {
+         doubleBuffer = GL_TRUE;
+      } else {
+         fprintf(stderr, "error: unknown arg %s\n", arg);
+         exit(1);
+      }
+   }
 }
 
-static void Reshape(int width, int height)
+
+static void
+Init(void)
 {
+   glClearColor(0.3f, 0.1f, 0.3f, 1.0f);
+}
 
-   glViewport(0, 0, (GLint)width, (GLint)height);
 
+static void
+Reshape(int width, int height)
+{
+   glViewport(0, 0, width, height);
    glMatrixMode(GL_PROJECTION);
    glLoadIdentity();
    glOrtho(-1.0, 1.0, -1.0, 1.0, -0.5, 1000.0);
    glMatrixMode(GL_MODELVIEW);
 }
 
-static void Draw(void)
+
+static void
+Draw(void)
 {
    glClear(GL_COLOR_BUFFER_BIT); 
 
    glBegin(GL_TRIANGLES);
-   glColor3f(.8,0,0); 
+   glColor3f(.8, 0, 0); 
    glVertex3f(-0.9, -0.9, -30.0);
-   glColor3f(0,.9,0); 
+   glColor3f(0, .9, 0); 
    glVertex3f( 0.9, -0.9, -30.0);
-   glColor3f(0,0,.7); 
+   glColor3f(0, 0, .7); 
    glVertex3f( 0.0,  0.9, -30.0);
    glEnd();
 
@@ -84,39 +97,23 @@ static void Draw(void)
    if (doubleBuffer) {
       glutSwapBuffers();
    }
-   
-   glutDestroyWindow(win);
-}
 
-static GLenum Args(int argc, char **argv)
-{
-   GLint i;
+   glutDestroyWindow(win);
 
-   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;
+   exit(0);
 }
 
-int main(int argc, char **argv)
+
+int
+main(int argc, char **argv)
 {
    GLenum type;
 
-   glutInit(&argc, argv);
+   parseArgs(argc, argv);
 
-   if (Args(argc, argv) == GL_FALSE) {
-      exit(1);
-   }
+   glutInit(&argc, argv);
 
-   glutInitWindowPosition(0, 0);
-   glutInitWindowSize( 250, 250);
+   glutInitWindowSize(250, 250);
 
    type = GLUT_RGB | GLUT_ALPHA;
    type |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;