diff options
| author | Eric Anholt <eric@anholt.net> | 2008-09-11 16:11:46 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-09-11 16:11:46 -0700 |
| commit | d8d95d8c71f2cd4bab277f44132ece7963714a5b (patch) | |
| tree | 8602b26243c62f0d2f4cc50bce4cbb1bb42b5bf2 /src | |
| parent | 7e8eb6e20b6b1a2a3c1ef28f694fa23c68a15c48 (diff) | |
Fix build failures that should have been in the previous merge commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/i830_batchbuffer.c | 2 | ||||
| -rw-r--r-- | src/i830_dri.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c index 3727f0ea..6e71b507 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 4bfe2867..da1588ca 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 */ } |