KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vk/vulkan.h: Rename VertexInputStateInfo to VertexInputStateCreateInfo

This commit is contained in:
Jason Ekstrand 2015-07-07 16:15:55 -07:00
parent abbb776bbe
commit d2ca7e24b4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vulkan/vulkan.h
View File

@ -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;

8
src/vulkan/meta.c
View File

@ -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[]) {

8
src/vulkan/pipeline.c
View File

@ -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;