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

libs/vkd3d: Add support for D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA.

Browse Source
This commit is contained in:
Henri Verbeet
2016-11-02 19:36:25 +01:00
parent efde85e8ca
commit 2e10db6f8e
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d/command.c
View File

@ -1473,7 +1473,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list
b = &bindings[binding_count]; b = &bindings[binding_count];
b->binding = binding; b->binding = binding;
b->stride = list->strides[binding]; b->stride = list->strides[binding];
b->inputRate = VK_VERTEX_INPUT_RATE_VERTEX; b->inputRate = state->input_rates[binding];
++binding_count; ++binding_count;
} }

41
libs/vkd3d/state.c
View File

@ -609,7 +609,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
struct VkSubpassDescription sub_pass_desc; struct VkSubpassDescription sub_pass_desc;
struct VkRenderPassCreateInfo pass_desc; struct VkRenderPassCreateInfo pass_desc;
const struct vkd3d_format *format; const struct vkd3d_format *format;
enum VkVertexInputRate input_rate;
unsigned int i; unsigned int i;
uint32_t mask;
VkResult vr; VkResult vr;
HRESULT hr; HRESULT hr;
@ -652,7 +654,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
graphics->attribute_count = ARRAY_SIZE(graphics->attributes); graphics->attribute_count = ARRAY_SIZE(graphics->attributes);
} }
for (i = 0; i < graphics->attribute_count; ++i) for (i = 0, mask = 0; i < graphics->attribute_count; ++i)
{ {
const D3D12_INPUT_ELEMENT_DESC *e = &desc->InputLayout.pInputElementDescs[i]; const D3D12_INPUT_ELEMENT_DESC *e = &desc->InputLayout.pInputElementDescs[i];
@ -663,14 +665,47 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
goto fail; goto fail;
} }
if (e->InputSlot >= ARRAY_SIZE(graphics->input_rates))
{
WARN("Invalid input slot %#x.\n", e->InputSlot);
hr = E_FAIL;
goto fail;
}
graphics->attributes[i].location = i; graphics->attributes[i].location = i;
graphics->attributes[i].binding = e->InputSlot; graphics->attributes[i].binding = e->InputSlot;
graphics->attributes[i].format = format->vk_format; graphics->attributes[i].format = format->vk_format;
if (e->AlignedByteOffset == D3D12_APPEND_ALIGNED_ELEMENT) if (e->AlignedByteOffset == D3D12_APPEND_ALIGNED_ELEMENT)
FIXME("D3D12_APPEND_ALIGNED_ELEMENT not implemented.\n"); FIXME("D3D12_APPEND_ALIGNED_ELEMENT not implemented.\n");
graphics->attributes[i].offset = e->AlignedByteOffset; graphics->attributes[i].offset = e->AlignedByteOffset;
if (e->InputSlotClass != D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA)
FIXME("Ignoring input slot class %#x on input element %u.\n", e->InputSlotClass, i); switch (e->InputSlotClass)
{
case D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA:
input_rate = VK_VERTEX_INPUT_RATE_VERTEX;
break;
case D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA:
if (e->InstanceDataStepRate != 1)
FIXME("Ignoring step rate %#x on input element %u.\n", e->InstanceDataStepRate, i);
input_rate = VK_VERTEX_INPUT_RATE_INSTANCE;
break;
default:
FIXME("Unhandled input slot class %#x on input element %u.\n", e->InputSlotClass, i);
hr = E_FAIL;
goto fail;
}
if (mask & (1u << e->InputSlot) && graphics->input_rates[e->InputSlot] != input_rate)
{
FIXME("Input slot class %#x on input element %u conflicts with earlier input slot class %#x.\n",
e->InputSlotClass, e->InputSlot, graphics->input_rates[e->InputSlot]);
hr = E_FAIL;
goto fail;
}
graphics->input_rates[e->InputSlot] = input_rate;
mask |= 1u << e->InputSlot;
} }
graphics->attachment_count = desc->NumRenderTargets; graphics->attachment_count = desc->NumRenderTargets;

1
libs/vkd3d/vkd3d_private.h
View File

@ -219,6 +219,7 @@ struct d3d12_graphics_pipeline_state
size_t stage_count; size_t stage_count;
struct VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT]; struct VkVertexInputAttributeDescription attributes[D3D12_VS_INPUT_REGISTER_COUNT];
enum VkVertexInputRate input_rates[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
size_t attribute_count; size_t attribute_count;
struct VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; struct VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT];