wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Do not store VkPipelineInputAssemblyStateCreateInfo in d3d12_command_list.

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-08-23 18:33:05 +02:00 committed by Alexandre Julliard
parent acc658a912
commit d26300edd9
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/vkd3d/command.c
View File

@ -1695,6 +1695,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list
struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
struct VkPipelineVertexInputStateCreateInfo input_desc; struct VkPipelineVertexInputStateCreateInfo input_desc;
struct VkPipelineInputAssemblyStateCreateInfo ia_desc;
struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc;
struct VkGraphicsPipelineCreateInfo pipeline_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc;
const struct d3d12_device *device = list->device; const struct d3d12_device *device = list->device;
@ -1776,6 +1777,12 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list
input_desc.vertexAttributeDescriptionCount = state->attribute_count; input_desc.vertexAttributeDescriptionCount = state->attribute_count;
input_desc.pVertexAttributeDescriptions = state->attributes; input_desc.pVertexAttributeDescriptions = state->attributes;
ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
ia_desc.pNext = NULL;
ia_desc.flags = 0;
ia_desc.topology = list->primitive_topology;
ia_desc.primitiveRestartEnable = VK_FALSE;
blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
blend_desc.pNext = NULL; blend_desc.pNext = NULL;
blend_desc.flags = 0; blend_desc.flags = 0;
@ -1795,7 +1802,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list
pipeline_desc.stageCount = state->stage_count; pipeline_desc.stageCount = state->stage_count;
pipeline_desc.pStages = state->stages; pipeline_desc.pStages = state->stages;
pipeline_desc.pVertexInputState = &input_desc; pipeline_desc.pVertexInputState = &input_desc;
pipeline_desc.pInputAssemblyState = &list->ia_desc; pipeline_desc.pInputAssemblyState = &ia_desc;
pipeline_desc.pTessellationState = NULL; pipeline_desc.pTessellationState = NULL;
pipeline_desc.pViewportState = &vp_desc; pipeline_desc.pViewportState = &vp_desc;
pipeline_desc.pRasterizationState = &state->rs_desc; pipeline_desc.pRasterizationState = &state->rs_desc;
@ -2806,7 +2813,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr
TRACE("iface %p, topology %#x.\n", iface, topology); TRACE("iface %p, topology %#x.\n", iface, topology);
list->ia_desc.topology = vk_topology_from_d3d12_topology(topology); list->primitive_topology = vk_topology_from_d3d12_topology(topology);
d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_current_pipeline(list);
} }
@ -4151,11 +4158,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d
list->pipeline_state = initial_pipeline_state; list->pipeline_state = initial_pipeline_state;
memset(list->strides, 0, sizeof(list->strides)); memset(list->strides, 0, sizeof(list->strides));
list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
list->ia_desc.pNext = NULL;
list->ia_desc.flags = 0;
list->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST;
list->ia_desc.primitiveRestartEnable = VK_FALSE;
memset(list->views, 0, sizeof(list->views)); memset(list->views, 0, sizeof(list->views));
list->fb_width = 0; list->fb_width = 0;

2
libs/vkd3d/vkd3d_private.h
View File

@ -615,7 +615,7 @@ struct d3d12_command_list
bool is_valid; bool is_valid;
uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
struct VkPipelineInputAssemblyStateCreateInfo ia_desc; VkPrimitiveTopology primitive_topology;
VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1];
unsigned int fb_width; unsigned int fb_width;