From 7416c83ae2513fa772bca3e0bd6ddde2dc31e039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Thu, 7 Sep 2017 17:15:54 +0200 Subject: [PATCH] libs/vkd3d-shader: Rename vkd3d_descriptor_type to vkd3d_shader_descriptor_type. --- include/vkd3d_shader.h | 14 +++++++------- libs/vkd3d-shader/spirv.c | 14 +++++++------- libs/vkd3d/state.c | 35 ++++++++++++++++++----------------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 8964e95c..0851a8c8 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -48,13 +48,13 @@ struct vkd3d_shader_code size_t size; }; -enum vkd3d_descriptor_type +enum vkd3d_shader_descriptor_type { - VKD3D_DESCRIPTOR_TYPE_UNKNOWN, - VKD3D_DESCRIPTOR_TYPE_CBV, /* cb# */ - VKD3D_DESCRIPTOR_TYPE_SRV, /* t# */ - VKD3D_DESCRIPTOR_TYPE_UAV, /* u# */ - VKD3D_DESCRIPTOR_TYPE_SAMPLER, /* s# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN, + VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, /* cb# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SRV, /* t# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_UAV, /* u# */ + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, /* s# */ }; struct vkd3d_shader_descriptor_binding @@ -65,7 +65,7 @@ struct vkd3d_shader_descriptor_binding struct vkd3d_shader_resource_binding { - enum vkd3d_descriptor_type type; + enum vkd3d_shader_descriptor_type type; unsigned int register_index; bool is_buffer; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 19dd3d9b..8d4e271a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1902,26 +1902,26 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor enum vkd3d_shader_resource_type resource_type) { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + enum vkd3d_shader_descriptor_type descriptor_type; struct vkd3d_shader_descriptor_binding vk_binding; - enum vkd3d_descriptor_type descriptor_type; unsigned int reg_idx = reg->idx[0].offset; bool is_buffer_resource; unsigned int i; - descriptor_type = VKD3D_DESCRIPTOR_TYPE_UNKNOWN; + descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; if (reg->type == VKD3DSPR_CONSTBUFFER) - descriptor_type = VKD3D_DESCRIPTOR_TYPE_CBV; + descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; else if (reg->type == VKD3DSPR_RESOURCE) - descriptor_type = VKD3D_DESCRIPTOR_TYPE_SRV; + descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; else if (reg->type == VKD3DSPR_UAV) - descriptor_type = VKD3D_DESCRIPTOR_TYPE_UAV; + descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; else if (reg->type == VKD3DSPR_SAMPLER) - descriptor_type = VKD3D_DESCRIPTOR_TYPE_SAMPLER; + descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; else FIXME("Unhandled register type %#x.\n", reg->type); is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; - if (descriptor_type != VKD3D_DESCRIPTOR_TYPE_UNKNOWN) + if (descriptor_type != VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN) { for (i = 0; i < shader_interface->binding_count; ++i) { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 85643dee..c00ec023 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -258,38 +258,39 @@ static VkDescriptorType vk_descriptor_type_from_d3d12_root_parameter(D3D12_ROOT_ } } -static enum vkd3d_descriptor_type vkd3d_descriptor_type_from_d3d12_range_type(D3D12_DESCRIPTOR_RANGE_TYPE type) +static enum vkd3d_shader_descriptor_type vkd3d_descriptor_type_from_d3d12_range_type( + D3D12_DESCRIPTOR_RANGE_TYPE type) { switch (type) { case D3D12_DESCRIPTOR_RANGE_TYPE_SRV: - return VKD3D_DESCRIPTOR_TYPE_SRV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; case D3D12_DESCRIPTOR_RANGE_TYPE_UAV: - return VKD3D_DESCRIPTOR_TYPE_UAV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; case D3D12_DESCRIPTOR_RANGE_TYPE_CBV: - return VKD3D_DESCRIPTOR_TYPE_CBV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; case D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER: - return VKD3D_DESCRIPTOR_TYPE_SAMPLER; + return VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER; default: FIXME("Unhandled descriptor range type type %#x.\n", type); - return VKD3D_DESCRIPTOR_TYPE_SRV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; } } -static enum vkd3d_descriptor_type vkd3d_descriptor_type_from_d3d12_root_parameter_type( +static enum vkd3d_shader_descriptor_type vkd3d_descriptor_type_from_d3d12_root_parameter_type( D3D12_ROOT_PARAMETER_TYPE type) { switch (type) { case D3D12_ROOT_PARAMETER_TYPE_SRV: - return VKD3D_DESCRIPTOR_TYPE_SRV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; case D3D12_ROOT_PARAMETER_TYPE_UAV: - return VKD3D_DESCRIPTOR_TYPE_UAV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_UAV; case D3D12_ROOT_PARAMETER_TYPE_CBV: - return VKD3D_DESCRIPTOR_TYPE_CBV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; default: FIXME("Unhandled descriptor root parameter type %#x.\n", type); - return VKD3D_DESCRIPTOR_TYPE_SRV; + return VKD3D_SHADER_DESCRIPTOR_TYPE_SRV; } } @@ -593,7 +594,7 @@ struct vkd3d_descriptor_set_context }; static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature *root_signature, - enum vkd3d_descriptor_type descriptor_type, unsigned int register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int register_idx, bool buffer_descriptor, struct vkd3d_descriptor_set_context *context) { unsigned int i = context->descriptor_index++; @@ -606,16 +607,16 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, - enum vkd3d_descriptor_type descriptor_type, unsigned int base_register_idx, + enum vkd3d_shader_descriptor_type descriptor_type, unsigned int base_register_idx, unsigned int binding_count, bool is_buffer_descriptor, bool duplicate_descriptors, struct vkd3d_descriptor_set_context *context) { uint32_t first_binding; unsigned int i; - is_buffer_descriptor |= descriptor_type == VKD3D_DESCRIPTOR_TYPE_CBV; - duplicate_descriptors = (descriptor_type == VKD3D_DESCRIPTOR_TYPE_SRV - || descriptor_type == VKD3D_DESCRIPTOR_TYPE_UAV) + is_buffer_descriptor |= descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; + duplicate_descriptors = (descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + || descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) && duplicate_descriptors; first_binding = context->descriptor_binding; @@ -782,7 +783,7 @@ static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signa return hr; cur_binding->binding = d3d12_root_signature_assign_vk_bindings(root_signature, - VKD3D_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, context); + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, s->ShaderRegister, 1, false, false, context); cur_binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; cur_binding->descriptorCount = 1; cur_binding->stageFlags = stage_flags_from_visibility(s->ShaderVisibility);