summaryrefslogtreecommitdiff
path: root/src/i830_uxa.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-05-18 23:25:59 +0100
committerOwain G. Ainsworth <oga@openbsd.org>2010-05-25 16:23:21 +0100
commit1e7f08c3d8bd261db866d3ef1c7fc27d08d727a0 (patch)
tree345fcee18bc0f9c07b29dc6270193c66e837ad01 /src/i830_uxa.c
parente2dabf379d9c1ed95899b3658661c6c57acbb509 (diff)
i915: amalgamate composite into a single primitive list
Combine all the calls to composite between prepare_composite and done_composite into a single primitive list, rather than a primitive call per composite(). Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 4a3476ea094e84887fefb558e0bba023fee34151) Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'src/i830_uxa.c')
-rw-r--r--src/i830_uxa.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index fccfa55c..3448cc31 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -453,6 +453,10 @@ static void i830_uxa_done_copy(PixmapPtr dest)
void i830_done_composite(PixmapPtr dest)
{
ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
+ intel_screen_private *intel = intel_get_screen_private(scrn);
+
+ if (intel->vertex_flush)
+ intel->vertex_flush(intel);
i830_debug_flush(scrn);
}
@@ -1050,6 +1054,9 @@ Bool i830_uxa_init(ScreenPtr screen)
intel->uxa_driver->uxa_major = 1;
intel->uxa_driver->uxa_minor = 0;
+ intel->prim_offset = 0;
+ intel->prim_count = 0;
+
/* Solid fill */
intel->uxa_driver->check_solid = i830_uxa_check_solid;
intel->uxa_driver->prepare_solid = i830_uxa_prepare_solid;