From 34f61154f7bf6d2be6232495c9729b8017828b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Mon, 29 Oct 2018 11:12:18 +0100 Subject: [PATCH] vkd3d-shader: Avoid uint32_t in public interface. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- include/private/vkd3d_shader.h | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index bb137bab..e97e1851 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -79,8 +77,8 @@ enum vkd3d_shader_descriptor_type struct vkd3d_shader_descriptor_binding { - uint32_t set; - uint32_t binding; + unsigned int set; + unsigned int binding; }; enum vkd3d_shader_binding_flag @@ -168,7 +166,7 @@ struct vkd3d_shader_compile_arguments }; int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); @@ -370,7 +368,7 @@ struct vkd3d_shader_scan_info { unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - uint32_t sampler_comparison_mode_mask; + unsigned int sampler_comparison_mode_mask; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 71410f1d..f8132087 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -75,7 +75,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ } int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args) { diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5fe4540c..b3634352 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -107,7 +107,7 @@ struct options { const char *filename; const char *output_filename; - uint32_t compiler_options; + unsigned int compiler_options; }; static bool parse_command_line(int argc, char **argv, struct options *options)