diff options
| -rw-r--r-- | src/intel/vulkan/gen7_pipeline.c | 7 | ||||
| -rw-r--r-- | src/intel/vulkan/gen8_pipeline.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c index 02f18e71591..192175658fb 100644 --- a/src/intel/vulkan/gen7_pipeline.c +++ b/src/intel/vulkan/gen7_pipeline.c @@ -68,9 +68,8 @@ genX(graphics_pipeline_create)( assert(pCreateInfo->pRasterizationState); emit_rs_state(pipeline, pCreateInfo->pRasterizationState, pCreateInfo->pMultisampleState, pass, subpass); - + emit_ms_state(pipeline, pCreateInfo->pMultisampleState); emit_ds_state(pipeline, pCreateInfo->pDepthStencilState, pass, subpass); - emit_cb_state(pipeline, pCreateInfo->pColorBlendState, pCreateInfo->pMultisampleState); @@ -80,8 +79,6 @@ genX(graphics_pipeline_create)( pCreateInfo->pRasterizationState); emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState); - emit_ms_state(pipeline, pCreateInfo->pMultisampleState); - #if 0 /* From gen7_vs_state.c */ @@ -104,8 +101,8 @@ genX(graphics_pipeline_create)( emit_3dstate_vs(pipeline); emit_3dstate_gs(pipeline); emit_3dstate_sbe(pipeline); - emit_3dstate_ps(pipeline); emit_3dstate_wm(pipeline, pCreateInfo->pMultisampleState); + emit_3dstate_ps(pipeline); *pPipeline = anv_pipeline_to_handle(pipeline); diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 186d0401f35..3980be5b55e 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -64,7 +64,6 @@ genX(graphics_pipeline_create)( assert(pCreateInfo->pVertexInputState); emit_vertex_input(pipeline, pCreateInfo->pVertexInputState); - emit_3dstate_vf_topology(pipeline); assert(pCreateInfo->pRasterizationState); emit_rs_state(pipeline, pCreateInfo->pRasterizationState, pCreateInfo->pMultisampleState, pass, subpass); @@ -79,12 +78,13 @@ genX(graphics_pipeline_create)( pCreateInfo->pRasterizationState); emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState); - emit_3dstate_wm(pipeline, pCreateInfo->pMultisampleState); - emit_3dstate_gs(pipeline); emit_3dstate_vs(pipeline); + emit_3dstate_gs(pipeline); emit_3dstate_sbe(pipeline); + emit_3dstate_wm(pipeline, pCreateInfo->pMultisampleState); emit_3dstate_ps(pipeline); emit_3dstate_ps_extra(pipeline); + emit_3dstate_vf_topology(pipeline); *pPipeline = anv_pipeline_to_handle(pipeline); |