xf86-video-intel: Branch 'dri2' - src/i830_batchbuffer.c src/i830_dri.c

[Eric Anholt]

 src/i830_batchbuffer.c |    2 +-
 src/i830_dri.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8d95d8c71f2cd4bab277f44132ece7963714a5b
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep 11 16:11:46 2008 -0700

    Fix build failures that should have been in the previous merge commit.

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 3727f0e..6e71b50 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -124,7 +124,7 @@ intel_batch_init(ScrnInfoPtr pScrn)
 
     intel_next_batch(pScrn);
 
-    if (!pI830->directRenderingEnabled) {
+    if (!pI830->directRenderingType <= DRI_NONE) {
 	if (IS_I830(pI830) || IS_845G(pI830)) {
 	    intel_bufmgr_fake_set_exec_callback(pI830->bufmgr,
 						intel_nondrm_exec_i830,
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 4bfe286..da1588c 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1877,7 +1877,7 @@ I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
 	privates[i].pPixmap = pPixmap;
 
 	bo = i830_get_pixmap_bo (pPixmap);
-	if (intel_bo_flink(bo, &buffers[i].name) != 0) {
+	if (dri_bo_flink(bo, &buffers[i].name) != 0) {
 	    /* failed to name buffer */
 	}