mesa: Branch 'master' - 2 commits

[Brian Paul]

 progs/glsl/Makefile |    6 ------
 progs/glsl/deriv.c  |    2 --
 2 files changed, 8 deletions(-)

New commits:
diff-tree 3cddba688d45e61f0c8a76fd4c163745f09844d1 (from dc881e19098ec3d04246ad07baded5ad4d916b66)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed May 2 18:55:45 2007 -0600

    get rid of normal vector

diff --git a/progs/glsl/deriv.c b/progs/glsl/deriv.c
index 63beef1..8b652bc 100644
--- a/progs/glsl/deriv.c
+++ b/progs/glsl/deriv.c
@@ -149,7 +149,6 @@ MakeRect(void)
 {
    RectList = glGenLists(1);
    glNewList(RectList, GL_COMPILE);
-   glNormal3f(0, 0, 1);
    glBegin(GL_POLYGON);
    glTexCoord2f(0, 0);   glVertex2f(-2, -2);
    glTexCoord2f(1, 0);   glVertex2f( 2, -2);
@@ -231,7 +230,6 @@ Init(void)
       "  // gl_FragColor = gl_TexCoord[0];\n"
       "}\n";
    static const char *vertShaderText =
-      "varying vec3 normal;\n"
       "void main() {\n"
       "   gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
       "   gl_TexCoord[0] = gl_MultiTexCoord0;\n"
diff-tree dc881e19098ec3d04246ad07baded5ad4d916b66 (from 2dfb03beb2751c873d7a7499ffb52dac7d758184)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed May 2 18:54:57 2007 -0600

    get rid of OSMESA stuff

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index b51a2a3..37fa312 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -5,12 +5,6 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
-
-OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
-
-OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
-
 LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
 
 PROGS = \