diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | man/.gitignore | 2 | ||||
| -rw-r--r-- | src/common.h | 4 | ||||
| -rw-r--r-- | src/i810_driver.c | 2 | ||||
| -rw-r--r-- | src/i830_dri.c | 3 |
6 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,5 @@ +.deps +.libs Makefile Makefile.in *.la @@ -1,3 +1,8 @@ +2006-05-01 Matthieu Herrb <matthieu.herrb@laas.fr> + + * src/common.h: + Fix build on non-dri systems. + 2006-04-07 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/man/.gitignore b/man/.gitignore index 77b43621..a438e807 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -1,4 +1,2 @@ -Makefile -Makefile.in i810.4 i810.4x diff --git a/src/common.h b/src/common.h index 6e68767a..21977af4 100644 --- a/src/common.h +++ b/src/common.h @@ -80,10 +80,10 @@ extern const char *I810ddcSymbols[]; extern const char *I810fbSymbols[]; extern const char *I810xaaSymbols[]; extern const char *I810shadowFBSymbols[]; +extern const char *I810shadowSymbols[]; #ifdef XF86DRI extern const char *I810driSymbols[]; extern const char *I810drmSymbols[]; -extern const char *I810shadowSymbols[]; #endif extern const char *I810i2cSymbols[]; @@ -132,7 +132,7 @@ extern void I830DPRINTF_stub(const char *filename, int line, RecPtr->LpRing->space -= ringused; \ if (outring & 0x07) \ ErrorF("ADVANCE_LP_RING: " \ - "outring (0x%x) isn't on a QWord boundary", outring); \ + "outring (0x%x) isn't on a QWord boundary\n", outring); \ OUTREG(LP_RING + RING_TAIL, outring); \ } while (0) diff --git a/src/i810_driver.c b/src/i810_driver.c index ae9069c7..b87601e0 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -1099,7 +1099,7 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) #ifdef XF86DRI if (!pI810->directRenderingDisabled) { pI810->allowPageFlip = enable; - if (pI810->allowPageFlip == enable) + if (pI810->allowPageFlip == TRUE) { if (!xf86LoadSubModule(pScrn, "shadowfb")) { pI810->allowPageFlip = 0; diff --git a/src/i830_dri.c b/src/i830_dri.c index 0000a940..762d3d95 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -773,6 +773,9 @@ I830DRIDoMappings(ScreenPtr pScreen) sarea->depth_handle = 0; sarea->tex_handle = 0; + /* Assign pScreen */ + pScrn->pScreen = pScreen; + /* Need to initialize pScreen now to let RandR know. */ pScrn->pScreen->width = pScrn->virtualX; pScrn->pScreen->height = pScrn->virtualY; |