diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c
index faeaeb649..4ecc99ced 100644
--- a/libs/vkd3d-shader/d3d_asm.c
+++ b/libs/vkd3d-shader/d3d_asm.c
@@ -402,7 +402,7 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum
         [VKD3D_DATA_UINT64   ] = "uint64",
         [VKD3D_DATA_BOOL     ] = "bool",
         [VKD3D_DATA_UINT16   ] = "uint16",
-        [VKD3D_DATA_HALF     ] = "half",
+        [VSIR_DATA_F16      ] = "half",
     };
 
     if (type < ARRAY_SIZE(data_type_names))
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 5214add1a..caad41d3d 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -2499,7 +2499,7 @@ static enum vsir_data_type vsir_data_type_from_dxil(const struct sm6_type *type)
         switch (type->u.width)
         {
             case 16:
-                return VKD3D_DATA_HALF;
+                return VSIR_DATA_F16;
             case 32:
                 return VKD3D_DATA_FLOAT;
             case 64:
@@ -2562,7 +2562,7 @@ static void register_convert_to_minimum_precision(struct vkd3d_shader_register *
 
     switch (reg->data_type)
     {
-        case VKD3D_DATA_HALF:
+        case VSIR_DATA_F16:
             reg->data_type = VKD3D_DATA_FLOAT;
             reg->precision = VKD3D_SHADER_REGISTER_PRECISION_MIN_FLOAT_16;
             if (reg->type == VKD3DSPR_IMMCONST)
@@ -3248,7 +3248,7 @@ static enum vkd3d_result value_allocate_constant_array(struct sm6_value *dst, co
     count = type->u.array.count;
     switch (icb->data_type)
     {
-        case VKD3D_DATA_HALF:
+        case VSIR_DATA_F16:
             for (i = 0; i < count; ++i)
                 icb->data[i] = half_to_float(operands[i]);
             icb->data_type = VKD3D_DATA_FLOAT;
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index bfe5966ca..3692c48be 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -8243,7 +8243,7 @@ static enum vsir_data_type vsir_data_type_from_hlsl_type(struct hlsl_ctx *ctx, c
             case HLSL_TYPE_FLOAT:
                 return VKD3D_DATA_FLOAT;
             case HLSL_TYPE_HALF:
-                return VKD3D_DATA_HALF;
+                return VSIR_DATA_F16;
             case HLSL_TYPE_INT:
                 return VKD3D_DATA_INT;
             case HLSL_TYPE_UINT:
diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index b467989ae..0235152ed 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -9777,7 +9777,7 @@ static void vsir_validate_dst_param(struct validation_context *ctx,
         {
             case VKD3D_DATA_FLOAT:
             case VKD3D_DATA_DOUBLE:
-            case VKD3D_DATA_HALF:
+            case VSIR_DATA_F16:
                 break;
 
             default:
@@ -9885,7 +9885,7 @@ static void vsir_validate_io_src_param(struct validation_context *ctx,
 
 #define F64_BIT (1u << VKD3D_DATA_DOUBLE)
 #define F32_BIT (1u << VKD3D_DATA_FLOAT)
-#define F16_BIT (1u << VKD3D_DATA_HALF)
+#define F16_BIT (1u << VSIR_DATA_F16)
 
 #define I32_BIT (1u << VKD3D_DATA_INT)
 
@@ -11287,7 +11287,7 @@ static void vsir_validate_ftoi(struct validation_context *ctx, const struct vkd3
     {
         [VKD3D_DATA_FLOAT] = true,
         [VKD3D_DATA_DOUBLE] = true,
-        [VKD3D_DATA_HALF] = true,
+        [VSIR_DATA_F16] = true,
     };
     static const bool dst_types[VSIR_DATA_TYPE_COUNT] =
     {
@@ -11304,7 +11304,7 @@ static void vsir_validate_ftou(struct validation_context *ctx, const struct vkd3
     {
         [VKD3D_DATA_FLOAT] = true,
         [VKD3D_DATA_DOUBLE] = true,
-        [VKD3D_DATA_HALF] = true,
+        [VSIR_DATA_F16] = true,
     };
     static const bool dst_types[VSIR_DATA_TYPE_COUNT] =
     {
@@ -11339,7 +11339,7 @@ static void vsir_validate_itof(struct validation_context *ctx, const struct vkd3
     {
         [VKD3D_DATA_FLOAT] = true,
         [VKD3D_DATA_DOUBLE] = true,
-        [VKD3D_DATA_HALF] = true,
+        [VSIR_DATA_F16] = true,
     };
 
     vsir_validate_cast_operation(ctx, instruction, src_types, dst_types);
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 950771bc5..69eec51a3 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -7592,7 +7592,7 @@ static void spirv_compiler_emit_bool_cast(struct spirv_compiler *compiler,
     VKD3D_ASSERT(src->reg.data_type == VKD3D_DATA_BOOL && dst->reg.data_type != VKD3D_DATA_BOOL);
 
     val_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask);
-    if (dst->reg.data_type == VKD3D_DATA_HALF || dst->reg.data_type == VKD3D_DATA_FLOAT)
+    if (dst->reg.data_type == VSIR_DATA_F16 || dst->reg.data_type == VKD3D_DATA_FLOAT)
     {
         val_id = spirv_compiler_emit_bool_to_float(compiler, 1, val_id, instruction->opcode == VSIR_OP_ITOF);
     }
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 29093df2a..05a6fe2b8 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -724,7 +724,8 @@ enum vsir_data_type
     VKD3D_DATA_UINT64,
     VKD3D_DATA_BOOL,
     VKD3D_DATA_UINT16,
-    VKD3D_DATA_HALF,
+
+    VSIR_DATA_F16,
 
     VSIR_DATA_TYPE_COUNT,
 };
@@ -742,7 +743,7 @@ static inline bool data_type_is_bool(enum vsir_data_type data_type)
 
 static inline bool data_type_is_floating_point(enum vsir_data_type data_type)
 {
-    return data_type == VKD3D_DATA_HALF || data_type == VKD3D_DATA_FLOAT || data_type == VKD3D_DATA_DOUBLE;
+    return data_type == VSIR_DATA_F16 || data_type == VKD3D_DATA_FLOAT || data_type == VKD3D_DATA_DOUBLE;
 }
 
 static inline bool data_type_is_64_bit(enum vsir_data_type data_type)
@@ -1789,7 +1790,7 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty
 {
     switch (data_type)
     {
-        case VKD3D_DATA_HALF: /* Minimum precision. TODO: native 16-bit */
+        case VSIR_DATA_F16: /* Minimum precision. TODO: native 16-bit */
         case VKD3D_DATA_FLOAT:
         case VKD3D_DATA_UNORM:
         case VKD3D_DATA_SNORM: