xserver: Branch 'master'

[Michel Daenzer]

 GL/glx/glxdri.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

New commits:
diff-tree c46663367329615bd2c9b63e93c9534036e5a2ae (from 17cb4f64e3c39725e83b1e311c09422d7e1c0e52)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Aug 1 18:32:09 2007 +0200

    GLX/DRI: Remove some unused variables.

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 051784c..685683d 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -374,15 +374,13 @@ __glXDRIbindTexImage(__GLXcontext *baseC
 {
     RegionPtr	pRegion = NULL;
     PixmapPtr	pixmap;
-    int		w, h, bpp, override = 0;
+    int		bpp, override = 0;
     GLenum	format, type;
     ScreenPtr pScreen = glxPixmap->pScreen;
     __GLXDRIscreen * const screen =
 	(__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum);
 
     pixmap = (PixmapPtr) glxPixmap->pDraw;
-    w = pixmap->drawable.width;
-    h = pixmap->drawable.height;
 
     if (screen->texOffsetStart && screen->driScreen.setTexOffset) {
 	__GLXpixmap **texOffsetOverride = screen->texOffsetOverride;
@@ -972,7 +970,6 @@ static Bool
 glxDRIEnterVT (int index, int flags)
 {
     __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index);
-    Bool ret;
 
     LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");