From 5706d2590feaf69b48d46fb8f948867f398e2415 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 12 Nov 2016 11:26:05 -0800 Subject: [PATCH] anv/pipeline: Rework the 3DSTATE_VF_TOPOLOGY helper It gets a new name and moved to genX_pipeline_util.h. Reviewed-by: Timothy Arceri Reviewed-by: Kristian H. Kristensen --- src/intel/vulkan/gen8_pipeline.c | 12 +----------- src/intel/vulkan/genX_pipeline_util.h | 8 ++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 1059c9c6599..186d0401f35 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -34,15 +34,6 @@ #include "genX_pipeline_util.h" -static void -emit_ia_state(struct anv_pipeline *pipeline, - const VkPipelineInputAssemblyStateCreateInfo *info) -{ - anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VF_TOPOLOGY), vft) { - vft.PrimitiveTopologyType = pipeline->topology; - } -} - VkResult genX(graphics_pipeline_create)( VkDevice _device, @@ -73,8 +64,7 @@ genX(graphics_pipeline_create)( assert(pCreateInfo->pVertexInputState); emit_vertex_input(pipeline, pCreateInfo->pVertexInputState); - assert(pCreateInfo->pInputAssemblyState); - emit_ia_state(pipeline, pCreateInfo->pInputAssemblyState); + emit_3dstate_vf_topology(pipeline); assert(pCreateInfo->pRasterizationState); emit_rs_state(pipeline, pCreateInfo->pRasterizationState, pCreateInfo->pMultisampleState, pass, subpass); diff --git a/src/intel/vulkan/genX_pipeline_util.h b/src/intel/vulkan/genX_pipeline_util.h index ec98a78f097..efdb7d392c7 100644 --- a/src/intel/vulkan/genX_pipeline_util.h +++ b/src/intel/vulkan/genX_pipeline_util.h @@ -1281,6 +1281,14 @@ emit_3dstate_ps_extra(struct anv_pipeline *pipeline) #endif } } + +static void +emit_3dstate_vf_topology(struct anv_pipeline *pipeline) +{ + anv_batch_emit(&pipeline->batch, GENX(3DSTATE_VF_TOPOLOGY), vft) { + vft.PrimitiveTopologyType = pipeline->topology; + } +} #endif #endif /* GENX_PIPELINE_UTIL_H */ -- 2.30.2