aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/ilo/ilo_blitter_blt.c
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2014-09-04 13:56:32 +0800
committerChia-I Wu <[email protected]>2014-09-09 13:31:36 +0800
commit55f80a3290cb0e07db780265369eb504573b4e62 (patch)
tree73f26e1b54ea39df331af02fe9092e42351da75f /src/gallium/drivers/ilo/ilo_blitter_blt.c
parentdab4a676f7590e94640461ad454911e09d95fa88 (diff)
ilo: make ilo_cp based on ilo_builder
This makes ilo_cp use the builder to manage batch buffers, and use ilo_builder_decode() to replace ilo_3d_pipeline_dump().
Diffstat (limited to 'src/gallium/drivers/ilo/ilo_blitter_blt.c')
-rw-r--r--src/gallium/drivers/ilo/ilo_blitter_blt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/drivers/ilo/ilo_blitter_blt.c b/src/gallium/drivers/ilo/ilo_blitter_blt.c
index b9156412aee..703aef236b0 100644
--- a/src/gallium/drivers/ilo/ilo_blitter_blt.c
+++ b/src/gallium/drivers/ilo/ilo_blitter_blt.c
@@ -321,7 +321,7 @@ ilo_blitter_blt_begin(struct ilo_blitter *blitter, int max_cmd_size,
struct intel_bo *src, enum intel_tiling_mode src_tiling)
{
struct ilo_context *ilo = blitter->ilo;
- struct intel_bo *aper_check[3];
+ struct intel_bo *aper_check[2];
int count;
uint32_t swctrl;
@@ -330,16 +330,15 @@ ilo_blitter_blt_begin(struct ilo_blitter *blitter, int max_cmd_size,
ilo_cp_set_owner(ilo->cp, NULL, 0);
/* check aperture space */
- aper_check[0] = ilo->cp->bo;
- aper_check[1] = dst;
- count = 2;
+ aper_check[0] = dst;
+ count = 1;
if (src) {
- aper_check[2] = src;
+ aper_check[1] = src;
count++;
}
- if (!intel_winsys_can_submit_bo(ilo->winsys, aper_check, count))
+ if (!ilo_builder_validate(&ilo->cp->builder, count, aper_check))
ilo_cp_flush(ilo->cp, "out of aperture");
/* set BCS_SWCTRL */