wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Explicitly cast vkd3d_shader_global_flags to uint64_t.

Browse Source 
On macOS vkd3d_shader_global_flags has underlying type unsigned long,
while uint64_t is defined as unsigned long long. This difference
causes a few warnings to be raised.
This commit is contained in:
Giovanni Mascellani 2023-10-20 15:01:35 +02:00 committed by Alexandre Julliard
parent 2955232656
commit 0d4aebd2e7
Notes: Alexandre Julliard 2023-11-06 23:17:45 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/423
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,7 @@ static void shader_dump_global_flags(struct vkd3d_d3d_asm_compiler *compiler,
} }
if (global_flags) if (global_flags)
vkd3d_string_buffer_printf(&compiler->buffer, "unknown_flags(%#"PRIx64")", global_flags); vkd3d_string_buffer_printf(&compiler->buffer, "unknown_flags(%#"PRIx64")", (uint64_t)global_flags);
} }
static void shader_dump_sync_flags(struct vkd3d_d3d_asm_compiler *compiler, uint32_t sync_flags) static void shader_dump_sync_flags(struct vkd3d_d3d_asm_compiler *compiler, uint32_t sync_flags)

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

@ -4150,7 +4150,7 @@ static void sm6_parser_emit_global_flags(struct sm6_parser *sm6, const struct sm
enum vkd3d_shader_global_flags global_flags, mask, rotated_flags; enum vkd3d_shader_global_flags global_flags, mask, rotated_flags;
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
if (!sm6_metadata_get_uint64_value(sm6, m, &global_flags)) if (!sm6_metadata_get_uint64_value(sm6, m, (uint64_t*)&global_flags))
{ {
WARN("Failed to load global flags.\n"); WARN("Failed to load global flags.\n");
vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES,

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

@ -5425,9 +5425,9 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler
} }
if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS))
FIXME("Unhandled global flags %#"PRIx64".\n", flags); FIXME("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags);
else else
WARN("Unhandled global flags %#"PRIx64".\n", flags); WARN("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags);
} }
static void spirv_compiler_emit_temps(struct spirv_compiler *compiler, uint32_t count) static void spirv_compiler_emit_temps(struct spirv_compiler *compiler, uint32_t count)