AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Remove deprecated usage of VK_DYNAMIC_STATE_RANGE_SIZE

This commit is contained in:
Luke Street 2020-05-22 04:16:57 -04:00
parent 362a27b7ff
commit 543c686f88
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/graphicsdev/Vulkan.cpp
View File

@ -2375,12 +2375,7 @@ public:
break; break;
} }
VkDynamicState dynamicStateEnables[VK_DYNAMIC_STATE_RANGE_SIZE] = {}; std::vector<VkDynamicState> dynamicStateEnables;
VkPipelineDynamicStateCreateInfo dynamicState = {};
dynamicState.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
dynamicState.pNext = nullptr;
dynamicState.pDynamicStates = dynamicStateEnables;
dynamicState.dynamicStateCount = 0;
VkPipelineShaderStageCreateInfo stages[5] = {}; VkPipelineShaderStageCreateInfo stages[5] = {};
uint32_t numStages = 0; uint32_t numStages = 0;
@ -2456,10 +2451,10 @@ public:
viewportInfo.pViewports = nullptr; viewportInfo.pViewports = nullptr;
viewportInfo.scissorCount = 1; viewportInfo.scissorCount = 1;
viewportInfo.pScissors = nullptr; viewportInfo.pScissors = nullptr;
dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_VIEWPORT; dynamicStateEnables.push_back(VK_DYNAMIC_STATE_VIEWPORT);
dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_SCISSOR; dynamicStateEnables.push_back(VK_DYNAMIC_STATE_SCISSOR);
#if AMD_PAL_HACK #if AMD_PAL_HACK
dynamicStateEnables[dynamicState.dynamicStateCount++] = VK_DYNAMIC_STATE_BLEND_CONSTANTS; dynamicStateEnables.push_back(VK_DYNAMIC_STATE_BLEND_CONSTANTS);
#endif #endif
VkPipelineRasterizationStateCreateInfo rasterizationInfo = {}; VkPipelineRasterizationStateCreateInfo rasterizationInfo = {};
@ -2548,6 +2543,12 @@ public:
colorBlendInfo.attachmentCount = 1; colorBlendInfo.attachmentCount = 1;
colorBlendInfo.pAttachments = &colorAttachment; colorBlendInfo.pAttachments = &colorAttachment;
VkPipelineDynamicStateCreateInfo dynamicState = {};
dynamicState.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
dynamicState.pNext = nullptr;
dynamicState.pDynamicStates = dynamicStateEnables.data();
dynamicState.dynamicStateCount = uint32_t(dynamicStateEnables.size());
VkGraphicsPipelineCreateInfo pipelineCreateInfo = {}; VkGraphicsPipelineCreateInfo pipelineCreateInfo = {};
pipelineCreateInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; pipelineCreateInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
pipelineCreateInfo.pNext = nullptr; pipelineCreateInfo.pNext = nullptr;