Mesa version 6.2.1MESA

3 files changed, 9 insertions, 3 deletions

diff --git a/extras/Mesa/progs/demos/Makefile b/extras/Mesa/progs/demos/Makefile
index ff07481a9..b03a5dbaf 100644
--- a/extras/Mesa/progs/demos/Makefile
+++ b/extras/Mesa/progs/demos/Makefile
@@ -7,6 +7,8 @@ INCDIR = $(TOP)/include
 
 OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
 
+OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
+
 LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
 
 PROGS = \
@@ -88,3 +90,8 @@ readtex.h:
 # special case: need the -lOSMesa library:
 osdemo: osdemo.c
 	$(CC) -I$(INCDIR) $(CFLAGS) osdemo.c $(OSMESA_LIBS) -o $@
+
+# another special case: need the -lOSMesa32 library:
+osdemo32: osdemo32.c
+	$(CC) -I$(INCDIR) $(CFLAGS) osdemo32.c $(OSMESA32_LIBS) -o $@
+
diff --git a/extras/Mesa/progs/xdemos/glxgears.c b/extras/Mesa/progs/xdemos/glxgears.c
index 59691513e..a82a0b9bc 100644
--- a/extras/Mesa/progs/xdemos/glxgears.c
+++ b/extras/Mesa/progs/xdemos/glxgears.c
@@ -424,6 +424,8 @@ event_loop(Display *dpy, Window win)
 
       /* next frame */
       angle += 2.0;
+      if (angle > 3600.0)
+	angle -= 3600.0;
 
       draw();
       glXSwapBuffers(dpy, win);
diff --git a/extras/Mesa/progs/xdemos/glxpbdemo.c b/extras/Mesa/progs/xdemos/glxpbdemo.c
index 9bdf2ff74..91fd30dca 100644
--- a/extras/Mesa/progs/xdemos/glxpbdemo.c
+++ b/extras/Mesa/progs/xdemos/glxpbdemo.c
@@ -138,7 +138,6 @@ static int
 Setup(int width, int height)
 {
 #if defined(GLX_VERSION_1_3) || defined(GLX_VERSION_1_4)
-   XVisualInfo *visInfo;
    GLXContext glCtx;
 
    /* Open the X display */
@@ -175,7 +174,6 @@ Setup(int width, int height)
    }
    else {
       printf("Error: Couldn't create GLXContext\n");
-      XFree(visInfo);
       XCloseDisplay(gDpy);
       return 0;
    }
@@ -183,7 +181,6 @@ Setup(int width, int height)
    /* Bind context to pbuffer */
    if (!glXMakeCurrent(gDpy, gPBuffer, glCtx)) {
       printf("Error: glXMakeCurrent failed\n");
-      XFree(visInfo);
       XCloseDisplay(gDpy);
       return 0;
    }