xserver: Branch 'master' - 3 commits

[Dodji Seketeli]

 GL/glx/glxglcore.c        |    2 +-
 hw/kdrive/ephyr/XF86dri.c |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 632c33c5c18b3e091c4fce98280af4d583e99640
Merge: 4113f04... dda10c9...
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Mon Nov 5 17:52:33 2007 +0100

    pull 'master'

commit 4113f040c587fc536adc693d7ee5a4c0a60b75d4
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Mon Nov 5 17:33:01 2007 +0100

    GL: fix crash at mesa destruction time
    
            * GL/glx/glxglcore.c:
             (_glXMesaScreenDestroy): delete the same amount of visuals
             that those which were created in createMesaVisuals().

diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c
index 4cc00a3..0750e12 100644
--- a/GL/glx/glxglcore.c
+++ b/GL/glx/glxglcore.c
@@ -265,7 +265,7 @@ __glXMesaScreenDestroy(__GLXscreen *screen)
     int i;
 
     if (mesaScreen->xm_vis) {
-	for (i = 0; i < mesaScreen->num_vis; i++) {
+	for (i = 0; i < mesaScreen->base.numFBConfigs; i++) {
 	    if (mesaScreen->xm_vis[i])
 		XMesaDestroyVisual(mesaScreen->xm_vis[i]);
 	}
commit 6ff79ea5f7d3ff0c3b14e39849514784ccd40190
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Mon Nov 5 16:46:49 2007 +0100

    Xephyr: fix some DRI build breakage

diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
index ae2ec89..c11da06 100644
--- a/hw/kdrive/ephyr/XF86dri.c
+++ b/hw/kdrive/ephyr/XF86dri.c
@@ -57,6 +57,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <GL/glx.h>
 #include <X11/dri/xf86dri.h>
 #include <X11/dri/xf86dristr.h>
+#include "GL/internal/dri_interface.h"
 
 static XExtensionInfo _xf86dri_info_data;
 static XExtensionInfo *xf86dri_info = &_xf86dri_info_data;
@@ -384,8 +385,7 @@ Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
 					   context, hHWContext );
 }
 
-GLboolean XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, 
-    __DRIid context )
+Bool XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid context)
 {
     Display * const dpy = (Display *) ndpy;
     XExtDisplayInfo *info = find_display (dpy);
@@ -406,8 +406,9 @@ GLboolean XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen,
     return True;
 }
 
-GLboolean XF86DRICreateDrawable( __DRInativeDisplay * ndpy, int screen, 
-    __DRIid drawable, drm_drawable_t * hHWDrawable )
+Bool
+XF86DRICreateDrawable (__DRInativeDisplay * ndpy, int screen,
+                       __DRIid drawable, drm_drawable_t * hHWDrawable)
 {
     Display * const dpy = (Display *) ndpy;
     XExtDisplayInfo *info = find_display (dpy);
@@ -436,7 +437,7 @@ GLboolean XF86DRICreateDrawable( __DRInativeDisplay * ndpy, int screen,
     return True;
 }
 
-GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
+Bool XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
     __DRIid drawable )
 {
     Display * const dpy = (Display *) ndpy;