xserver: Branch 'glucose-2'

[Jose Fonseca]

 hw/xgl/glxext/xglglxext.c |    2 +-
 hw/xgl/xglglx.c           |    5 +++--
 hw/xgl/xglglx.h           |    3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
diff-tree 8231b546d399d1d923e5a93a8197bc9a9eec40d3 (from 00d28c084f39e3c2609039b12ac881f76f3e1ed9)
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Thu Sep 20 14:10:09 2007 +0100

    Use new __glXDrawableInit interface.

diff --git a/hw/xgl/glxext/xglglxext.c b/hw/xgl/glxext/xglglxext.c
index 7bdb5f8..a613454 100644
--- a/hw/xgl/glxext/xglglxext.c
+++ b/hw/xgl/glxext/xglglxext.c
@@ -5548,7 +5548,7 @@ xglCreateDrawable (__GLXscreen *screen,
 
     memset (pBufferPriv, 0, sizeof (xglGLBufferRec));
 
-    if (!GlxDrawableInit (&pBufferPriv->base, screen, pDrawable, drawId))
+    if (!GlxDrawableInit (&pBufferPriv->base, screen, pDrawable, drawId, modes))
     {
 	xfree (pBufferPriv);
 	return NULL;
diff --git a/hw/xgl/xglglx.c b/hw/xgl/xglglx.c
index df328e5..b8e214d 100644
--- a/hw/xgl/xglglx.c
+++ b/hw/xgl/xglglx.c
@@ -127,10 +127,11 @@ GLboolean
 GlxDrawableInit (__GLXdrawable *drawable,
 		 __GLXcontext  *ctx,
 		 DrawablePtr   pDrawable,
-		 XID	       drawId)
+		 XID	       drawId,
+		 __GLcontextModes *modes)
 {
     if (glXHandle)
-	return (*__xglGLXFunc.drawableInit) (drawable, ctx, pDrawable, drawId);
+	return (*__xglGLXFunc.drawableInit) (drawable, ctx, pDrawable, drawId, modes);
 
     return GL_FALSE;
 }
diff --git a/hw/xgl/xglglx.h b/hw/xgl/xglglx.h
index 0a8d3b5..e9cd0cb 100644
--- a/hw/xgl/xglglx.h
+++ b/hw/xgl/xglglx.h
@@ -55,7 +55,8 @@ typedef struct _xglGLXFunc {
     GLboolean (*drawableInit) (__GLXdrawable *drawable,
 			       __GLXcontext  *ctx,
 			       DrawablePtr   pDrawable,
-			       XID	     drawId);
+			       XID	     drawId,
+			       __GLcontextModes *modes);
 } xglGLXFuncRec, *xglGLXFuncPtr;
 
 extern xglGLXFuncRec __xglGLXFunc;