diff options
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_3d.c | 15 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c | 176 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_gpe_gen7.h | 801 |
4 files changed, 479 insertions, 517 deletions
diff --git a/src/gallium/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c index 47b05caf2cf..484823ee820 100644 --- a/src/gallium/drivers/ilo/ilo_3d.c +++ b/src/gallium/drivers/ilo/ilo_3d.c @@ -239,6 +239,11 @@ ilo_3d_begin_query(struct ilo_context *ilo, struct ilo_query *q) if (ilo_query_alloc_bo(q, 2, -1, hw3d->cp->winsys)) { /* XXX we should check the aperture size */ + if (q->reg_cmd_size > ilo_cp_space(hw3d->cp)) { + ilo_cp_flush(hw3d->cp, "out of space"); + assert(q->reg_cmd_size <= ilo_cp_space(hw3d->cp)); + } + ilo_3d_pipeline_emit_write_depth_count(hw3d->pipeline, q->bo, q->reg_read++); @@ -259,6 +264,11 @@ ilo_3d_begin_query(struct ilo_context *ilo, struct ilo_query *q) if (ilo_query_alloc_bo(q, 2, -1, hw3d->cp->winsys)) { /* XXX we should check the aperture size */ + if (q->reg_cmd_size > ilo_cp_space(hw3d->cp)) { + ilo_cp_flush(hw3d->cp, "out of space"); + assert(q->reg_cmd_size <= ilo_cp_space(hw3d->cp)); + } + ilo_3d_pipeline_emit_write_timestamp(hw3d->pipeline, q->bo, q->reg_read++); @@ -285,6 +295,11 @@ ilo_3d_begin_query(struct ilo_context *ilo, struct ilo_query *q) if (ilo_query_alloc_bo(q, 11 * 2, -1, hw3d->cp->winsys)) { /* XXX we should check the aperture size */ + if (q->reg_cmd_size > ilo_cp_space(hw3d->cp)) { + ilo_cp_flush(hw3d->cp, "out of space"); + assert(q->reg_cmd_size <= ilo_cp_space(hw3d->cp)); + } + ilo_3d_pipeline_emit_write_statistics(hw3d->pipeline, q->bo, q->reg_read); q->reg_read += 11; diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c index e236e02be3e..27a44ab3597 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen6.c @@ -408,8 +408,8 @@ gen6_pipeline_vf(struct ilo_3d_pipeline *p, /* 3DSTATE_VF */ if (session->primitive_restart_changed) { - gen7_emit_3DSTATE_VF(p->dev, ilo->draw->primitive_restart, - ilo->draw->restart_index, p->cp); + gen7_3DSTATE_VF(&p->cp->builder, ilo->draw->primitive_restart, + ilo->draw->restart_index); } } else { diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c index a2f9ccbb49e..e1be159c1cb 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_gen7.c @@ -211,12 +211,12 @@ gen7_pipeline_common_urb(struct ilo_3d_pipeline *p, gen7_wa_pipe_control_vs_depth_stall(p); - gen7_emit_3DSTATE_URB_VS(p->dev, - offset, vs_total_size, vs_entry_size, p->cp); + gen7_3DSTATE_URB_VS(&p->cp->builder, + offset, vs_total_size, vs_entry_size); - gen7_emit_3DSTATE_URB_GS(p->dev, offset, 0, 0, p->cp); - gen7_emit_3DSTATE_URB_HS(p->dev, offset, 0, 0, p->cp); - gen7_emit_3DSTATE_URB_DS(p->dev, offset, 0, 0, p->cp); + gen7_3DSTATE_URB_GS(&p->cp->builder, offset, 0, 0); + gen7_3DSTATE_URB_HS(&p->cp->builder, offset, 0, 0); + gen7_3DSTATE_URB_DS(&p->cp->builder, offset, 0, 0); } } @@ -236,10 +236,10 @@ gen7_pipeline_common_pcb_alloc(struct ilo_3d_pipeline *p, const int size = max_size / 2; int offset = 0; - gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_VS(p->dev, offset, size, p->cp); + gen7_3DSTATE_PUSH_CONSTANT_ALLOC_VS(&p->cp->builder, offset, size); offset += size; - gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_PS(p->dev, offset, size, p->cp); + gen7_3DSTATE_PUSH_CONSTANT_ALLOC_PS(&p->cp->builder, offset, size); if (p->dev->gen == ILO_GEN(7)) gen7_wa_pipe_control_cs_stall(p, true, true); @@ -253,11 +253,11 @@ gen7_pipeline_common_pointers_1(struct ilo_3d_pipeline *p, { /* 3DSTATE_VIEWPORT_STATE_POINTERS_{CC,SF_CLIP} */ if (session->viewport_state_changed) { - gen7_emit_3DSTATE_VIEWPORT_STATE_POINTERS_CC(p->dev, - p->state.CC_VIEWPORT, p->cp); + gen7_3DSTATE_VIEWPORT_STATE_POINTERS_CC(&p->cp->builder, + p->state.CC_VIEWPORT); - gen7_emit_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP(p->dev, - p->state.SF_CLIP_VIEWPORT, p->cp); + gen7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP(&p->cp->builder, + p->state.SF_CLIP_VIEWPORT); } } @@ -268,20 +268,20 @@ gen7_pipeline_common_pointers_2(struct ilo_3d_pipeline *p, { /* 3DSTATE_BLEND_STATE_POINTERS */ if (session->cc_state_blend_changed) { - gen7_emit_3DSTATE_BLEND_STATE_POINTERS(p->dev, - p->state.BLEND_STATE, p->cp); + gen7_3DSTATE_BLEND_STATE_POINTERS(&p->cp->builder, + p->state.BLEND_STATE); } /* 3DSTATE_CC_STATE_POINTERS */ if (session->cc_state_cc_changed) { - gen7_emit_3DSTATE_CC_STATE_POINTERS(p->dev, - p->state.COLOR_CALC_STATE, p->cp); + gen7_3DSTATE_CC_STATE_POINTERS(&p->cp->builder, + p->state.COLOR_CALC_STATE); } /* 3DSTATE_DEPTH_STENCIL_STATE_POINTERS */ if (session->cc_state_dsa_changed) { - gen7_emit_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(p->dev, - p->state.DEPTH_STENCIL_STATE, p->cp); + gen7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(&p->cp->builder, + p->state.DEPTH_STENCIL_STATE); } } @@ -304,22 +304,22 @@ gen7_pipeline_vs(struct ilo_3d_pipeline *p, /* 3DSTATE_BINDING_TABLE_POINTERS_VS */ if (emit_3dstate_binding_table) { - gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_VS(p->dev, - p->state.vs.BINDING_TABLE_STATE, p->cp); + gen7_3DSTATE_BINDING_TABLE_POINTERS_VS(&p->cp->builder, + p->state.vs.BINDING_TABLE_STATE); } /* 3DSTATE_SAMPLER_STATE_POINTERS_VS */ if (emit_3dstate_sampler_state) { - gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_VS(p->dev, - p->state.vs.SAMPLER_STATE, p->cp); + gen7_3DSTATE_SAMPLER_STATE_POINTERS_VS(&p->cp->builder, + p->state.vs.SAMPLER_STATE); } /* 3DSTATE_CONSTANT_VS */ if (emit_3dstate_constant_vs) { - gen7_emit_3DSTATE_CONSTANT_VS(p->dev, + gen7_3DSTATE_CONSTANT_VS(&p->cp->builder, &p->state.vs.PUSH_CONSTANT_BUFFER, &p->state.vs.PUSH_CONSTANT_BUFFER_size, - 1, p->cp); + 1); } /* 3DSTATE_VS */ @@ -337,13 +337,13 @@ gen7_pipeline_hs(struct ilo_3d_pipeline *p, { /* 3DSTATE_CONSTANT_HS and 3DSTATE_HS */ if (session->hw_ctx_changed) { - gen7_emit_3DSTATE_CONSTANT_HS(p->dev, 0, 0, 0, p->cp); - gen7_emit_3DSTATE_HS(p->dev, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_HS(&p->cp->builder, 0, 0, 0); + gen7_3DSTATE_HS(&p->cp->builder, NULL, 0); } /* 3DSTATE_BINDING_TABLE_POINTERS_HS */ if (session->hw_ctx_changed) - gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_HS(p->dev, 0, p->cp); + gen7_3DSTATE_BINDING_TABLE_POINTERS_HS(&p->cp->builder, 0); } static void @@ -353,7 +353,7 @@ gen7_pipeline_te(struct ilo_3d_pipeline *p, { /* 3DSTATE_TE */ if (session->hw_ctx_changed) - gen7_emit_3DSTATE_TE(p->dev, p->cp); + gen7_3DSTATE_TE(&p->cp->builder); } static void @@ -363,13 +363,13 @@ gen7_pipeline_ds(struct ilo_3d_pipeline *p, { /* 3DSTATE_CONSTANT_DS and 3DSTATE_DS */ if (session->hw_ctx_changed) { - gen7_emit_3DSTATE_CONSTANT_DS(p->dev, 0, 0, 0, p->cp); - gen7_emit_3DSTATE_DS(p->dev, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_DS(&p->cp->builder, 0, 0, 0); + gen7_3DSTATE_DS(&p->cp->builder, NULL, 0); } /* 3DSTATE_BINDING_TABLE_POINTERS_DS */ if (session->hw_ctx_changed) - gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_DS(p->dev, 0, p->cp); + gen7_3DSTATE_BINDING_TABLE_POINTERS_DS(&p->cp->builder, 0); } @@ -380,14 +380,14 @@ gen7_pipeline_gs(struct ilo_3d_pipeline *p, { /* 3DSTATE_CONSTANT_GS and 3DSTATE_GS */ if (session->hw_ctx_changed) { - gen7_emit_3DSTATE_CONSTANT_GS(p->dev, 0, 0, 0, p->cp); - gen7_emit_3DSTATE_GS(p->dev, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_GS(&p->cp->builder, 0, 0, 0); + gen7_3DSTATE_GS(&p->cp->builder, NULL, 0); } /* 3DSTATE_BINDING_TABLE_POINTERS_GS */ if (session->binding_table_gs_changed) { - gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_GS(p->dev, - p->state.gs.BINDING_TABLE_STATE, p->cp); + gen7_3DSTATE_BINDING_TABLE_POINTERS_GS(&p->cp->builder, + p->state.gs.BINDING_TABLE_STATE); } } @@ -422,17 +422,17 @@ gen7_pipeline_sol(struct ilo_3d_pipeline *p, const int stride = so_info->stride[i] * 4; /* in bytes */ int base = 0; - gen7_emit_3DSTATE_SO_BUFFER(p->dev, i, base, stride, - ilo->so.states[i], p->cp); + gen7_3DSTATE_SO_BUFFER(&p->cp->builder, i, base, stride, + ilo->so.states[i]); } for (; i < 4; i++) - gen7_emit_3DSTATE_SO_BUFFER(p->dev, i, 0, 0, NULL, p->cp); + gen7_3DSTATE_SO_BUFFER(&p->cp->builder, i, 0, 0, NULL); } /* 3DSTATE_SO_DECL_LIST */ if (dirty_sh && ilo->so.enabled) - gen7_emit_3DSTATE_SO_DECL_LIST(p->dev, so_info, p->cp); + gen7_3DSTATE_SO_DECL_LIST(&p->cp->builder, so_info); /* 3DSTATE_STREAMOUT */ if (DIRTY(SO) || DIRTY(RASTERIZER) || dirty_sh) { @@ -440,8 +440,8 @@ gen7_pipeline_sol(struct ilo_3d_pipeline *p, const int output_count = ilo_shader_get_kernel_param(shader, ILO_KERNEL_OUTPUT_COUNT); - gen7_emit_3DSTATE_STREAMOUT(p->dev, buffer_mask, output_count, - ilo->rasterizer->state.rasterizer_discard, p->cp); + gen7_3DSTATE_STREAMOUT(&p->cp->builder, buffer_mask, output_count, + ilo->rasterizer->state.rasterizer_discard); } } @@ -452,15 +452,15 @@ gen7_pipeline_sf(struct ilo_3d_pipeline *p, { /* 3DSTATE_SBE */ if (DIRTY(RASTERIZER) || DIRTY(FS)) - gen7_emit_3DSTATE_SBE(p->dev, ilo->rasterizer, ilo->fs, ilo->cp); + gen7_3DSTATE_SBE(&p->cp->builder, ilo->rasterizer, ilo->fs); /* 3DSTATE_SF */ if (DIRTY(RASTERIZER) || DIRTY(FB)) { struct pipe_surface *zs = ilo->fb.state.zsbuf; gen7_wa_pipe_control_cs_stall(p, true, true); - gen7_emit_3DSTATE_SF(p->dev, ilo->rasterizer, - (zs) ? zs->format : PIPE_FORMAT_NONE, p->cp); + gen7_3DSTATE_SF(&p->cp->builder, ilo->rasterizer, + (zs) ? zs->format : PIPE_FORMAT_NONE); } } @@ -474,28 +474,28 @@ gen7_pipeline_wm(struct ilo_3d_pipeline *p, const bool cc_may_kill = (ilo->dsa->dw_alpha || ilo->blend->alpha_to_coverage); - gen7_emit_3DSTATE_WM(p->dev, ilo->fs, - ilo->rasterizer, cc_may_kill, 0, p->cp); + gen7_3DSTATE_WM(&p->cp->builder, ilo->fs, + ilo->rasterizer, cc_may_kill, 0); } /* 3DSTATE_BINDING_TABLE_POINTERS_PS */ if (session->binding_table_fs_changed) { - gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_PS(p->dev, - p->state.wm.BINDING_TABLE_STATE, p->cp); + gen7_3DSTATE_BINDING_TABLE_POINTERS_PS(&p->cp->builder, + p->state.wm.BINDING_TABLE_STATE); } /* 3DSTATE_SAMPLER_STATE_POINTERS_PS */ if (session->sampler_state_fs_changed) { - gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_PS(p->dev, - p->state.wm.SAMPLER_STATE, p->cp); + gen7_3DSTATE_SAMPLER_STATE_POINTERS_PS(&p->cp->builder, + p->state.wm.SAMPLER_STATE); } /* 3DSTATE_CONSTANT_PS */ if (session->pcb_state_fs_changed) { - gen7_emit_3DSTATE_CONSTANT_PS(p->dev, + gen7_3DSTATE_CONSTANT_PS(&p->cp->builder, &p->state.wm.PUSH_CONSTANT_BUFFER, &p->state.wm.PUSH_CONSTANT_BUFFER_size, - 1, p->cp); + 1); } /* 3DSTATE_PS */ @@ -508,7 +508,7 @@ gen7_pipeline_wm(struct ilo_3d_pipeline *p, session->hw_ctx_changed) gen7_wa_pipe_control_ps_max_threads_stall(p); - gen7_emit_3DSTATE_PS(p->dev, ilo->fs, num_samplers, dual_blend, p->cp); + gen7_3DSTATE_PS(&p->cp->builder, ilo->fs, num_samplers, dual_blend); } /* 3DSTATE_SCISSOR_STATE_POINTERS */ @@ -560,7 +560,7 @@ gen7_pipeline_wm(struct ilo_3d_pipeline *p, gen6_emit_3DSTATE_DEPTH_BUFFER(p->dev, zs, p->cp); gen6_emit_3DSTATE_HIER_DEPTH_BUFFER(p->dev, zs, p->cp); gen6_emit_3DSTATE_STENCIL_BUFFER(p->dev, zs, p->cp); - gen7_emit_3DSTATE_CLEAR_PARAMS(p->dev, clear_params, p->cp); + gen7_3DSTATE_CLEAR_PARAMS(&p->cp->builder, clear_params); } } @@ -584,9 +584,9 @@ gen7_pipeline_wm_multisample(struct ilo_3d_pipeline *p, ilo->fb.num_samples, packed_sample_pos, ilo->rasterizer->state.half_pixel_center, p->cp); - gen7_emit_3DSTATE_SAMPLE_MASK(p->dev, + gen7_3DSTATE_SAMPLE_MASK(&p->cp->builder, (ilo->fb.num_samples > 1) ? ilo->sample_mask : 0x1, - ilo->fb.num_samples, p->cp); + ilo->fb.num_samples); } } @@ -596,7 +596,7 @@ gen7_pipeline_vf_draw(struct ilo_3d_pipeline *p, struct gen6_pipeline_session *session) { /* 3DPRIMITIVE */ - gen7_emit_3DPRIMITIVE(p->dev, ilo->draw, &ilo->ib, false, p->cp); + gen7_3DPRIMITIVE(&p->cp->builder, ilo->draw, &ilo->ib, false); p->state.has_gen6_wa_pipe_control = false; } @@ -663,10 +663,10 @@ gen7_rectlist_pcb_alloc(struct ilo_3d_pipeline *p, const int size = max_size / 2; int offset = 0; - gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_VS(p->dev, offset, size, p->cp); + gen7_3DSTATE_PUSH_CONSTANT_ALLOC_VS(&p->cp->builder, offset, size); offset += size; - gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_PS(p->dev, offset, size, p->cp); + gen7_3DSTATE_PUSH_CONSTANT_ALLOC_PS(&p->cp->builder, offset, size); gen7_wa_pipe_control_cs_stall(p, true, true); } @@ -680,12 +680,12 @@ gen7_rectlist_urb(struct ilo_3d_pipeline *p, const int offset = (p->dev->gen == ILO_GEN(7.5) && p->dev->gt == 3) ? 32768 : 16384; - gen7_emit_3DSTATE_URB_VS(p->dev, offset, p->dev->urb_size - offset, - blitter->ve.count * 4 * sizeof(float), p->cp); + gen7_3DSTATE_URB_VS(&p->cp->builder, offset, p->dev->urb_size - offset, + blitter->ve.count * 4 * sizeof(float)); - gen7_emit_3DSTATE_URB_GS(p->dev, offset, 0, 0, p->cp); - gen7_emit_3DSTATE_URB_HS(p->dev, offset, 0, 0, p->cp); - gen7_emit_3DSTATE_URB_DS(p->dev, offset, 0, 0, p->cp); + gen7_3DSTATE_URB_GS(&p->cp->builder, offset, 0, 0); + gen7_3DSTATE_URB_HS(&p->cp->builder, offset, 0, 0); + gen7_3DSTATE_URB_DS(&p->cp->builder, offset, 0, 0); } static void @@ -693,28 +693,28 @@ gen7_rectlist_vs_to_sf(struct ilo_3d_pipeline *p, const struct ilo_blitter *blitter, struct gen6_rectlist_session *session) { - gen7_emit_3DSTATE_CONSTANT_VS(p->dev, NULL, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_VS(&p->cp->builder, NULL, NULL, 0); gen6_emit_3DSTATE_VS(p->dev, NULL, 0, p->cp); - gen7_emit_3DSTATE_CONSTANT_HS(p->dev, NULL, NULL, 0, p->cp); - gen7_emit_3DSTATE_HS(p->dev, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_HS(&p->cp->builder, NULL, NULL, 0); + gen7_3DSTATE_HS(&p->cp->builder, NULL, 0); - gen7_emit_3DSTATE_TE(p->dev, p->cp); + gen7_3DSTATE_TE(&p->cp->builder); - gen7_emit_3DSTATE_CONSTANT_DS(p->dev, NULL, NULL, 0, p->cp); - gen7_emit_3DSTATE_DS(p->dev, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_DS(&p->cp->builder, NULL, NULL, 0); + gen7_3DSTATE_DS(&p->cp->builder, NULL, 0); - gen7_emit_3DSTATE_CONSTANT_GS(p->dev, NULL, NULL, 0, p->cp); - gen7_emit_3DSTATE_GS(p->dev, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_GS(&p->cp->builder, NULL, NULL, 0); + gen7_3DSTATE_GS(&p->cp->builder, NULL, 0); - gen7_emit_3DSTATE_STREAMOUT(p->dev, 0x0, 0, false, p->cp); + gen7_3DSTATE_STREAMOUT(&p->cp->builder, 0x0, 0, false); gen6_emit_3DSTATE_CLIP(p->dev, NULL, NULL, false, 0, p->cp); gen7_wa_pipe_control_cs_stall(p, true, true); - gen7_emit_3DSTATE_SF(p->dev, NULL, blitter->fb.dst.base.format, p->cp); - gen7_emit_3DSTATE_SBE(p->dev, NULL, NULL, p->cp); + gen7_3DSTATE_SF(&p->cp->builder, NULL, blitter->fb.dst.base.format); + gen7_3DSTATE_SBE(&p->cp->builder, NULL, NULL); } static void @@ -739,12 +739,12 @@ gen7_rectlist_wm(struct ilo_3d_pipeline *p, break; } - gen7_emit_3DSTATE_WM(p->dev, NULL, NULL, false, hiz_op, p->cp); + gen7_3DSTATE_WM(&p->cp->builder, NULL, NULL, false, hiz_op); - gen7_emit_3DSTATE_CONSTANT_PS(p->dev, NULL, NULL, 0, p->cp); + gen7_3DSTATE_CONSTANT_PS(&p->cp->builder, NULL, NULL, 0); gen7_wa_pipe_control_ps_max_threads_stall(p); - gen7_emit_3DSTATE_PS(p->dev, NULL, 0, false, p->cp); + gen7_3DSTATE_PS(&p->cp->builder, NULL, 0, false); } static void @@ -770,8 +770,8 @@ gen7_rectlist_wm_depth(struct ilo_3d_pipeline *p, &blitter->fb.dst.u.zs, p->cp); } - gen7_emit_3DSTATE_CLEAR_PARAMS(p->dev, - blitter->depth_clear_value, p->cp); + gen7_3DSTATE_CLEAR_PARAMS(&p->cp->builder, + blitter->depth_clear_value); } static void @@ -789,8 +789,8 @@ gen7_rectlist_wm_multisample(struct ilo_3d_pipeline *p, gen6_emit_3DSTATE_MULTISAMPLE(p->dev, blitter->fb.num_samples, packed_sample_pos, true, p->cp); - gen7_emit_3DSTATE_SAMPLE_MASK(p->dev, - (1 << blitter->fb.num_samples) - 1, blitter->fb.num_samples, p->cp); + gen7_3DSTATE_SAMPLE_MASK(&p->cp->builder, + (1 << blitter->fb.num_samples) - 1, blitter->fb.num_samples); } static void @@ -816,21 +816,21 @@ gen7_rectlist_commands(struct ilo_3d_pipeline *p, gen7_rectlist_urb(p, blitter, session); if (blitter->uses & ILO_BLITTER_USE_DSA) { - gen7_emit_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(p->dev, - session->DEPTH_STENCIL_STATE, p->cp); + gen7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(&p->cp->builder, + session->DEPTH_STENCIL_STATE); } if (blitter->uses & ILO_BLITTER_USE_CC) { - gen7_emit_3DSTATE_CC_STATE_POINTERS(p->dev, - session->COLOR_CALC_STATE, p->cp); + gen7_3DSTATE_CC_STATE_POINTERS(&p->cp->builder, + session->COLOR_CALC_STATE); } gen7_rectlist_vs_to_sf(p, blitter, session); gen7_rectlist_wm(p, blitter, session); if (blitter->uses & ILO_BLITTER_USE_VIEWPORT) { - gen7_emit_3DSTATE_VIEWPORT_STATE_POINTERS_CC(p->dev, - session->CC_VIEWPORT, p->cp); + gen7_3DSTATE_VIEWPORT_STATE_POINTERS_CC(&p->cp->builder, + session->CC_VIEWPORT); } gen7_rectlist_wm_depth(p, blitter, session); @@ -838,7 +838,7 @@ gen7_rectlist_commands(struct ilo_3d_pipeline *p, gen6_emit_3DSTATE_DRAWING_RECTANGLE(p->dev, 0, 0, blitter->fb.width, blitter->fb.height, p->cp); - gen7_emit_3DPRIMITIVE(p->dev, &blitter->draw, NULL, true, p->cp); + gen7_3DPRIMITIVE(&p->cp->builder, &blitter->draw, NULL, true); } static void diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen7.h b/src/gallium/drivers/ilo/ilo_gpe_gen7.h index 9d73caa5b9a..0970f6d4ba0 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen7.h +++ b/src/gallium/drivers/ilo/ilo_gpe_gen7.h @@ -37,100 +37,93 @@ #include "ilo_gpe_gen6.h" static inline void -gen7_emit_GPGPU_WALKER(const struct ilo_dev_info *dev, - struct ilo_cp *cp) +gen7_GPGPU_WALKER(struct ilo_builder *builder) { assert(!"GPGPU_WALKER unsupported"); } static inline void -gen7_emit_3DSTATE_CLEAR_PARAMS(const struct ilo_dev_info *dev, - uint32_t clear_val, - struct ilo_cp *cp) +gen7_3DSTATE_CLEAR_PARAMS(struct ilo_builder *builder, + uint32_t clear_val) { const uint8_t cmd_len = 3; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_CLEAR_PARAMS) | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, clear_val); - ilo_cp_write(cp, 1); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = clear_val; + dw[2] = 1; } static inline void -gen7_emit_3DSTATE_VF(const struct ilo_dev_info *dev, - bool enable_cut_index, - uint32_t cut_index, - struct ilo_cp *cp) +gen7_3DSTATE_VF(struct ilo_builder *builder, + bool enable_cut_index, + uint32_t cut_index) { const uint8_t cmd_len = 2; uint32_t dw0 = GEN75_RENDER_CMD(3D, 3DSTATE_VF) | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7.5, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7.5, 7.5); if (enable_cut_index) dw0 |= GEN75_VF_DW0_CUT_INDEX_ENABLE; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, cut_index); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = cut_index; } static inline void -gen7_emit_3dstate_pointer(const struct ilo_dev_info *dev, - int subop, uint32_t pointer, - struct ilo_cp *cp) +gen7_3dstate_pointer(struct ilo_builder *builder, + int subop, uint32_t pointer) { const uint8_t cmd_len = 2; const uint32_t dw0 = GEN6_RENDER_TYPE_RENDER | GEN6_RENDER_SUBTYPE_3D | subop | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, pointer); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = pointer; } static inline void -gen7_emit_3DSTATE_CC_STATE_POINTERS(const struct ilo_dev_info *dev, - uint32_t color_calc_state, - struct ilo_cp *cp) +gen7_3DSTATE_CC_STATE_POINTERS(struct ilo_builder *builder, + uint32_t color_calc_state) { - gen7_emit_3dstate_pointer(dev, - GEN6_RENDER_OPCODE_3DSTATE_CC_STATE_POINTERS, color_calc_state, cp); + gen7_3dstate_pointer(builder, + GEN6_RENDER_OPCODE_3DSTATE_CC_STATE_POINTERS, color_calc_state); } static inline void -gen7_emit_3DSTATE_GS(const struct ilo_dev_info *dev, - const struct ilo_shader_state *gs, - int num_samplers, - struct ilo_cp *cp) +gen7_3DSTATE_GS(struct ilo_builder *builder, + const struct ilo_shader_state *gs, + int num_samplers) { const uint8_t cmd_len = 7; const uint32_t dw0 = GEN6_RENDER_CMD(3D, 3DSTATE_GS) | (cmd_len - 2); const struct ilo_shader_cso *cso; - uint32_t dw2, dw4, dw5; + uint32_t dw2, dw4, dw5, *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); if (!gs) { - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, GEN7_GS_DW5_STATISTICS); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = 0; + dw[2] = 0; + dw[3] = 0; + dw[4] = 0; + dw[5] = GEN7_GS_DW5_STATISTICS; + dw[6] = 0; return; } @@ -141,53 +134,49 @@ gen7_emit_3DSTATE_GS(const struct ilo_dev_info *dev, dw2 |= ((num_samplers + 3) / 4) << GEN6_THREADDISP_SAMPLER_COUNT__SHIFT; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, ilo_shader_get_kernel_offset(gs)); - ilo_cp_write(cp, dw2); - ilo_cp_write(cp, 0); /* scratch */ - ilo_cp_write(cp, dw4); - ilo_cp_write(cp, dw5); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = ilo_shader_get_kernel_offset(gs); + dw[2] = dw2; + dw[3] = 0; /* scratch */ + dw[4] = dw4; + dw[5] = dw5; + dw[6] = 0; } static inline void -gen7_emit_3DSTATE_SF(const struct ilo_dev_info *dev, - const struct ilo_rasterizer_state *rasterizer, - enum pipe_format zs_format, - struct ilo_cp *cp) +gen7_3DSTATE_SF(struct ilo_builder *builder, + const struct ilo_rasterizer_state *rasterizer, + enum pipe_format zs_format) { const uint8_t cmd_len = 7; const uint32_t dw0 = GEN6_RENDER_CMD(3D, 3DSTATE_SF) | (cmd_len - 2); const int num_samples = 1; - uint32_t payload[6]; + uint32_t payload[6], *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); - ilo_gpe_gen6_fill_3dstate_sf_raster(dev, + ilo_gpe_gen6_fill_3dstate_sf_raster(builder->dev, rasterizer, num_samples, zs_format, payload, Elements(payload)); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write_multi(cp, payload, 6); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + memcpy(&dw[1], payload, sizeof(payload)); } static inline void -gen7_emit_3DSTATE_WM(const struct ilo_dev_info *dev, - const struct ilo_shader_state *fs, - const struct ilo_rasterizer_state *rasterizer, - bool cc_may_kill, uint32_t hiz_op, - struct ilo_cp *cp) +gen7_3DSTATE_WM(struct ilo_builder *builder, + const struct ilo_shader_state *fs, + const struct ilo_rasterizer_state *rasterizer, + bool cc_may_kill, uint32_t hiz_op) { const uint8_t cmd_len = 3; const uint32_t dw0 = GEN6_RENDER_CMD(3D, 3DSTATE_WM) | (cmd_len - 2); const int num_samples = 1; - uint32_t dw1, dw2; + uint32_t dw1, dw2, *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); /* see ilo_gpe_init_rasterizer_wm() */ if (rasterizer) { @@ -216,28 +205,26 @@ gen7_emit_3DSTATE_WM(const struct ilo_dev_info *dev, dw2 |= rasterizer->wm.dw_msaa_disp; } - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, dw1); - ilo_cp_write(cp, dw2); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = dw1; + dw[2] = dw2; } static inline void -gen7_emit_3dstate_constant(const struct ilo_dev_info *dev, - int subop, - const uint32_t *bufs, const int *sizes, - int num_bufs, - struct ilo_cp *cp) +gen7_3dstate_constant(struct ilo_builder *builder, + int subop, + const uint32_t *bufs, const int *sizes, + int num_bufs) { const uint8_t cmd_len = 7; const uint32_t dw0 = GEN6_RENDER_TYPE_RENDER | GEN6_RENDER_SUBTYPE_3D | subop | (cmd_len - 2); - uint32_t dw[6]; + uint32_t payload[6], *dw; int total_read_length, i; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); /* VS, HS, DS, GS, and PS variants */ assert(subop >= GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_VS && @@ -246,8 +233,8 @@ gen7_emit_3dstate_constant(const struct ilo_dev_info *dev, assert(num_bufs <= 4); - dw[0] = 0; - dw[1] = 0; + payload[0] = 0; + payload[1] = 0; total_read_length = 0; for (i = 0; i < 4; i++) { @@ -265,7 +252,7 @@ gen7_emit_3dstate_constant(const struct ilo_dev_info *dev, if (i >= num_bufs || !sizes[i]) { for (; i < 4; i++) { assert(i >= num_bufs || !sizes[i]); - dw[2 + i] = 0; + payload[2 + i] = 0; } break; } @@ -275,8 +262,8 @@ gen7_emit_3dstate_constant(const struct ilo_dev_info *dev, /* the lower 5 bits are used for memory object control state */ assert(bufs[i] % 32 == 0); - dw[i / 2] |= read_len << ((i % 2) ? 16 : 0); - dw[2 + i] = bufs[i]; + payload[i / 2] |= read_len << ((i % 2) ? 16 : 0); + payload[2 + i] = bufs[i]; total_read_length += read_len; } @@ -289,54 +276,50 @@ gen7_emit_3dstate_constant(const struct ilo_dev_info *dev, */ assert(total_read_length <= 64); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write_multi(cp, dw, 6); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + memcpy(&dw[1], payload, sizeof(payload)); } static inline void -gen7_emit_3DSTATE_CONSTANT_VS(const struct ilo_dev_info *dev, - const uint32_t *bufs, const int *sizes, - int num_bufs, - struct ilo_cp *cp) +gen7_3DSTATE_CONSTANT_VS(struct ilo_builder *builder, + const uint32_t *bufs, const int *sizes, + int num_bufs) { - gen7_emit_3dstate_constant(dev, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_VS, - bufs, sizes, num_bufs, cp); + gen7_3dstate_constant(builder, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_VS, + bufs, sizes, num_bufs); } static inline void -gen7_emit_3DSTATE_CONSTANT_GS(const struct ilo_dev_info *dev, - const uint32_t *bufs, const int *sizes, - int num_bufs, - struct ilo_cp *cp) +gen7_3DSTATE_CONSTANT_GS(struct ilo_builder *builder, + const uint32_t *bufs, const int *sizes, + int num_bufs) { - gen7_emit_3dstate_constant(dev, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_GS, - bufs, sizes, num_bufs, cp); + gen7_3dstate_constant(builder, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_GS, + bufs, sizes, num_bufs); } static inline void -gen7_emit_3DSTATE_CONSTANT_PS(const struct ilo_dev_info *dev, - const uint32_t *bufs, const int *sizes, - int num_bufs, - struct ilo_cp *cp) +gen7_3DSTATE_CONSTANT_PS(struct ilo_builder *builder, + const uint32_t *bufs, const int *sizes, + int num_bufs) { - gen7_emit_3dstate_constant(dev, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_PS, - bufs, sizes, num_bufs, cp); + gen7_3dstate_constant(builder, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_PS, + bufs, sizes, num_bufs); } static inline void -gen7_emit_3DSTATE_SAMPLE_MASK(const struct ilo_dev_info *dev, - unsigned sample_mask, - int num_samples, - struct ilo_cp *cp) +gen7_3DSTATE_SAMPLE_MASK(struct ilo_builder *builder, + unsigned sample_mask, + int num_samples) { const uint8_t cmd_len = 2; const unsigned valid_mask = ((1 << num_samples) - 1) | 0x1; const uint32_t dw0 = GEN6_RENDER_CMD(3D, 3DSTATE_SAMPLE_MASK) | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); /* * From the Ivy Bridge PRM, volume 2 part 1, page 294: @@ -349,112 +332,104 @@ gen7_emit_3DSTATE_SAMPLE_MASK(const struct ilo_dev_info *dev, */ sample_mask &= valid_mask; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, sample_mask); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = sample_mask; } static inline void -gen7_emit_3DSTATE_CONSTANT_HS(const struct ilo_dev_info *dev, - const uint32_t *bufs, const int *sizes, - int num_bufs, - struct ilo_cp *cp) +gen7_3DSTATE_CONSTANT_HS(struct ilo_builder *builder, + const uint32_t *bufs, const int *sizes, + int num_bufs) { - gen7_emit_3dstate_constant(dev, GEN7_RENDER_OPCODE_3DSTATE_CONSTANT_HS, - bufs, sizes, num_bufs, cp); + gen7_3dstate_constant(builder, GEN7_RENDER_OPCODE_3DSTATE_CONSTANT_HS, + bufs, sizes, num_bufs); } static inline void -gen7_emit_3DSTATE_CONSTANT_DS(const struct ilo_dev_info *dev, - const uint32_t *bufs, const int *sizes, - int num_bufs, - struct ilo_cp *cp) +gen7_3DSTATE_CONSTANT_DS(struct ilo_builder *builder, + const uint32_t *bufs, const int *sizes, + int num_bufs) { - gen7_emit_3dstate_constant(dev, GEN7_RENDER_OPCODE_3DSTATE_CONSTANT_DS, - bufs, sizes, num_bufs, cp); + gen7_3dstate_constant(builder, GEN7_RENDER_OPCODE_3DSTATE_CONSTANT_DS, + bufs, sizes, num_bufs); } static inline void -gen7_emit_3DSTATE_HS(const struct ilo_dev_info *dev, - const struct ilo_shader_state *hs, - int num_samplers, - struct ilo_cp *cp) +gen7_3DSTATE_HS(struct ilo_builder *builder, + const struct ilo_shader_state *hs, + int num_samplers) { const uint8_t cmd_len = 7; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_HS) | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); assert(!hs); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = 0; + dw[2] = 0; + dw[3] = 0; + dw[4] = 0; + dw[5] = 0; + dw[6] = 0; } static inline void -gen7_emit_3DSTATE_TE(const struct ilo_dev_info *dev, - struct ilo_cp *cp) +gen7_3DSTATE_TE(struct ilo_builder *builder) { const uint8_t cmd_len = 4; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_TE) | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = 0; + dw[2] = 0; + dw[3] = 0; } static inline void -gen7_emit_3DSTATE_DS(const struct ilo_dev_info *dev, - const struct ilo_shader_state *ds, - int num_samplers, - struct ilo_cp *cp) +gen7_3DSTATE_DS(struct ilo_builder *builder, + const struct ilo_shader_state *ds, + int num_samplers) { const uint8_t cmd_len = 6; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_DS) | (cmd_len - 2); + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); assert(!ds); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); - + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = 0; + dw[2] = 0; + dw[3] = 0; + dw[4] = 0; + dw[5] = 0; } static inline void -gen7_emit_3DSTATE_STREAMOUT(const struct ilo_dev_info *dev, - unsigned buffer_mask, - int vertex_attrib_count, - bool rasterizer_discard, - struct ilo_cp *cp) +gen7_3DSTATE_STREAMOUT(struct ilo_builder *builder, + unsigned buffer_mask, + int vertex_attrib_count, + bool rasterizer_discard) { const uint8_t cmd_len = 3; const bool enable = (buffer_mask != 0); const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_STREAMOUT) | (cmd_len - 2); - uint32_t dw1, dw2; + uint32_t dw1, dw2, *dw; int read_len; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); if (!enable) { dw1 = 0 << GEN7_SO_DW1_RENDER_STREAM_SELECT__SHIFT; @@ -463,11 +438,10 @@ gen7_emit_3DSTATE_STREAMOUT(const struct ilo_dev_info *dev, dw2 = 0; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, dw1); - ilo_cp_write(cp, dw2); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = dw1; + dw[2] = dw2; return; } @@ -496,45 +470,42 @@ gen7_emit_3DSTATE_STREAMOUT(const struct ilo_dev_info *dev, 0 << GEN7_SO_DW2_STREAM0_READ_OFFSET__SHIFT | (read_len - 1) << GEN7_SO_DW2_STREAM0_READ_LEN__SHIFT; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, dw1); - ilo_cp_write(cp, dw2); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = dw1; + dw[2] = dw2; } static inline void -gen7_emit_3DSTATE_SBE(const struct ilo_dev_info *dev, - const struct ilo_rasterizer_state *rasterizer, - const struct ilo_shader_state *fs, - struct ilo_cp *cp) +gen7_3DSTATE_SBE(struct ilo_builder *builder, + const struct ilo_rasterizer_state *rasterizer, + const struct ilo_shader_state *fs) { const uint8_t cmd_len = 14; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_SBE) | (cmd_len - 2); - uint32_t dw[13]; + uint32_t payload[13], *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); - ilo_gpe_gen6_fill_3dstate_sf_sbe(dev, rasterizer, fs, dw, Elements(dw)); + ilo_gpe_gen6_fill_3dstate_sf_sbe(builder->dev, + rasterizer, fs, payload, Elements(payload)); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write_multi(cp, dw, 13); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + memcpy(&dw[1], payload, sizeof(payload)); } static inline void -gen7_emit_3DSTATE_PS(const struct ilo_dev_info *dev, - const struct ilo_shader_state *fs, - int num_samplers, bool dual_blend, - struct ilo_cp *cp) +gen7_3DSTATE_PS(struct ilo_builder *builder, + const struct ilo_shader_state *fs, + int num_samplers, bool dual_blend) { const uint8_t cmd_len = 8; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_PS) | (cmd_len - 2); const struct ilo_shader_cso *cso; - uint32_t dw2, dw4, dw5; + uint32_t dw2, dw4, dw5, *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); if (!fs) { int max_threads; @@ -543,28 +514,28 @@ gen7_emit_3DSTATE_PS(const struct ilo_dev_info *dev, dw4 = GEN7_PS_DW4_8_PIXEL_DISPATCH; /* see brwCreateContext() */ - switch (dev->gen) { + switch (builder->dev->gen) { case ILO_GEN(7.5): - max_threads = (dev->gt == 3) ? 408 : (dev->gt == 2) ? 204 : 102; + max_threads = (builder->dev->gt == 3) ? 408 : + (builder->dev->gt == 2) ? 204 : 102; dw4 |= (max_threads - 1) << GEN75_PS_DW4_MAX_THREADS__SHIFT; break; case ILO_GEN(7): default: - max_threads = (dev->gt == 2) ? 172 : 48; + max_threads = (builder->dev->gt == 2) ? 172 : 48; dw4 |= (max_threads - 1) << GEN7_PS_DW4_MAX_THREADS__SHIFT; break; } - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, dw4); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = 0; + dw[2] = 0; + dw[3] = 0; + dw[4] = dw4; + dw[5] = 0; + dw[6] = 0; + dw[7] = 0; return; } @@ -579,163 +550,147 @@ gen7_emit_3DSTATE_PS(const struct ilo_dev_info *dev, if (dual_blend) dw4 |= GEN7_PS_DW4_DUAL_SOURCE_BLEND; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, ilo_shader_get_kernel_offset(fs)); - ilo_cp_write(cp, dw2); - ilo_cp_write(cp, 0); /* scratch */ - ilo_cp_write(cp, dw4); - ilo_cp_write(cp, dw5); - ilo_cp_write(cp, 0); /* kernel 1 */ - ilo_cp_write(cp, 0); /* kernel 2 */ - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = ilo_shader_get_kernel_offset(fs); + dw[2] = dw2; + dw[3] = 0; /* scratch */ + dw[4] = dw4; + dw[5] = dw5; + dw[6] = 0; /* kernel 1 */ + dw[7] = 0; /* kernel 2 */ } static inline void -gen7_emit_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP(const struct ilo_dev_info *dev, - uint32_t sf_clip_viewport, - struct ilo_cp *cp) +gen7_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP(struct ilo_builder *builder, + uint32_t sf_clip_viewport) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_VIEWPORT_STATE_POINTERS_SF_CLIP, - sf_clip_viewport, cp); + sf_clip_viewport); } static inline void -gen7_emit_3DSTATE_VIEWPORT_STATE_POINTERS_CC(const struct ilo_dev_info *dev, - uint32_t cc_viewport, - struct ilo_cp *cp) +gen7_3DSTATE_VIEWPORT_STATE_POINTERS_CC(struct ilo_builder *builder, + uint32_t cc_viewport) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_VIEWPORT_STATE_POINTERS_CC, - cc_viewport, cp); + cc_viewport); } static inline void -gen7_emit_3DSTATE_BLEND_STATE_POINTERS(const struct ilo_dev_info *dev, - uint32_t blend_state, - struct ilo_cp *cp) +gen7_3DSTATE_BLEND_STATE_POINTERS(struct ilo_builder *builder, + uint32_t blend_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_BLEND_STATE_POINTERS, - blend_state, cp); + blend_state); } static inline void -gen7_emit_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(const struct ilo_dev_info *dev, - uint32_t depth_stencil_state, - struct ilo_cp *cp) +gen7_3DSTATE_DEPTH_STENCIL_STATE_POINTERS(struct ilo_builder *builder, + uint32_t depth_stencil_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_DEPTH_STENCIL_STATE_POINTERS, - depth_stencil_state, cp); + depth_stencil_state); } static inline void -gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_VS(const struct ilo_dev_info *dev, - uint32_t binding_table, - struct ilo_cp *cp) +gen7_3DSTATE_BINDING_TABLE_POINTERS_VS(struct ilo_builder *builder, + uint32_t binding_table) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_BINDING_TABLE_POINTERS_VS, - binding_table, cp); + binding_table); } static inline void -gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_HS(const struct ilo_dev_info *dev, - uint32_t binding_table, - struct ilo_cp *cp) +gen7_3DSTATE_BINDING_TABLE_POINTERS_HS(struct ilo_builder *builder, + uint32_t binding_table) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_BINDING_TABLE_POINTERS_HS, - binding_table, cp); + binding_table); } static inline void -gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_DS(const struct ilo_dev_info *dev, - uint32_t binding_table, - struct ilo_cp *cp) +gen7_3DSTATE_BINDING_TABLE_POINTERS_DS(struct ilo_builder *builder, + uint32_t binding_table) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_BINDING_TABLE_POINTERS_DS, - binding_table, cp); + binding_table); } static inline void -gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_GS(const struct ilo_dev_info *dev, - uint32_t binding_table, - struct ilo_cp *cp) +gen7_3DSTATE_BINDING_TABLE_POINTERS_GS(struct ilo_builder *builder, + uint32_t binding_table) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_BINDING_TABLE_POINTERS_GS, - binding_table, cp); + binding_table); } static inline void -gen7_emit_3DSTATE_BINDING_TABLE_POINTERS_PS(const struct ilo_dev_info *dev, - uint32_t binding_table, - struct ilo_cp *cp) +gen7_3DSTATE_BINDING_TABLE_POINTERS_PS(struct ilo_builder *builder, + uint32_t binding_table) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_BINDING_TABLE_POINTERS_PS, - binding_table, cp); + binding_table); } static inline void -gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_VS(const struct ilo_dev_info *dev, - uint32_t sampler_state, - struct ilo_cp *cp) +gen7_3DSTATE_SAMPLER_STATE_POINTERS_VS(struct ilo_builder *builder, + uint32_t sampler_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_SAMPLER_STATE_POINTERS_VS, - sampler_state, cp); + sampler_state); } static inline void -gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_HS(const struct ilo_dev_info *dev, - uint32_t sampler_state, - struct ilo_cp *cp) +gen7_3DSTATE_SAMPLER_STATE_POINTERS_HS(struct ilo_builder *builder, + uint32_t sampler_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_SAMPLER_STATE_POINTERS_HS, - sampler_state, cp); + sampler_state); } static inline void -gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_DS(const struct ilo_dev_info *dev, - uint32_t sampler_state, - struct ilo_cp *cp) +gen7_3DSTATE_SAMPLER_STATE_POINTERS_DS(struct ilo_builder *builder, + uint32_t sampler_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_SAMPLER_STATE_POINTERS_DS, - sampler_state, cp); + sampler_state); } static inline void -gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_GS(const struct ilo_dev_info *dev, - uint32_t sampler_state, - struct ilo_cp *cp) +gen7_3DSTATE_SAMPLER_STATE_POINTERS_GS(struct ilo_builder *builder, + uint32_t sampler_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_SAMPLER_STATE_POINTERS_GS, - sampler_state, cp); + sampler_state); } static inline void -gen7_emit_3DSTATE_SAMPLER_STATE_POINTERS_PS(const struct ilo_dev_info *dev, - uint32_t sampler_state, - struct ilo_cp *cp) +gen7_3DSTATE_SAMPLER_STATE_POINTERS_PS(struct ilo_builder *builder, + uint32_t sampler_state) { - gen7_emit_3dstate_pointer(dev, + gen7_3dstate_pointer(builder, GEN7_RENDER_OPCODE_3DSTATE_SAMPLER_STATE_POINTERS_PS, - sampler_state, cp); + sampler_state); } static inline void -gen7_emit_3dstate_urb(const struct ilo_dev_info *dev, - int subop, int offset, int size, - int entry_size, - struct ilo_cp *cp) +gen7_3dstate_urb(struct ilo_builder *builder, + int subop, int offset, int size, + int entry_size) { const uint8_t cmd_len = 2; const uint32_t dw0 = GEN6_RENDER_TYPE_RENDER | @@ -743,8 +698,9 @@ gen7_emit_3dstate_urb(const struct ilo_dev_info *dev, subop | (cmd_len - 2); const int row_size = 64; /* 512 bits */ int alloc_size, num_entries, min_entries, max_entries; + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); /* VS, HS, DS, and GS variants */ assert(subop >= GEN7_RENDER_OPCODE_3DSTATE_URB_VS && @@ -774,14 +730,14 @@ gen7_emit_3dstate_urb(const struct ilo_dev_info *dev, switch (subop) { case GEN7_RENDER_OPCODE_3DSTATE_URB_VS: - switch (dev->gen) { + switch (builder->dev->gen) { case ILO_GEN(7.5): - max_entries = (dev->gt >= 2) ? 1664 : 640; - min_entries = (dev->gt >= 2) ? 64 : 32; + max_entries = (builder->dev->gt >= 2) ? 1664 : 640; + min_entries = (builder->dev->gt >= 2) ? 64 : 32; break; case ILO_GEN(7): default: - max_entries = (dev->gt == 2) ? 704 : 512; + max_entries = (builder->dev->gt == 2) ? 704 : 512; min_entries = 32; break; } @@ -791,7 +747,7 @@ gen7_emit_3dstate_urb(const struct ilo_dev_info *dev, num_entries = max_entries; break; case GEN7_RENDER_OPCODE_3DSTATE_URB_HS: - max_entries = (dev->gt == 2) ? 64 : 32; + max_entries = (builder->dev->gt == 2) ? 64 : 32; if (num_entries > max_entries) num_entries = max_entries; break; @@ -800,13 +756,13 @@ gen7_emit_3dstate_urb(const struct ilo_dev_info *dev, assert(num_entries >= 138); break; case GEN7_RENDER_OPCODE_3DSTATE_URB_GS: - switch (dev->gen) { + switch (builder->dev->gen) { case ILO_GEN(7.5): - max_entries = (dev->gt >= 2) ? 640 : 256; + max_entries = (builder->dev->gt >= 2) ? 640 : 256; break; case ILO_GEN(7): default: - max_entries = (dev->gt == 2) ? 320 : 192; + max_entries = (builder->dev->gt == 2) ? 320 : 192; break; } @@ -817,62 +773,57 @@ gen7_emit_3dstate_urb(const struct ilo_dev_info *dev, break; } - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, offset << GEN7_URB_ANY_DW1_OFFSET__SHIFT | - (alloc_size - 1) << GEN7_URB_ANY_DW1_ENTRY_SIZE__SHIFT | - num_entries); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = offset << GEN7_URB_ANY_DW1_OFFSET__SHIFT | + (alloc_size - 1) << GEN7_URB_ANY_DW1_ENTRY_SIZE__SHIFT | + num_entries; } static inline void -gen7_emit_3DSTATE_URB_VS(const struct ilo_dev_info *dev, - int offset, int size, int entry_size, - struct ilo_cp *cp) +gen7_3DSTATE_URB_VS(struct ilo_builder *builder, + int offset, int size, int entry_size) { - gen7_emit_3dstate_urb(dev, GEN7_RENDER_OPCODE_3DSTATE_URB_VS, - offset, size, entry_size, cp); + gen7_3dstate_urb(builder, GEN7_RENDER_OPCODE_3DSTATE_URB_VS, + offset, size, entry_size); } static inline void -gen7_emit_3DSTATE_URB_HS(const struct ilo_dev_info *dev, - int offset, int size, int entry_size, - struct ilo_cp *cp) +gen7_3DSTATE_URB_HS(struct ilo_builder *builder, + int offset, int size, int entry_size) { - gen7_emit_3dstate_urb(dev, GEN7_RENDER_OPCODE_3DSTATE_URB_HS, - offset, size, entry_size, cp); + gen7_3dstate_urb(builder, GEN7_RENDER_OPCODE_3DSTATE_URB_HS, + offset, size, entry_size); } static inline void -gen7_emit_3DSTATE_URB_DS(const struct ilo_dev_info *dev, - int offset, int size, int entry_size, - struct ilo_cp *cp) +gen7_3DSTATE_URB_DS(struct ilo_builder *builder, + int offset, int size, int entry_size) { - gen7_emit_3dstate_urb(dev, GEN7_RENDER_OPCODE_3DSTATE_URB_DS, - offset, size, entry_size, cp); + gen7_3dstate_urb(builder, GEN7_RENDER_OPCODE_3DSTATE_URB_DS, + offset, size, entry_size); } static inline void -gen7_emit_3DSTATE_URB_GS(const struct ilo_dev_info *dev, - int offset, int size, int entry_size, - struct ilo_cp *cp) +gen7_3DSTATE_URB_GS(struct ilo_builder *builder, + int offset, int size, int entry_size) { - gen7_emit_3dstate_urb(dev, GEN7_RENDER_OPCODE_3DSTATE_URB_GS, - offset, size, entry_size, cp); + gen7_3dstate_urb(builder, GEN7_RENDER_OPCODE_3DSTATE_URB_GS, + offset, size, entry_size); } static inline void -gen7_emit_3dstate_push_constant_alloc(const struct ilo_dev_info *dev, - int subop, int offset, int size, - struct ilo_cp *cp) +gen7_3dstate_push_constant_alloc(struct ilo_builder *builder, + int subop, int offset, int size) { const uint8_t cmd_len = 2; const uint32_t dw0 = GEN6_RENDER_TYPE_RENDER | GEN6_RENDER_SUBTYPE_3D | subop | (cmd_len - 2); + uint32_t *dw; int end; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); /* VS, HS, DS, GS, and PS variants */ assert(subop >= GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_VS && @@ -916,69 +867,62 @@ gen7_emit_3dstate_push_constant_alloc(const struct ilo_dev_info *dev, size = 15; } - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, offset << GEN7_PCB_ALLOC_ANY_DW1_OFFSET__SHIFT | - size); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = offset << GEN7_PCB_ALLOC_ANY_DW1_OFFSET__SHIFT | + size; } static inline void -gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_VS(const struct ilo_dev_info *dev, - int offset, int size, - struct ilo_cp *cp) +gen7_3DSTATE_PUSH_CONSTANT_ALLOC_VS(struct ilo_builder *builder, + int offset, int size) { - gen7_emit_3dstate_push_constant_alloc(dev, - GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_VS, offset, size, cp); + gen7_3dstate_push_constant_alloc(builder, + GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_VS, offset, size); } static inline void -gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_HS(const struct ilo_dev_info *dev, - int offset, int size, - struct ilo_cp *cp) +gen7_3DSTATE_PUSH_CONSTANT_ALLOC_HS(struct ilo_builder *builder, + int offset, int size) { - gen7_emit_3dstate_push_constant_alloc(dev, - GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_HS, offset, size, cp); + gen7_3dstate_push_constant_alloc(builder, + GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_HS, offset, size); } static inline void -gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_DS(const struct ilo_dev_info *dev, - int offset, int size, - struct ilo_cp *cp) +gen7_3DSTATE_PUSH_CONSTANT_ALLOC_DS(struct ilo_builder *builder, + int offset, int size) { - gen7_emit_3dstate_push_constant_alloc(dev, - GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_DS, offset, size, cp); + gen7_3dstate_push_constant_alloc(builder, + GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_DS, offset, size); } static inline void -gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_GS(const struct ilo_dev_info *dev, - int offset, int size, - struct ilo_cp *cp) +gen7_3DSTATE_PUSH_CONSTANT_ALLOC_GS(struct ilo_builder *builder, + int offset, int size) { - gen7_emit_3dstate_push_constant_alloc(dev, - GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_GS, offset, size, cp); + gen7_3dstate_push_constant_alloc(builder, + GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_GS, offset, size); } static inline void -gen7_emit_3DSTATE_PUSH_CONSTANT_ALLOC_PS(const struct ilo_dev_info *dev, - int offset, int size, - struct ilo_cp *cp) +gen7_3DSTATE_PUSH_CONSTANT_ALLOC_PS(struct ilo_builder *builder, + int offset, int size) { - gen7_emit_3dstate_push_constant_alloc(dev, - GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_PS, offset, size, cp); + gen7_3dstate_push_constant_alloc(builder, + GEN7_RENDER_OPCODE_3DSTATE_PUSH_CONSTANT_ALLOC_PS, offset, size); } static inline void -gen7_emit_3DSTATE_SO_DECL_LIST(const struct ilo_dev_info *dev, - const struct pipe_stream_output_info *so_info, - struct ilo_cp *cp) +gen7_3DSTATE_SO_DECL_LIST(struct ilo_builder *builder, + const struct pipe_stream_output_info *so_info) { uint16_t cmd_len; - uint32_t dw0; + uint32_t dw0, *dw; int buffer_selects, num_entries, i; uint16_t so_decls[128]; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); buffer_selects = 0; num_entries = 0; @@ -1037,50 +981,52 @@ gen7_emit_3DSTATE_SO_DECL_LIST(const struct ilo_dev_info *dev, cmd_len = 2 * 128 + 3; dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_SO_DECL_LIST) | (cmd_len - 2); - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, 0 << GEN7_SO_DECL_DW1_STREAM3_BUFFER_SELECTS__SHIFT | - 0 << GEN7_SO_DECL_DW1_STREAM2_BUFFER_SELECTS__SHIFT | - 0 << GEN7_SO_DECL_DW1_STREAM1_BUFFER_SELECTS__SHIFT | - buffer_selects << GEN7_SO_DECL_DW1_STREAM0_BUFFER_SELECTS__SHIFT); - ilo_cp_write(cp, 0 << GEN7_SO_DECL_DW2_STREAM3_ENTRY_COUNT__SHIFT | - 0 << GEN7_SO_DECL_DW2_STREAM2_ENTRY_COUNT__SHIFT | - 0 << GEN7_SO_DECL_DW2_STREAM1_ENTRY_COUNT__SHIFT | - num_entries << GEN7_SO_DECL_DW2_STREAM0_ENTRY_COUNT__SHIFT); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = 0 << GEN7_SO_DECL_DW1_STREAM3_BUFFER_SELECTS__SHIFT | + 0 << GEN7_SO_DECL_DW1_STREAM2_BUFFER_SELECTS__SHIFT | + 0 << GEN7_SO_DECL_DW1_STREAM1_BUFFER_SELECTS__SHIFT | + buffer_selects << GEN7_SO_DECL_DW1_STREAM0_BUFFER_SELECTS__SHIFT; + dw[2] = 0 << GEN7_SO_DECL_DW2_STREAM3_ENTRY_COUNT__SHIFT | + 0 << GEN7_SO_DECL_DW2_STREAM2_ENTRY_COUNT__SHIFT | + 0 << GEN7_SO_DECL_DW2_STREAM1_ENTRY_COUNT__SHIFT | + num_entries << GEN7_SO_DECL_DW2_STREAM0_ENTRY_COUNT__SHIFT; + dw += 3; for (i = 0; i < num_entries; i++) { - ilo_cp_write(cp, so_decls[i]); - ilo_cp_write(cp, 0); + dw[0] = so_decls[i]; + dw[1] = 0; + dw += 2; } for (; i < 128; i++) { - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); + dw[0] = 0; + dw[1] = 0; + dw += 2; } - - ilo_cp_end(cp); } static inline void -gen7_emit_3DSTATE_SO_BUFFER(const struct ilo_dev_info *dev, - int index, int base, int stride, - const struct pipe_stream_output_target *so_target, - struct ilo_cp *cp) +gen7_3DSTATE_SO_BUFFER(struct ilo_builder *builder, + int index, int base, int stride, + const struct pipe_stream_output_target *so_target) { const uint8_t cmd_len = 4; const uint32_t dw0 = GEN7_RENDER_CMD(3D, 3DSTATE_SO_BUFFER) | (cmd_len - 2); struct ilo_buffer *buf; int end; + unsigned pos; + uint32_t *dw; - ILO_GPE_VALID_GEN(dev, 7, 7.5); + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); if (!so_target || !so_target->buffer) { - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, index << GEN7_SO_BUF_DW1_INDEX__SHIFT); - ilo_cp_write(cp, 0); - ilo_cp_write(cp, 0); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = index << GEN7_SO_BUF_DW1_INDEX__SHIFT; + dw[2] = 0; + dw[3] = 0; + return; } @@ -1094,21 +1040,22 @@ gen7_emit_3DSTATE_SO_BUFFER(const struct ilo_dev_info *dev, base = (base + so_target->buffer_offset) & ~3; end = (base + so_target->buffer_size) & ~3; - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, index << GEN7_SO_BUF_DW1_INDEX__SHIFT | - stride); - ilo_cp_write_bo(cp, base, buf->bo, INTEL_RELOC_WRITE); - ilo_cp_write_bo(cp, end, buf->bo, INTEL_RELOC_WRITE); - ilo_cp_end(cp); + pos = ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = index << GEN7_SO_BUF_DW1_INDEX__SHIFT | + stride; + + ilo_builder_batch_reloc(builder, pos + 2, + buf->bo, base, INTEL_RELOC_WRITE); + ilo_builder_batch_reloc(builder, pos + 3, + buf->bo, end, INTEL_RELOC_WRITE); } static inline void -gen7_emit_3DPRIMITIVE(const struct ilo_dev_info *dev, - const struct pipe_draw_info *info, - const struct ilo_ib_state *ib, - bool rectlist, - struct ilo_cp *cp) +gen7_3DPRIMITIVE(struct ilo_builder *builder, + const struct pipe_draw_info *info, + const struct ilo_ib_state *ib, + bool rectlist) { const uint8_t cmd_len = 7; const uint32_t dw0 = GEN6_RENDER_CMD(3D, 3DPRIMITIVE) | (cmd_len - 2); @@ -1119,18 +1066,18 @@ gen7_emit_3DPRIMITIVE(const struct ilo_dev_info *dev, GEN7_3DPRIM_DW1_ACCESS_SEQUENTIAL; const uint32_t vb_start = info->start + ((info->indexed) ? ib->draw_start_offset : 0); + uint32_t *dw; + + ILO_GPE_VALID_GEN(builder->dev, 7, 7.5); - ILO_GPE_VALID_GEN(dev, 7, 7.5); - - ilo_cp_begin(cp, cmd_len); - ilo_cp_write(cp, dw0); - ilo_cp_write(cp, vb_access | prim); - ilo_cp_write(cp, info->count); - ilo_cp_write(cp, vb_start); - ilo_cp_write(cp, info->instance_count); - ilo_cp_write(cp, info->start_instance); - ilo_cp_write(cp, info->index_bias); - ilo_cp_end(cp); + ilo_builder_batch_pointer(builder, cmd_len, &dw); + dw[0] = dw0; + dw[1] = vb_access | prim; + dw[2] = info->count; + dw[3] = vb_start; + dw[4] = info->instance_count; + dw[5] = info->start_instance; + dw[6] = info->index_bias; } static inline uint32_t |