To VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, consistent with the structure name.
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d/state.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1f58ebd..09b77b2 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -30,7 +30,7 @@ extern "C" { enum vkd3d_shader_structure_type { /* 1.2 */ - VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 38cb2ee..0badd74 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -141,7 +141,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, info %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, info);
- if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) + if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO) { WARN("Invalid structure type %#x.\n", shader_interface_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3f158d0..16bce6b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1521,7 +1521,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; }
- shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -2229,7 +2229,7 @@ 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.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -2926,7 +2926,7 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d } }
- shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = &binding; shader_interface.binding_count = 1;