[Mesa-dev] [PATCH 15/20] anv/pipeline: Rework the 3DSTATE_VF_TOPOLOGY helper

[Jason Ekstrand]

It gets a new name and moved to genX_pipeline_util.h.
---
 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 1059c9c..186d040 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 7402158..6a6a081 100644
--- a/src/intel/vulkan/genX_pipeline_util.h
+++ b/src/intel/vulkan/genX_pipeline_util.h
@@ -1287,6 +1287,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.5.0.400.gff86faf