xserver: Branch 'master' - 2 commits

[Tiago Vignatti]

 glx/glxcmds.c     |    6 ------
 glx/glxdrawable.h |    2 --
 glx/glxdri.c      |    1 +
 glx/glxserver.h   |    3 ---
 4 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 73abdc94c3cceadeda26a9b6bd3cdfecf0df8db2
Author: RALOVICH, Kristóf <tade60 at freemail.hu>
Date:   Sun Jul 5 16:42:54 2009 +0200

    glx: damage is only used with DRI
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
index 0215b3b..3f165ed 100644
--- a/glx/glxdrawable.h
+++ b/glx/glxdrawable.h
@@ -35,8 +35,6 @@
  * Silicon Graphics, Inc.
  */
 
-#include <damage.h>
-
 /* We just need to avoid clashing with DRAWABLE_{WINDOW,PIXMAP} */
 enum {
     GLX_DRAWABLE_WINDOW,
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 5fb75a4..c9d226b 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -38,6 +38,7 @@
 
 #include <windowstr.h>
 #include <os.h>
+#include <damage.h>
 
 #define _XF86DRI_SERVER_
 #include <drm_sarea.h>
commit 7208a0f032d487bd3bc9809800f4557f1da1e2db
Author: RALOVICH, Kristóf <tade60 at freemail.hu>
Date:   Mon Jun 29 15:18:56 2009 +0200

    glx: remove Xgl leftover
    
    GlxSetRenderTables was only used by the long gone Xgl.
    
    Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index d4ff7da..f5632d1 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -51,12 +51,6 @@
 #include "indirect_table.h"
 #include "indirect_util.h"
 
-void
-GlxSetRenderTables (struct _glapi_table *table)
-{
-    _glapi_set_dispatch (table);
-}
-
 static int
 validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
 {
diff --git a/glx/glxserver.h b/glx/glxserver.h
index 3e44b71..46c9382 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -94,9 +94,6 @@ void GlxExtensionInit(void);
 void GlxSetVisualConfigs(int nconfigs, 
                          void *configs, void **privates);
 
-struct _glapi_table;
-void GlxSetRenderTables (struct _glapi_table *table);
-
 void __glXScreenInitVisuals(__GLXscreen *screen);
 
 /*