xf86-video-intel: 2 commits - src/brw_structs.h src/i810_driver.c src/i830_accel.c

[Alan Hourihane]

 src/brw_structs.h |    2 ++
 src/i810_driver.c |    6 +++---
 src/i830_accel.c  |    4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
diff-tree dad0e7fc09fa7794f20278d9d99abd96a21b691e (from parents)
Merge: 361c49ad3cfe58b9ab98dfb6e95de505c0d63730 43daaec63929c1f0e54a5125375d8147629da4b9
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Mon Aug 21 12:08:01 2006 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel

diff-tree 361c49ad3cfe58b9ab98dfb6e95de505c0d63730 (from cdcc6f23e8cad797e6cfd57e2ff454ec8509b5ba)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Mon Aug 21 12:07:29 2006 +0100

    Fix bug #7930, i810 doesn't compile without DRI
    (Samuel Thibault)

diff --git a/src/brw_structs.h b/src/brw_structs.h
index c9c0751..50b5fda 100644
--- a/src/brw_structs.h
+++ b/src/brw_structs.h
@@ -28,6 +28,8 @@
 #ifndef BRW_STRUCTS_H
 #define BRW_STRUCTS_H
 
+#include <GL/gl.h>
+
 /* Command packets:
  */
 struct header 
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 3481d0b..22635c8 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -333,6 +333,8 @@ const char *I810driSymbols[] = {
    NULL
 };
 
+#endif /* I830_ONLY */
+
 const char *I810shadowSymbols[] = {
     "shadowInit",
     "shadowSetup",
@@ -340,8 +342,6 @@ const char *I810shadowSymbols[] = {
     NULL
 };
 
-#endif /* I830_ONLY */
-
 #ifndef I810_DEBUG
 int I810_DEBUG = (0
 /*     		  | DEBUG_ALWAYS_SYNC  */
@@ -408,9 +408,9 @@ i810Setup(pointer module, pointer opts, 
 #ifdef XF86DRI
 			I810drmSymbols,
 			I810driSymbols,
+#endif
 			I810shadowSymbols,
 			I810shadowFBSymbols,
-#endif
 			I810vbeSymbols, vbeOptionalSymbols,
 			I810ddcSymbols, I810int10Symbols, NULL);
 
diff --git a/src/i830_accel.c b/src/i830_accel.c
index aa43cbe..b029968 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -395,6 +395,7 @@ I830AccelInit(ScreenPtr pScreen)
    return XAAInit(pScreen, infoPtr);
 }
 
+#ifdef XF86DRI
 static unsigned int
 CheckTiling(ScrnInfoPtr pScrn)
 {
@@ -416,6 +417,9 @@ CheckTiling(ScrnInfoPtr pScrn)
 
    return tiled;
 }
+#else
+#define CheckTiling(pScrn) 0
+#endif
 
 void
 I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,