diff options
| author | Chia-I Wu <[email protected]> | 2014-09-04 13:56:32 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2014-09-09 13:31:36 +0800 |
| commit | 55f80a3290cb0e07db780265369eb504573b4e62 (patch) | |
| tree | 73f26e1b54ea39df331af02fe9092e42351da75f /src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c | |
| parent | dab4a676f7590e94640461ad454911e09d95fa88 (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_3d_pipeline_gen6.c')
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c index 227492a41bf..3bff8961ce8 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c @@ -215,11 +215,14 @@ gen6_pipeline_common_base_address(struct ilo_3d_pipeline *p, /* STATE_BASE_ADDRESS */ if (session->state_bo_changed || session->kernel_bo_changed || session->batch_bo_changed) { + const struct ilo_builder_writer *bat = + &p->cp->builder.writers[ILO_BUILDER_WRITER_BATCH]; + if (p->dev->gen == ILO_GEN(6)) gen6_wa_pipe_control_post_sync(p, false); gen6_emit_STATE_BASE_ADDRESS(p->dev, - NULL, p->cp->bo, p->cp->bo, NULL, ilo->hw3d->kernel.bo, + NULL, bat->bo, bat->bo, NULL, ilo->hw3d->kernel.bo, 0, 0, 0, 0, p->cp); /* @@ -1633,8 +1636,8 @@ gen6_rectlist_commands(struct ilo_3d_pipeline *p, gen6_emit_STATE_BASE_ADDRESS(p->dev, NULL, /* General State Base */ - p->cp->bo, /* Surface State Base */ - p->cp->bo, /* Dynamic State Base */ + p->cp->builder.writers[0].bo, /* Surface State Base */ + p->cp->builder.writers[0].bo, /* Dynamic State Base */ NULL, /* Indirect Object Base */ NULL, /* Instruction Base */ 0, 0, 0, 0, p->cp); |