diff options
| author | Eric Anholt <eric@anholt.net> | 2009-04-17 15:11:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-27 17:05:59 -0700 |
| commit | 96df22740b2cdc4f82a4a36c0f77663105d9337e (patch) | |
| tree | f8017b83ab78a0719b3f2ae2e813e6ae6ee8dd81 /src/i830_exa.c | |
| parent | fa81ae1637bfd7b73b43355b78c88a9b84c0393c (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_exa.c')
| -rw-r--r-- | src/i830_exa.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index cf393422..3ec36571 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -79,9 +79,7 @@ const int I830PatternROP[16] = ROP_1 }; -#ifdef I830_USE_UXA static int uxa_pixmap_index; -#endif /** * Returns whether a given pixmap is tiled or not. @@ -455,13 +453,10 @@ i830_get_pixmap_bo(PixmapPtr pixmap) ScrnInfoPtr scrn = xf86Screens[screen->myNum]; I830Ptr i830 = I830PTR(scrn); -#ifdef I830_USE_UXA - if (i830->accel == ACCEL_UXA) { + if (i830->accel == ACCEL_UXA) return dixLookupPrivate(&pixmap->devPrivates, &uxa_pixmap_index); - } -#endif - - return NULL; + else + return NULL; } void @@ -473,17 +468,13 @@ i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo *bo) if (old_bo) dri_bo_unreference (old_bo); -#if I830_USE_UXA if (i830->accel == ACCEL_UXA) { if (bo != NULL) dri_bo_reference(bo); dixSetPrivate(&pixmap->devPrivates, &uxa_pixmap_index, bo); } -#endif } -#if defined(I830_USE_UXA) - static void i830_uxa_set_pixmap_bo (PixmapPtr pixmap, dri_bo *bo) { @@ -736,4 +727,3 @@ i830_uxa_init (ScreenPtr pScreen) return TRUE; } -#endif /* I830_USE_UXA */ |