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

vkd3d-shader: Use uint32 for immediate constants 

DWORD and uint32_t are different types on Windows.
Fixes warnings.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2020-07-03 15:47:52 +01:00
parent d2643bd7fa
commit a950a342e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const v
void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader)
{ {
static int shader_id = 0; static LONG shader_id = 0;
static bool enabled = true; static bool enabled = true;
const char *path; const char *path;
@ -61,7 +61,7 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_type type, const struct vkd3d_sh
void vkd3d_shader_dump_spirv_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader) void vkd3d_shader_dump_spirv_shader(enum vkd3d_shader_type type, const struct vkd3d_shader_code *shader)
{ {
static int shader_id = 0; static LONG shader_id = 0;
static bool enabled = true; static bool enabled = true;
const char *path; const char *path;

4
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -559,7 +559,7 @@ struct vkd3d_shader_version
struct vkd3d_shader_immediate_constant_buffer struct vkd3d_shader_immediate_constant_buffer
{ {
unsigned int vec4_count; unsigned int vec4_count;
DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; uint32_t data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE];
}; };
struct vkd3d_shader_indexable_temp struct vkd3d_shader_indexable_temp
@ -585,7 +585,7 @@ struct vkd3d_shader_register
enum vkd3d_immconst_type immconst_type; enum vkd3d_immconst_type immconst_type;
union union
{ {
DWORD immconst_uint[VKD3D_VEC4_SIZE]; uint32_t immconst_uint[VKD3D_VEC4_SIZE];
float immconst_float[VKD3D_VEC4_SIZE]; float immconst_float[VKD3D_VEC4_SIZE];
unsigned fp_body_idx; unsigned fp_body_idx;
}; };