Demos (master): geom-sprites: remove dead code, some clean-ups

Brian Paul brianp at kemper.freedesktop.org
Mon Apr 18 10:55:09 PDT 2011


Module: Demos
Branch: master
Commit: 27a60c23f07db89cf9c064ea64e1f7a4e9a79e2d
URL:    http://cgit.freedesktop.org/mesa/demos/commit/?id=27a60c23f07db89cf9c064ea64e1f7a4e9a79e2d

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Apr 18 11:43:22 2011 -0600

geom-sprites: remove dead code, some clean-ups

---

 src/glsl/geom-sprites.c |   25 +------------------------
 1 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/src/glsl/geom-sprites.c b/src/glsl/geom-sprites.c
index ce7ed4f..40f521a 100644
--- a/src/glsl/geom-sprites.c
+++ b/src/glsl/geom-sprites.c
@@ -15,16 +15,9 @@
 #include <GL/glut.h>
 #include "shaderutil.h"
 
-#ifndef M_PI
-#define M_PI 3.1415926535
-#endif
-
 static GLint WinWidth = 500, WinHeight = 500;
-static char *FragProgFile = NULL;
-static char *VertProgFile = NULL;
-static GLuint VertShader, GeomShader, FragShader;
-static GLuint Program;
 static GLint Win = 0;
+static GLuint VertShader, GeomShader, FragShader, Program;
 static GLboolean Anim = GL_TRUE;
 static GLfloat Xrot = 0, Yrot = 0;
 static int uPointSize = -1, uInverseViewportSize = -1;
@@ -294,21 +287,6 @@ Init(void)
 }
 
 
-static void
-ParseOptions(int argc, char *argv[])
-{
-   int i;
-   for (i = 1; i < argc; i++) {
-      if (strcmp(argv[i], "-fs") == 0) {
-         FragProgFile = argv[i+1];
-      }
-      else if (strcmp(argv[i], "-vs") == 0) {
-         VertProgFile = argv[i+1];
-      }
-   }
-}
-
-
 int
 main(int argc, char *argv[])
 {
@@ -322,7 +300,6 @@ main(int argc, char *argv[])
    glutDisplayFunc(Redisplay);
    if (Anim)
       glutIdleFunc(Idle);
-   ParseOptions(argc, argv);
 
    Init();
    glutMainLoop();



More information about the mesa-commit mailing list