fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "zink: set pipeline dynamic state count after all dynamic states are set"

Browse source 
This reverts commit ad0a9aaadc.
This commit is contained in:
Dylan Baker 2023-09-21 16:06:55 -07:00
parent 9a2e406706
commit ed1a0b98f3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -28904,7 +28904,7 @@
"description": "zink: set pipeline dynamic state count after all dynamic states are set", "description": "zink: set pipeline dynamic state count after all dynamic states are set",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 1, "resolution": 0,
"main_sha": null, "main_sha": null,
"because_sha": "d17c081b7c6485a00e99fa9472e3d6a0bb0f66be", "because_sha": "d17c081b7c6485a00e99fa9472e3d6a0bb0f66be",
"notes": null "notes": null

4
src/gallium/drivers/zink/zink_pipeline.c
View file

@ -329,6 +329,7 @@ zink_create_gfx_pipeline(struct zink_screen *screen,
VkPipelineDynamicStateCreateInfo pipelineDynamicStateCreateInfo = {0}; VkPipelineDynamicStateCreateInfo pipelineDynamicStateCreateInfo = {0};
pipelineDynamicStateCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; pipelineDynamicStateCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
pipelineDynamicStateCreateInfo.pDynamicStates = dynamicStateEnables; pipelineDynamicStateCreateInfo.pDynamicStates = dynamicStateEnables;
pipelineDynamicStateCreateInfo.dynamicStateCount = state_count;
VkGraphicsPipelineCreateInfo pci = {0}; VkGraphicsPipelineCreateInfo pci = {0};
pci.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; pci.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
@ -367,7 +368,6 @@ zink_create_gfx_pipeline(struct zink_screen *screen,
pci.pViewportState = &viewport_state; pci.pViewportState = &viewport_state;
pci.pDepthStencilState = &depth_stencil_state; pci.pDepthStencilState = &depth_stencil_state;
pci.pDynamicState = &pipelineDynamicStateCreateInfo; pci.pDynamicState = &pipelineDynamicStateCreateInfo;
pipelineDynamicStateCreateInfo.dynamicStateCount = state_count;
VkPipelineTessellationStateCreateInfo tci = {0}; VkPipelineTessellationStateCreateInfo tci = {0};
VkPipelineTessellationDomainOriginStateCreateInfo tdci = {0}; VkPipelineTessellationDomainOriginStateCreateInfo tdci = {0};
@ -564,6 +564,7 @@ zink_create_gfx_pipeline_output(struct zink_screen *screen, struct zink_gfx_pipe
VkPipelineDynamicStateCreateInfo pipelineDynamicStateCreateInfo = {0}; VkPipelineDynamicStateCreateInfo pipelineDynamicStateCreateInfo = {0};
pipelineDynamicStateCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; pipelineDynamicStateCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
pipelineDynamicStateCreateInfo.pDynamicStates = dynamicStateEnables; pipelineDynamicStateCreateInfo.pDynamicStates = dynamicStateEnables;
pipelineDynamicStateCreateInfo.dynamicStateCount = state_count;
VkGraphicsPipelineCreateInfo pci = {0}; VkGraphicsPipelineCreateInfo pci = {0};
pci.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; pci.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
@ -588,7 +589,6 @@ zink_create_gfx_pipeline_output(struct zink_screen *screen, struct zink_gfx_pipe
} }
if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB)
pci.flags |= VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT; pci.flags |= VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT;
pipelineDynamicStateCreateInfo.dynamicStateCount = state_count;
pci.pColorBlendState = &blend_state; pci.pColorBlendState = &blend_state;
pci.pMultisampleState = &ms_state; pci.pMultisampleState = &ms_state;
pci.pDynamicState = &pipelineDynamicStateCreateInfo; pci.pDynamicState = &pipelineDynamicStateCreateInfo;