wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Implement primitive restart.

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-12-03 11:31:28 +01:00 committed by Alexandre Julliard
parent 8553696c2d
commit afb648d19d
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/vkd3d/state.c
View File

@ -2233,6 +2233,21 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
graphics->attribute_count = j; graphics->attribute_count = j;
vkd3d_shader_free_shader_signature(&input_signature); vkd3d_shader_free_shader_signature(&input_signature);
switch (desc->IBStripCutValue)
{
case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED:
graphics->primitive_restart_enable = VK_FALSE;
break;
case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF:
case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF:
graphics->primitive_restart_enable = VK_TRUE;
break;
default:
WARN("Invalid index buffer strip cut value %#x.\n", desc->IBStripCutValue);
hr = E_INVALIDARG;
goto fail;
}
sub_pass_desc.flags = 0; sub_pass_desc.flags = 0;
sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
sub_pass_desc.inputAttachmentCount = 0; sub_pass_desc.inputAttachmentCount = 0;
@ -2491,7 +2506,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta
ia_desc.pNext = NULL; ia_desc.pNext = NULL;
ia_desc.flags = 0; ia_desc.flags = 0;
ia_desc.topology = topology; ia_desc.topology = topology;
ia_desc.primitiveRestartEnable = VK_FALSE; ia_desc.primitiveRestartEnable = graphics->primitive_restart_enable;
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;

1
libs/vkd3d/vkd3d_private.h
View File

@ -531,6 +531,7 @@ struct d3d12_graphics_pipeline_state
size_t attachment_count, rt_idx; size_t attachment_count, rt_idx;
VkRenderPass render_pass; VkRenderPass render_pass;
VkBool32 primitive_restart_enable;
struct VkPipelineRasterizationStateCreateInfo rs_desc; struct VkPipelineRasterizationStateCreateInfo rs_desc;
struct VkPipelineMultisampleStateCreateInfo ms_desc; struct VkPipelineMultisampleStateCreateInfo ms_desc;
struct VkPipelineDepthStencilStateCreateInfo ds_desc; struct VkPipelineDepthStencilStateCreateInfo ds_desc;