mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d-shader: Avoid uint32_t in public interface. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-10-29 11:12:18 +01:00 committed by Alexandre Julliard
parent 0f0af935a6
commit 34f61154f7
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/private/vkd3d_shader.h
View File

@ -19,8 +19,6 @@
#ifndef __VKD3D_SHADER_H
#define __VKD3D_SHADER_H
#include <stdint.h>
#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,

2
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -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)
{

2
programs/vkd3d-compiler/main.c
View File

@ -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)