vk/vulkan.h: Rename VertexInputStateInfo to VertexInputStateCreateInfo

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 3057a982f3e5b8760b6cc4497a8a558d5eb3bb4b..a243f41f61f55a26fe00c2b4fccdcf1c73ba7a75 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -194,7 +194,7 @@ typedef enum {
     VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO = 23,
     VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO = 24,
     VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO = 25,
-    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO = 26,
+    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO = 26,
     VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO = 27,
     VK_STRUCTURE_TYPE_PIPELINE_TESS_STATE_CREATE_INFO = 28,
     VK_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO = 29,
@@ -1443,7 +1443,7 @@ typedef struct {
     const VkVertexInputBindingDescription*      pVertexBindingDescriptions;
     uint32_t                                    attributeCount;
     const VkVertexInputAttributeDescription*    pVertexAttributeDescriptions;
-} VkPipelineVertexInputCreateInfo;
+} VkPipelineVertexInputStateCreateInfo;
 
 typedef struct {
     VkStructureType                             sType;

diff --git a/src/vulkan/meta.c b/src/vulkan/meta.c
index 8a6bc377447acc6fc1bf35c4a00ae40822b71637..f4479512ea6d894f02c91c388602e590aa8f66aa 100644 (file)
--- a/src/vulkan/meta.c
+++ b/src/vulkan/meta.c
@@ -69,8 +69,8 @@ anv_device_init_meta_clear_state(struct anv_device *device)
     * per-instance data, which consists of the VUE header (which selects the
     * layer) and the color (Vulkan supports per-RT clear colors).
     */
-   VkPipelineVertexInputCreateInfo vi_create_info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO,
+   VkPipelineVertexInputStateCreateInfo vi_create_info = {
+      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
       .pNext = &fs_create_info,
       .bindingCount = 2,
       .pVertexBindingDescriptions = (VkVertexInputBindingDescription[]) {
@@ -363,8 +363,8 @@ anv_device_init_meta_blit_state(struct anv_device *device)
       }
    };
 
-   VkPipelineVertexInputCreateInfo vi_create_info = {
-      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO,
+   VkPipelineVertexInputStateCreateInfo vi_create_info = {
+      .sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,
       .pNext = &fs_create_info,
       .bindingCount = 2,
       .pVertexBindingDescriptions = (VkVertexInputBindingDescription[]) {

diff --git a/src/vulkan/pipeline.c b/src/vulkan/pipeline.c
index 665ee773fe47bd4b473f5fd4247e7f3b77d64282..7df34d16a0ad4222d4bb804fe409e6b17218b141 100644 (file)
--- a/src/vulkan/pipeline.c
+++ b/src/vulkan/pipeline.c
@@ -57,7 +57,7 @@ VkResult anv_CreateShader(
 // Pipeline functions
 
 static void
-emit_vertex_input(struct anv_pipeline *pipeline, VkPipelineVertexInputCreateInfo *info)
+emit_vertex_input(struct anv_pipeline *pipeline, VkPipelineVertexInputStateCreateInfo *info)
 {
    const uint32_t num_dwords = 1 + info->attributeCount * 2;
    uint32_t *p;
@@ -403,7 +403,7 @@ anv_pipeline_create(
    VkPipelineRsStateCreateInfo *rs_info = NULL;
    VkPipelineDsStateCreateInfo *ds_info = NULL;
    VkPipelineCbStateCreateInfo *cb_info = NULL;
-   VkPipelineVertexInputCreateInfo *vi_info = NULL;
+   VkPipelineVertexInputStateCreateInfo *vi_info = NULL;
    VkResult result;
    uint32_t offset, length;
 
@@ -432,8 +432,8 @@ anv_pipeline_create(
 
    for (common = pCreateInfo->pNext; common; common = common->pNext) {
       switch (common->sType) {
-      case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_CREATE_INFO:
-         vi_info = (VkPipelineVertexInputCreateInfo *) common;
+      case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO:
+         vi_info = (VkPipelineVertexInputStateCreateInfo *) common;
          break;
       case VK_STRUCTURE_TYPE_PIPELINE_IA_STATE_CREATE_INFO:
          ia_info = (VkPipelineIaStateCreateInfo *) common;