summaryrefslogtreecommitdiff
path: root/src/i830_batchbuffer.h
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-04-17 15:11:12 -0700
committerEric Anholt <eric@anholt.net>2009-04-27 17:05:59 -0700
commit96df22740b2cdc4f82a4a36c0f77663105d9337e (patch)
treef8017b83ab78a0719b3f2ae2e813e6ae6ee8dd81 /src/i830_batchbuffer.h
parentfa81ae1637bfd7b73b43355b78c88a9b84c0393c (diff)
unifdef I830_USE_UXA.
We only have on acceleration architecture now, and you can always build it if you're building the driver.
Diffstat (limited to 'src/i830_batchbuffer.h')
-rw-r--r--src/i830_batchbuffer.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/i830_batchbuffer.h b/src/i830_batchbuffer.h
index f16023df..d0114176 100644
--- a/src/i830_batchbuffer.h
+++ b/src/i830_batchbuffer.h
@@ -100,18 +100,14 @@ intel_batch_emit_reloc_pixmap(I830Ptr pI830, PixmapPtr pPixmap,
uint32_t read_domains, uint32_t write_domain,
uint32_t delta)
{
-#if I830_USE_UXA
dri_bo *bo = i830_get_pixmap_bo(pPixmap);
-#endif
uint32_t offset;
assert(pI830->batch_ptr != NULL);
assert(intel_batch_space(pI830) >= 4);
-#if I830_USE_UXA
if (bo) {
intel_batch_emit_reloc(pI830, bo, read_domains, write_domain, delta);
return;
}
-#endif
offset = intel_get_pixmap_offset(pPixmap);
*(uint32_t *)(pI830->batch_ptr + pI830->batch_used) = offset + delta;
pI830->batch_used += 4;