From 24653bcd7d70c92eff85db66c58dec79bbd10234 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 25 Sep 2014 16:54:28 +0800 Subject: [PATCH] ilo: give gen6_draw_session a better prefix gen6_draw_session is not GEN dependent. Rename it to ilo_render_draw_session. Signed-off-by: Chia-I Wu --- src/gallium/drivers/ilo/ilo_render.c | 18 ++++++------ src/gallium/drivers/ilo/ilo_render_dynamic.c | 14 ++++----- src/gallium/drivers/ilo/ilo_render_gen.h | 30 +++++++++---------- src/gallium/drivers/ilo/ilo_render_gen6.c | 44 ++++++++++++++-------------- src/gallium/drivers/ilo/ilo_render_gen7.c | 30 +++++++++---------- src/gallium/drivers/ilo/ilo_render_surface.c | 12 ++++---- 6 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/gallium/drivers/ilo/ilo_render.c b/src/gallium/drivers/ilo/ilo_render.c index 9291855..ae77858 100644 --- a/src/gallium/drivers/ilo/ilo_render.c +++ b/src/gallium/drivers/ilo/ilo_render.c @@ -385,9 +385,9 @@ ilo_render_get_draw_len(const struct ilo_render *render, } static void -gen6_draw_prepare(struct ilo_render *render, - const struct ilo_state_vector *vec, - struct gen6_draw_session *session) +draw_session_prepare(struct ilo_render *render, + const struct ilo_state_vector *vec, + struct ilo_render_draw_session *session) { memset(session, 0, sizeof(*session)); session->pipe_dirty = vec->dirty; @@ -410,9 +410,9 @@ gen6_draw_prepare(struct ilo_render *render, } static void -gen6_draw_end(struct ilo_render *render, - const struct ilo_state_vector *vec, - struct gen6_draw_session *session) +draw_session_end(struct ilo_render *render, + const struct ilo_state_vector *vec, + struct ilo_render_draw_session *session) { render->hw_ctx_changed = false; @@ -428,11 +428,11 @@ void ilo_render_emit_draw(struct ilo_render *render, const struct ilo_state_vector *vec) { - struct gen6_draw_session session; + struct ilo_render_draw_session session; ILO_DEV_ASSERT(render->dev, 6, 7.5); - gen6_draw_prepare(render, vec, &session); + draw_session_prepare(render, vec, &session); /* force all states to be uploaded if the state bo changed */ if (render->state_bo_changed) @@ -451,5 +451,5 @@ ilo_render_emit_draw(struct ilo_render *render, ilo_render_emit_draw_commands(render, vec, &session); - gen6_draw_end(render, vec, &session); + draw_session_end(render, vec, &session); } diff --git a/src/gallium/drivers/ilo/ilo_render_dynamic.c b/src/gallium/drivers/ilo/ilo_render_dynamic.c index fda50dc..74d788d 100644 --- a/src/gallium/drivers/ilo/ilo_render_dynamic.c +++ b/src/gallium/drivers/ilo/ilo_render_dynamic.c @@ -36,7 +36,7 @@ static void gen6_emit_draw_dynamic_viewports(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(r->dev, 6, 6); @@ -58,7 +58,7 @@ gen6_emit_draw_dynamic_viewports(struct ilo_render *r, static void gen7_emit_draw_dynamic_viewports(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(r->dev, 7, 7.5); @@ -77,7 +77,7 @@ gen7_emit_draw_dynamic_viewports(struct ilo_render *r, static void gen6_emit_draw_dynamic_scissors(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(r->dev, 6, 7.5); @@ -94,7 +94,7 @@ gen6_emit_draw_dynamic_scissors(struct ilo_render *r, static void gen6_emit_draw_dynamic_cc(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(r->dev, 6, 7.5); @@ -128,7 +128,7 @@ static void gen6_emit_draw_dynamic_samplers(struct ilo_render *r, const struct ilo_state_vector *vec, int shader_type, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const struct ilo_sampler_cso * const *samplers = vec->sampler[shader_type].cso; @@ -197,7 +197,7 @@ gen6_emit_draw_dynamic_samplers(struct ilo_render *r, static void gen6_emit_draw_dynamic_pcb(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(r->dev, 6, 7.5); @@ -365,7 +365,7 @@ ilo_render_get_draw_dynamic_states_len(const struct ilo_render *render, void ilo_render_emit_draw_dynamic_states(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const unsigned dynamic_used = ilo_builder_dynamic_used(render->builder); diff --git a/src/gallium/drivers/ilo/ilo_render_gen.h b/src/gallium/drivers/ilo/ilo_render_gen.h index 09c603d..8c87497 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen.h +++ b/src/gallium/drivers/ilo/ilo_render_gen.h @@ -124,7 +124,7 @@ struct ilo_render { } state; }; -struct gen6_draw_session { +struct ilo_render_draw_session { uint32_t pipe_dirty; /* commands */ @@ -178,17 +178,17 @@ ilo_render_get_draw_commands_len(const struct ilo_render *render, void ilo_render_emit_draw_commands_gen6(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void ilo_render_emit_draw_commands_gen7(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); static inline void ilo_render_emit_draw_commands(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const unsigned batch_used = ilo_builder_batch_used(render->builder); @@ -242,7 +242,7 @@ ilo_render_get_draw_dynamic_states_len(const struct ilo_render *render, void ilo_render_emit_draw_dynamic_states(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); int ilo_render_get_rectlist_dynamic_states_len(const struct ilo_render *render, @@ -259,7 +259,7 @@ ilo_render_get_draw_surface_states_len(const struct ilo_render *render, void ilo_render_emit_draw_surface_states(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_wa_pre_pipe_control(struct ilo_render *r, uint32_t dw1); @@ -267,46 +267,46 @@ gen6_wa_pre_pipe_control(struct ilo_render *r, uint32_t dw1); void gen6_draw_common_select(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_common_sip(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_common_base_address(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_vf(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_vf_statistics(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_vs(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_clip(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_sf_rect(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); void gen6_draw_wm_raster(struct ilo_render *r, const struct ilo_state_vector *ilo, - struct gen6_draw_session *session); + struct ilo_render_draw_session *session); #endif /* ILO_RENDER_GEN_H */ diff --git a/src/gallium/drivers/ilo/ilo_render_gen6.c b/src/gallium/drivers/ilo/ilo_render_gen6.c index b60075c..cd84e0c 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen6.c +++ b/src/gallium/drivers/ilo/ilo_render_gen6.c @@ -222,7 +222,7 @@ gen6_wa_pre_depth(struct ilo_render *r) void gen6_draw_common_select(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* PIPELINE_SELECT */ if (r->hw_ctx_changed) { @@ -236,7 +236,7 @@ gen6_draw_common_select(struct ilo_render *r, void gen6_draw_common_sip(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* STATE_SIP */ if (r->hw_ctx_changed) { @@ -250,7 +250,7 @@ gen6_draw_common_sip(struct ilo_render *r, void gen6_draw_common_base_address(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* STATE_BASE_ADDRESS */ if (r->state_bo_changed || r->instruction_bo_changed || @@ -300,7 +300,7 @@ gen6_draw_common_base_address(struct ilo_render *r, static void gen6_draw_common_urb(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_URB */ if (DIRTY(VE) || DIRTY(VS) || DIRTY(GS)) { @@ -374,7 +374,7 @@ gen6_draw_common_urb(struct ilo_render *r, static void gen6_draw_common_pointers_1(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_VIEWPORT_STATE_POINTERS */ if (session->viewport_changed) { @@ -388,7 +388,7 @@ gen6_draw_common_pointers_1(struct ilo_render *r, static void gen6_draw_common_pointers_2(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CC_STATE_POINTERS */ if (session->blend_changed || @@ -414,7 +414,7 @@ gen6_draw_common_pointers_2(struct ilo_render *r, static void gen6_draw_common_pointers_3(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_SCISSOR_STATE_POINTERS */ if (session->scissor_changed) { @@ -436,7 +436,7 @@ gen6_draw_common_pointers_3(struct ilo_render *r, void gen6_draw_vf(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { if (ilo_dev_gen(r->dev) >= ILO_GEN(7.5)) { /* 3DSTATE_INDEX_BUFFER */ @@ -495,7 +495,7 @@ gen6_draw_vf(struct ilo_render *r, void gen6_draw_vf_statistics(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_VF_STATISTICS */ if (r->hw_ctx_changed) @@ -505,7 +505,7 @@ gen6_draw_vf_statistics(struct ilo_render *r, static void gen6_draw_vf_draw(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DPRIMITIVE */ gen6_3DPRIMITIVE(r->builder, vec->draw, &vec->ib); @@ -517,7 +517,7 @@ gen6_draw_vf_draw(struct ilo_render *r, void gen6_draw_vs(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const bool emit_3dstate_vs = (DIRTY(VS) || DIRTY(SAMPLER_VS) || r->instruction_bo_changed); @@ -552,7 +552,7 @@ gen6_draw_vs(struct ilo_render *r, static void gen6_draw_gs(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CONSTANT_GS */ if (session->pcb_gs_changed) @@ -570,7 +570,7 @@ gen6_draw_gs(struct ilo_render *r, static bool gen6_draw_update_max_svbi(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { if (DIRTY(VS) || DIRTY(GS) || DIRTY(SO)) { const struct pipe_stream_output_info *so_info = @@ -614,7 +614,7 @@ gen6_draw_update_max_svbi(struct ilo_render *r, static void gen6_draw_gs_svbi(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const bool emit = gen6_draw_update_max_svbi(r, vec, session); @@ -650,7 +650,7 @@ gen6_draw_gs_svbi(struct ilo_render *r, void gen6_draw_clip(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CLIP */ if (DIRTY(RASTERIZER) || DIRTY(FS) || DIRTY(VIEWPORT) || DIRTY(FB)) { @@ -679,7 +679,7 @@ gen6_draw_clip(struct ilo_render *r, static void gen6_draw_sf(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_SF */ if (DIRTY(RASTERIZER) || DIRTY(FS)) @@ -689,7 +689,7 @@ gen6_draw_sf(struct ilo_render *r, void gen6_draw_sf_rect(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_DRAWING_RECTANGLE */ if (DIRTY(FB)) { @@ -704,7 +704,7 @@ gen6_draw_sf_rect(struct ilo_render *r, static void gen6_draw_wm(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CONSTANT_PS */ if (session->pcb_fs_changed) { @@ -733,7 +733,7 @@ gen6_draw_wm(struct ilo_render *r, static void gen6_draw_wm_multisample(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_MULTISAMPLE and 3DSTATE_SAMPLE_MASK */ if (DIRTY(SAMPLE_MASK) || DIRTY(FB)) { @@ -759,7 +759,7 @@ gen6_draw_wm_multisample(struct ilo_render *r, static void gen6_draw_wm_depth(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_DEPTH_BUFFER and 3DSTATE_CLEAR_PARAMS */ if (DIRTY(FB) || r->batch_bo_changed) { @@ -798,7 +798,7 @@ gen6_draw_wm_depth(struct ilo_render *r, void gen6_draw_wm_raster(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_POLY_STIPPLE_PATTERN and 3DSTATE_POLY_STIPPLE_OFFSET */ if ((DIRTY(RASTERIZER) || DIRTY(POLY_STIPPLE)) && @@ -836,7 +836,7 @@ gen6_draw_wm_raster(struct ilo_render *r, void ilo_render_emit_draw_commands_gen6(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(render->dev, 6, 6); diff --git a/src/gallium/drivers/ilo/ilo_render_gen7.c b/src/gallium/drivers/ilo/ilo_render_gen7.c index 33e119a..6714c80 100644 --- a/src/gallium/drivers/ilo/ilo_render_gen7.c +++ b/src/gallium/drivers/ilo/ilo_render_gen7.c @@ -225,7 +225,7 @@ gen7_wa_post_ps_and_later(struct ilo_render *r) static void gen7_draw_common_urb(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_URB_{VS,GS,HS,DS} */ if (DIRTY(VE) || DIRTY(VS)) { @@ -265,7 +265,7 @@ gen7_draw_common_urb(struct ilo_render *r, static void gen7_draw_common_pcb_alloc(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_PUSH_CONSTANT_ALLOC_{VS,PS} */ if (r->hw_ctx_changed) { @@ -291,7 +291,7 @@ gen7_draw_common_pcb_alloc(struct ilo_render *r, static void gen7_draw_common_pointers_1(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_VIEWPORT_STATE_POINTERS_{CC,SF_CLIP} */ if (session->viewport_changed) { @@ -306,7 +306,7 @@ gen7_draw_common_pointers_1(struct ilo_render *r, static void gen7_draw_common_pointers_2(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_BLEND_STATE_POINTERS */ if (session->blend_changed) { @@ -330,7 +330,7 @@ gen7_draw_common_pointers_2(struct ilo_render *r, static void gen7_draw_vs(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const bool emit_3dstate_binding_table = session->binding_table_vs_changed; @@ -377,7 +377,7 @@ gen7_draw_vs(struct ilo_render *r, static void gen7_draw_hs(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CONSTANT_HS and 3DSTATE_HS */ if (r->hw_ctx_changed) { @@ -393,7 +393,7 @@ gen7_draw_hs(struct ilo_render *r, static void gen7_draw_te(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_TE */ if (r->hw_ctx_changed) @@ -403,7 +403,7 @@ gen7_draw_te(struct ilo_render *r, static void gen7_draw_ds(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CONSTANT_DS and 3DSTATE_DS */ if (r->hw_ctx_changed) { @@ -420,7 +420,7 @@ gen7_draw_ds(struct ilo_render *r, static void gen7_draw_gs(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_CONSTANT_GS and 3DSTATE_GS */ if (r->hw_ctx_changed) { @@ -438,7 +438,7 @@ gen7_draw_gs(struct ilo_render *r, static void gen7_draw_sol(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const struct pipe_stream_output_info *so_info; const struct ilo_shader_state *shader; @@ -490,7 +490,7 @@ gen7_draw_sol(struct ilo_render *r, static void gen7_draw_sf(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_SBE */ if (DIRTY(RASTERIZER) || DIRTY(FS)) @@ -509,7 +509,7 @@ gen7_draw_sf(struct ilo_render *r, static void gen7_draw_wm(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_WM */ if (DIRTY(FS) || DIRTY(BLEND) || DIRTY(DSA) || DIRTY(RASTERIZER)) { @@ -612,7 +612,7 @@ gen7_draw_wm(struct ilo_render *r, static void gen7_draw_wm_multisample(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { /* 3DSTATE_MULTISAMPLE and 3DSTATE_SAMPLE_MASK */ if (DIRTY(SAMPLE_MASK) || DIRTY(FB)) { @@ -638,7 +638,7 @@ gen7_draw_wm_multisample(struct ilo_render *r, static void gen7_draw_vf_draw(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { if (r->state.deferred_pipe_control_dw1) gen7_pipe_control(r, r->state.deferred_pipe_control_dw1); @@ -653,7 +653,7 @@ gen7_draw_vf_draw(struct ilo_render *r, void ilo_render_emit_draw_commands_gen7(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(render->dev, 7, 7.5); diff --git a/src/gallium/drivers/ilo/ilo_render_surface.c b/src/gallium/drivers/ilo/ilo_render_surface.c index bf5554b..c29aea1 100644 --- a/src/gallium/drivers/ilo/ilo_render_surface.c +++ b/src/gallium/drivers/ilo/ilo_render_surface.c @@ -36,7 +36,7 @@ static void gen6_emit_draw_surface_rt(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { ILO_DEV_ASSERT(r->dev, 6, 7.5); @@ -84,7 +84,7 @@ gen6_emit_draw_surface_rt(struct ilo_render *r, static void gen6_emit_draw_surface_so(struct ilo_render *r, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const struct ilo_so_state *so = &vec->so; @@ -125,7 +125,7 @@ static void gen6_emit_draw_surface_view(struct ilo_render *r, const struct ilo_state_vector *vec, int shader_type, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const struct ilo_view_state *view = &vec->view[shader_type]; uint32_t *surface_state; @@ -186,7 +186,7 @@ static void gen6_emit_draw_surface_const(struct ilo_render *r, const struct ilo_state_vector *vec, int shader_type, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const struct ilo_cbuf_state *cbuf = &vec->cbuf[shader_type]; uint32_t *surface_state; @@ -243,7 +243,7 @@ static void gen6_emit_draw_surface_binding_tables(struct ilo_render *r, const struct ilo_state_vector *vec, int shader_type, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { uint32_t *binding_table_state, *surface_state; int *binding_table_state_size, size; @@ -371,7 +371,7 @@ ilo_render_get_draw_surface_states_len(const struct ilo_render *render, void ilo_render_emit_draw_surface_states(struct ilo_render *render, const struct ilo_state_vector *vec, - struct gen6_draw_session *session) + struct ilo_render_draw_session *session) { const unsigned surface_used = ilo_builder_surface_used(render->builder); int shader_type; -- 2.7.4