OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Move together primitive pipeline emit calls

Browse Source 
Just moving code and the packet order, no functional change expected.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13047>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2021-07-08 14:44:17 -07:00
committed by Marge Bot
parent 1f1ad5a9b4
commit a63aa9ad41
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/intel/vulkan/genX_pipeline.c
View File

@@ -2513,8 +2513,6 @@ genX(graphics_pipeline_create)(
enum intel_urb_deref_block_size urb_deref_block_size; enum intel_urb_deref_block_size urb_deref_block_size;
emit_urb_setup(pipeline, &urb_deref_block_size); emit_urb_setup(pipeline, &urb_deref_block_size);
assert(pCreateInfo->pVertexInputState);
emit_vertex_input(pipeline, pCreateInfo->pVertexInputState);
assert(pCreateInfo->pRasterizationState); assert(pCreateInfo->pRasterizationState);
emit_rs_state(pipeline, pCreateInfo->pInputAssemblyState, emit_rs_state(pipeline, pCreateInfo->pInputAssemblyState,
pCreateInfo->pRasterizationState, pCreateInfo->pRasterizationState,
@@ -2530,8 +2528,6 @@ genX(graphics_pipeline_create)(
vp_info, vp_info,
pCreateInfo->pRasterizationState, pCreateInfo->pRasterizationState,
dynamic_states); dynamic_states);
emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState,
dynamic_states);
#if GFX_VER == 12 #if GFX_VER == 12
emit_3dstate_primitive_replication(pipeline); emit_3dstate_primitive_replication(pipeline);
@@ -2556,9 +2552,23 @@ genX(graphics_pipeline_create)(
gfx7_emit_vs_workaround_flush(brw); gfx7_emit_vs_workaround_flush(brw);
#endif #endif
assert(pCreateInfo->pVertexInputState);
emit_vertex_input(pipeline, pCreateInfo->pVertexInputState);
emit_3dstate_vs(pipeline); emit_3dstate_vs(pipeline);
emit_3dstate_hs_te_ds(pipeline, pCreateInfo->pTessellationState); emit_3dstate_hs_te_ds(pipeline, pCreateInfo->pTessellationState);
emit_3dstate_gs(pipeline); emit_3dstate_gs(pipeline);
#if GFX_VER >= 8
if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY))
emit_3dstate_vf_topology(pipeline);
#endif
emit_3dstate_vf_statistics(pipeline);
emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState,
dynamic_states);
emit_3dstate_sbe(pipeline); emit_3dstate_sbe(pipeline);
emit_3dstate_wm(pipeline, subpass, emit_3dstate_wm(pipeline, subpass,
pCreateInfo->pInputAssemblyState, pCreateInfo->pInputAssemblyState,
@@ -2568,11 +2578,7 @@ genX(graphics_pipeline_create)(
#if GFX_VER >= 8 #if GFX_VER >= 8
emit_3dstate_ps_extra(pipeline, subpass, emit_3dstate_ps_extra(pipeline, subpass,
pCreateInfo->pRasterizationState); pCreateInfo->pRasterizationState);
if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY))
emit_3dstate_vf_topology(pipeline);
#endif #endif
emit_3dstate_vf_statistics(pipeline);
*pPipeline = anv_pipeline_to_handle(&pipeline->base); *pPipeline = anv_pipeline_to_handle(&pipeline->base);