xserver: Branch 'glucose-2'

[Alan Hourihane]

 glucose/glucose.c |    9 ++++++++-
 glucose/glucose.h |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
diff-tree 02507f3b06a50518c70dec600dd3802c34c30d64 (from b4c16beafc71f1b5dcad573f2af95ac67727de28)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Mar 29 12:14:00 2007 +0100

    Add a flags option to glucoseScreenInit() so that drivers
    can modify glucose's operation.

diff --git a/glucose/glucose.c b/glucose/glucose.c
index c0881a6..ff44a7a 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -340,7 +340,7 @@ xglAllocatePrivates (ScreenPtr pScreen)
 }
 
 Bool
-glucoseScreenInit (ScreenPtr pScreen)
+glucoseScreenInit (ScreenPtr pScreen, int flags)
 {
     xglScreenPtr pScreenPriv;
 
@@ -375,6 +375,13 @@ glucoseScreenInit (ScreenPtr pScreen)
     pScreenPriv->xvFilter	  = xglScreenInfo.xvFilter;
     pScreenPriv->accel		  = xglScreenInfo.accel;
 
+#if 0
+    /* add some flags to change the default xgl methods above */
+    if (flags & GLUCOSE_xxx) {
+
+    }
+#endif
+
 
     pScreen->CreatePixmap  = xglCreatePixmap;
     pScreen->DestroyPixmap = xglDestroyPixmap;
diff --git a/glucose/glucose.h b/glucose/glucose.h
index fde01fd..ad44747 100644
--- a/glucose/glucose.h
+++ b/glucose/glucose.h
@@ -38,7 +38,7 @@ Bool
 glucoseFinishScreenInit (ScreenPtr pScreen);
 
 Bool
-glucoseScreenInit (ScreenPtr pScreen);
+glucoseScreenInit (ScreenPtr pScreen, int flags);
 
 typedef struct {
     __GLXdrawable *rootDrawable;