From a3ad7cae90a55b4efc97f79a0ef5594092681c72 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Mon, 19 Apr 2021 17:35:12 +0100 Subject: [PATCH] vkd3d-shader: Remove type/next from interface structures This was never really used for anything useful. Signed-off-by: Joshua Ashton --- include/vkd3d_shader.h | 16 ---------------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ------------ libs/vkd3d-shader/vkd3d_shader_private.h | 21 --------------------- libs/vkd3d/raytracing_pipeline.c | 2 -- libs/vkd3d/state.c | 6 ------ tests/vkd3d_shader_api.c | 1 - 6 files changed, 58 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 5fd9ba50..810cb0c0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -31,17 +31,6 @@ extern "C" { #endif /* __cplusplus */ -enum vkd3d_shader_structure_type -{ - /* 1.2 */ - VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, - VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, - VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, - VKD3D_SHADER_STRUCTURE_TYPE_DOMAIN_SHADER_COMPILE_ARGUMENTS, - - VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), -}; - enum vkd3d_shader_compiler_option { VKD3D_SHADER_STRIP_DEBUG = 0x00000001, @@ -195,8 +184,6 @@ enum vkd3d_shader_interface_flag struct vkd3d_shader_interface_info { - enum vkd3d_shader_structure_type type; - const void *next; unsigned int flags; /* vkd3d_shader_interface_flags */ unsigned int min_ssbo_alignment; @@ -293,9 +280,6 @@ enum vkd3d_shader_target_extension struct vkd3d_shader_compile_arguments { - enum vkd3d_shader_structure_type type; - const void *next; - enum vkd3d_shader_target target; unsigned int target_extension_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index b1baca49..afb8d818 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -213,12 +213,6 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ if (!compile_args) return VKD3D_OK; - if (compile_args->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS) - { - WARN("Invalid structure type %#x.\n", compile_args->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - switch (compile_args->target) { case VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0: @@ -340,12 +334,6 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, compile_args %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, compile_args); - if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) - { - WARN("Invalid structure type %#x.\n", shader_interface_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e21c7575..bdecbba9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -904,27 +904,6 @@ static inline unsigned int vkd3d_compact_swizzle(unsigned int swizzle, unsigned return compacted_swizzle; } -struct vkd3d_struct -{ - enum vkd3d_shader_structure_type type; - const void *next; -}; - -#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_SHADER_STRUCTURE_TYPE_##t) -static inline const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, - enum vkd3d_shader_structure_type type) -{ - while (chain) - { - if (chain->type == type) - return chain; - - chain = chain->next; - } - - return NULL; -} - #define VKD3D_DXBC_MAX_SOURCE_COUNT 6 #define VKD3D_DXBC_HEADER_SIZE (8 * sizeof(uint32_t)) diff --git a/libs/vkd3d/raytracing_pipeline.c b/libs/vkd3d/raytracing_pipeline.c index 95337e9c..7fcb1683 100644 --- a/libs/vkd3d/raytracing_pipeline.c +++ b/libs/vkd3d/raytracing_pipeline.c @@ -864,7 +864,6 @@ static HRESULT d3d12_state_object_compile_pipeline(struct d3d12_state_object *ob static const VkDynamicState dynamic_states[] = { VK_DYNAMIC_STATE_RAY_TRACING_PIPELINE_STACK_SIZE_KHR }; memset(&compile_args, 0, sizeof(compile_args)); - compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; compile_args.target_extensions = object->device->vk_info.shader_extensions; compile_args.target_extension_count = object->device->vk_info.shader_extension_count; compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; @@ -872,7 +871,6 @@ static HRESULT d3d12_state_object_compile_pipeline(struct d3d12_state_object *ob /* TODO: Allow different root signatures per module. */ memset(&shader_interface_info, 0, sizeof(shader_interface_info)); - shader_interface_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; shader_interface_info.min_ssbo_alignment = d3d12_device_get_ssbo_alignment(object->device); /* Effectively ignored. */ diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2701d1cf..f9dde6b0 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2083,7 +2083,6 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, HRESULT hr; memset(&compile_args, 0, sizeof(compile_args)); - compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; compile_args.target_extensions = device->vk_info.shader_extensions; compile_args.target_extension_count = device->vk_info.shader_extension_count; compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; @@ -2135,8 +2134,6 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st else root_signature = unsafe_impl_from_ID3D12RootSignature(state->private_root_signature); - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; - shader_interface.next = NULL; shader_interface.flags = d3d12_root_signature_get_shader_interface_flags(root_signature); shader_interface.min_ssbo_alignment = d3d12_device_get_ssbo_alignment(device); shader_interface.descriptor_tables.offset = root_signature->descriptor_table_offset; @@ -2944,7 +2941,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_shader_parameters[0].immediate_constant.u32 = sample_count; memset(&compile_args, 0, sizeof(compile_args)); - compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; compile_args.target_extension_count = vk_info->shader_extension_count; compile_args.target_extensions = vk_info->shader_extensions; @@ -3017,8 +3013,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; - shader_interface.next = NULL; shader_interface.flags = d3d12_root_signature_get_shader_interface_flags(root_signature); shader_interface.min_ssbo_alignment = d3d12_device_get_ssbo_alignment(device); shader_interface.descriptor_tables.offset = root_signature->descriptor_table_offset; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index f9bec7e4..709a103f 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -123,7 +123,6 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_shader_code(&spirv); memset(&scan_info, 0, sizeof(scan_info)); - scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; rc = pfn_vkd3d_shader_scan_dxbc(&vs, &scan_info); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); }