summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-21 22:28:58 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-06-21 22:28:58 +0100
commit5bf470bd38b1f6a7a540585186a54c9dbbca98f9 (patch)
tree964fadda751d210b4abd2d8693508cf3336672cb
parent0203cf91b54ee8a7cea8560e559288ee9b6e8554 (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>
-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 91e5ac97..b8e0c0b4 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -870,7 +870,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 e5b09161..9ba6105a 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -1162,7 +1162,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);