summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-09-03 16:26:27 +0100
committerEric Anholt <eric@anholt.net>2008-09-03 08:31:26 -0700
commitdaaefd173b4c98d0ebabd43352bfa3a030a62e4b (patch)
tree13f2de48ab302f181ca813fe65e0003d14e536d2
parent32bb5fc7db14911d0438aea1504e1551b2c9fc25 (diff)
UXA: Re-enable non-965 render.
-rw-r--r--src/i830_exa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 4cfbdb90..a90bd857 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -903,7 +903,6 @@ i830_uxa_init (ScreenPtr pScreen)
i830->uxa_driver->copy = I830EXACopy;
i830->uxa_driver->done_copy = I830EXADoneCopy;
-#if 0
/* Composite */
if (!IS_I9XX(i830)) {
i830->uxa_driver->check_composite = i830_check_composite;
@@ -918,12 +917,13 @@ i830_uxa_init (ScreenPtr pScreen)
i830->uxa_driver->composite = i830_composite;
i830->uxa_driver->done_composite = i830_done_composite;
} else {
+#if 0
i830->uxa_driver->check_composite = i965_check_composite;
i830->uxa_driver->prepare_composite = i965_prepare_composite;
i830->uxa_driver->composite = i965_composite;
i830->uxa_driver->done_composite = i830_done_composite;
- }
#endif
+ }
i830->uxa_driver->prepare_access = i830_uxa_prepare_access;
i830->uxa_driver->finish_access = i830_uxa_finish_access;