From ed695cc551914298b86e534ef97d3b1ea5dfadd5 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 21 Jul 2025 15:09:30 +0200 Subject: [PATCH] vkd3d-shader/ir: Rename VKD3D_DATA_SNORM to VSIR_DATA_SNORM. --- libs/vkd3d-shader/d3d_asm.c | 2 +- libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/glsl.c | 10 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/msl.c | 6 +++--- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 5e243591f..f60dff612 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -388,7 +388,6 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum { static const char *const data_type_names[] = { - [VKD3D_DATA_SNORM ] = "snorm", [VKD3D_DATA_OPAQUE ] = "opaque", [VKD3D_DATA_MIXED ] = "mixed", [VKD3D_DATA_CONTINUED] = "", @@ -402,6 +401,7 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum [VSIR_DATA_U16 ] = "uint16", [VSIR_DATA_U32 ] = "uint", [VSIR_DATA_U64 ] = "uint64", + [VSIR_DATA_SNORM ] = "snorm", [VSIR_DATA_UNORM ] = "unorm", }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index a29d31203..4828543eb 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -9052,9 +9052,9 @@ static const enum vsir_data_type data_type_table[] = [COMPONENT_TYPE_F16] = VSIR_DATA_F32, [COMPONENT_TYPE_F32] = VSIR_DATA_F32, [COMPONENT_TYPE_F64] = VSIR_DATA_F64, - [COMPONENT_TYPE_SNORMF16] = VKD3D_DATA_SNORM, + [COMPONENT_TYPE_SNORMF16] = VSIR_DATA_SNORM, [COMPONENT_TYPE_UNORMF16] = VSIR_DATA_UNORM, - [COMPONENT_TYPE_SNORMF32] = VKD3D_DATA_SNORM, + [COMPONENT_TYPE_SNORMF32] = VSIR_DATA_SNORM, [COMPONENT_TYPE_UNORMF32] = VSIR_DATA_UNORM, [COMPONENT_TYPE_SNORMF64] = VSIR_DATA_F64, [COMPONENT_TYPE_UNORMF64] = VSIR_DATA_F64, diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index eef91b53b..e57a4aa27 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -330,9 +330,9 @@ static void glsl_src_cleanup(struct glsl_src *src, struct vkd3d_string_buffer_ca static void shader_glsl_print_bitcast(struct vkd3d_string_buffer *dst, struct vkd3d_glsl_generator *gen, const char *src, enum vsir_data_type dst_data_type, enum vsir_data_type src_data_type, unsigned int size) { - if (dst_data_type == VSIR_DATA_UNORM || dst_data_type == VKD3D_DATA_SNORM) + if (dst_data_type == VSIR_DATA_UNORM || dst_data_type == VSIR_DATA_SNORM) dst_data_type = VSIR_DATA_F32; - if (src_data_type == VSIR_DATA_UNORM || src_data_type == VKD3D_DATA_SNORM) + if (src_data_type == VSIR_DATA_UNORM || src_data_type == VSIR_DATA_SNORM) src_data_type = VSIR_DATA_F32; if (dst_data_type == src_data_type) @@ -1175,8 +1175,8 @@ static void shader_glsl_store_uav_typed(struct vkd3d_glsl_generator *gen, const "Internal compiler error: Unhandled data type %#x.", data_type); /* fall through */ case VSIR_DATA_F32: + case VSIR_DATA_SNORM: case VSIR_DATA_UNORM: - case VKD3D_DATA_SNORM: vkd3d_string_buffer_printf(image_data, "vec4("); break; } @@ -1780,8 +1780,8 @@ static void shader_glsl_generate_uav_declaration(struct vkd3d_glsl_generator *ge uav->resource_data_type, uav->register_id); /* fall through */ case VSIR_DATA_F32: + case VSIR_DATA_SNORM: case VSIR_DATA_UNORM: - case VKD3D_DATA_SNORM: image_type_prefix = ""; read_format = "r32f"; break; @@ -1996,8 +1996,8 @@ static void shader_glsl_generate_sampler_declaration(struct vkd3d_glsl_generator switch (srv->resource_data_type) { case VSIR_DATA_F32: + case VSIR_DATA_SNORM: case VSIR_DATA_UNORM: - case VKD3D_DATA_SNORM: sampler_type_prefix = ""; break; case VSIR_DATA_I32: diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ff7ef7709..58e512bd3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -12192,7 +12192,7 @@ static enum vsir_data_type sm4_generate_vsir_get_format_type(const struct hlsl_t if (format->modifiers & HLSL_MODIFIER_UNORM) return VSIR_DATA_UNORM; if (format->modifiers & HLSL_MODIFIER_SNORM) - return VKD3D_DATA_SNORM; + return VSIR_DATA_SNORM; return VSIR_DATA_F32; case HLSL_TYPE_INT: diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c index 82582f9ee..d95b95f97 100644 --- a/libs/vkd3d-shader/msl.c +++ b/libs/vkd3d-shader/msl.c @@ -138,8 +138,8 @@ static void msl_print_resource_datatype(struct msl_generator *gen, switch (data_type) { case VSIR_DATA_F32: + case VSIR_DATA_SNORM: case VSIR_DATA_UNORM: - case VKD3D_DATA_SNORM: vkd3d_string_buffer_printf(buffer, "float"); break; case VSIR_DATA_I32: @@ -527,7 +527,7 @@ static void msl_print_bitcast(struct vkd3d_string_buffer *dst, struct msl_genera { bool write_cast = false; - if (dst_data_type == VSIR_DATA_UNORM || dst_data_type == VKD3D_DATA_SNORM) + if (dst_data_type == VSIR_DATA_UNORM || dst_data_type == VSIR_DATA_SNORM) dst_data_type = VSIR_DATA_F32; switch (src_data_type) @@ -1320,8 +1320,8 @@ static void msl_store_uav_typed(struct msl_generator *gen, const struct vkd3d_sh "Internal compiler error: Unhandled data type %#x.", data_type); /* fall through */ case VSIR_DATA_F32: + case VSIR_DATA_SNORM: case VSIR_DATA_UNORM: - case VKD3D_DATA_SNORM: vkd3d_string_buffer_printf(image_data, "float4("); break; } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 4d613224e..03724e7e0 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -752,7 +752,7 @@ static const enum vsir_data_type data_type_table[] = { /* 0 */ VSIR_DATA_F32, /* VKD3D_SM4_DATA_UNORM */ VSIR_DATA_UNORM, - /* VKD3D_SM4_DATA_SNORM */ VKD3D_DATA_SNORM, + /* VKD3D_SM4_DATA_SNORM */ VSIR_DATA_SNORM, /* VKD3D_SM4_DATA_INT */ VSIR_DATA_I32, /* VKD3D_SM4_DATA_UINT */ VSIR_DATA_U32, /* VKD3D_SM4_DATA_FLOAT */ VSIR_DATA_F32, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 188688d74..accbe6323 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1526,8 +1526,6 @@ static enum vkd3d_shader_resource_data_type vkd3d_resource_data_type_from_data_t { switch (data_type) { - case VKD3D_DATA_SNORM: - return VKD3D_SHADER_RESOURCE_DATA_SNORM; case VKD3D_DATA_MIXED: return VKD3D_SHADER_RESOURCE_DATA_MIXED; case VKD3D_DATA_CONTINUED: @@ -1542,6 +1540,8 @@ static enum vkd3d_shader_resource_data_type vkd3d_resource_data_type_from_data_t return VKD3D_SHADER_RESOURCE_DATA_INT; case VSIR_DATA_U32: return VKD3D_SHADER_RESOURCE_DATA_UINT; + case VSIR_DATA_SNORM: + return VKD3D_SHADER_RESOURCE_DATA_SNORM; case VSIR_DATA_UNORM: return VKD3D_SHADER_RESOURCE_DATA_UNORM; default: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index be4f53606..44cc67c0e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -710,7 +710,6 @@ enum vkd3d_shader_register_precision enum vsir_data_type { - VKD3D_DATA_SNORM, VKD3D_DATA_OPAQUE, VKD3D_DATA_MIXED, VKD3D_DATA_CONTINUED, @@ -728,6 +727,7 @@ enum vsir_data_type VSIR_DATA_U32, VSIR_DATA_U64, + VSIR_DATA_SNORM, VSIR_DATA_UNORM, VSIR_DATA_TYPE_COUNT, @@ -1807,8 +1807,8 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty { case VSIR_DATA_F16: /* Minimum precision. TODO: native 16-bit */ case VSIR_DATA_F32: + case VSIR_DATA_SNORM: case VSIR_DATA_UNORM: - case VKD3D_DATA_SNORM: return VKD3D_SHADER_COMPONENT_FLOAT; case VSIR_DATA_F64: return VKD3D_SHADER_COMPONENT_DOUBLE;