summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-21 22:28:58 +0100
committerOwain G. Ainsworth <oga@openbsd.org>2010-06-21 22:40:53 +0100
commitb4f1021db7eb847f080116437c4f11554c6c304b (patch)
treeb6be1abc09da5f9bd9750b55851d597d96e116f6
parentc7c3890d00a9ec2a60873b284afa8ca8b1386556 (diff)
i965: Compile fix.
Oops, I spent more time discussing these flushing bugs than I spent paying attention to what I was actually doing. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit 5bf470bd38b1f6a7a540585186a54c9dbbca98f9) Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
-rw-r--r--src/i830_driver.c2
-rw-r--r--src/i965_render.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 30597170..ec1e3edd 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2167,7 +2167,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
*/
intel_batch_submit(scrn,
intel->need_mi_flush ||
- !list_is_empty(intel->flush_pixmaps));
+ !list_is_empty(&intel->flush_pixmaps));
drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE);
}
diff --git a/src/i965_render.c b/src/i965_render.c
index 072c86d4..75d63807 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1144,7 +1144,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn)
/* Mark the destination dirty within this batch */
intel_batch_mark_pixmap_domains(intel,
- i830_uxa_get_pixmap_intel(dest_picture),
+ i830_get_pixmap_intel(dest),
I915_GEM_DOMAIN_RENDER,
I915_GEM_DOMAIN_RENDER);