diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c
index 5e3e7daab..5e243591f 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_UNORM    ] = "unorm",
         [VKD3D_DATA_SNORM    ] = "snorm",
         [VKD3D_DATA_OPAQUE   ] = "opaque",
         [VKD3D_DATA_MIXED    ] = "mixed",
@@ -403,6 +402,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_UNORM    ] = "unorm",
     };
 
     if (type < ARRAY_SIZE(data_type_names))
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index c3dd606f0..a29d31203 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -9053,9 +9053,9 @@ static const enum vsir_data_type data_type_table[] =
     [COMPONENT_TYPE_F32]         = VSIR_DATA_F32,
     [COMPONENT_TYPE_F64]         = VSIR_DATA_F64,
     [COMPONENT_TYPE_SNORMF16]    = VKD3D_DATA_SNORM,
-    [COMPONENT_TYPE_UNORMF16]    = VKD3D_DATA_UNORM,
+    [COMPONENT_TYPE_UNORMF16]    = VSIR_DATA_UNORM,
     [COMPONENT_TYPE_SNORMF32]    = VKD3D_DATA_SNORM,
-    [COMPONENT_TYPE_UNORMF32]    = VKD3D_DATA_UNORM,
+    [COMPONENT_TYPE_UNORMF32]    = VSIR_DATA_UNORM,
     [COMPONENT_TYPE_SNORMF64]    = VSIR_DATA_F64,
     [COMPONENT_TYPE_UNORMF64]    = VSIR_DATA_F64,
     [COMPONENT_TYPE_PACKEDS8X32] = VKD3D_DATA_UNUSED,
diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c
index dc68e1792..eef91b53b 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 == VKD3D_DATA_UNORM || dst_data_type == VKD3D_DATA_SNORM)
+    if (dst_data_type == VSIR_DATA_UNORM || dst_data_type == VKD3D_DATA_SNORM)
         dst_data_type = VSIR_DATA_F32;
-    if (src_data_type == VKD3D_DATA_UNORM || src_data_type == VKD3D_DATA_SNORM)
+    if (src_data_type == VSIR_DATA_UNORM || src_data_type == VKD3D_DATA_SNORM)
         src_data_type = VSIR_DATA_F32;
 
     if (dst_data_type == src_data_type)
@@ -1175,7 +1175,7 @@ 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 VKD3D_DATA_UNORM:
+            case VSIR_DATA_UNORM:
             case VKD3D_DATA_SNORM:
                 vkd3d_string_buffer_printf(image_data, "vec4(");
                 break;
@@ -1780,7 +1780,7 @@ 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 VKD3D_DATA_UNORM:
+        case VSIR_DATA_UNORM:
         case VKD3D_DATA_SNORM:
             image_type_prefix = "";
             read_format = "r32f";
@@ -1996,7 +1996,7 @@ static void shader_glsl_generate_sampler_declaration(struct vkd3d_glsl_generator
     switch (srv->resource_data_type)
     {
         case VSIR_DATA_F32:
-        case VKD3D_DATA_UNORM:
+        case VSIR_DATA_UNORM:
         case VKD3D_DATA_SNORM:
             sampler_type_prefix = "";
             break;
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index d4bcdf5c9..ff7ef7709 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -12190,7 +12190,7 @@ static enum vsir_data_type sm4_generate_vsir_get_format_type(const struct hlsl_t
         case HLSL_TYPE_FLOAT:
         case HLSL_TYPE_HALF:
             if (format->modifiers & HLSL_MODIFIER_UNORM)
-                return VKD3D_DATA_UNORM;
+                return VSIR_DATA_UNORM;
             if (format->modifiers & HLSL_MODIFIER_SNORM)
                 return VKD3D_DATA_SNORM;
             return VSIR_DATA_F32;
diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c
index ccfce0f45..82582f9ee 100644
--- a/libs/vkd3d-shader/msl.c
+++ b/libs/vkd3d-shader/msl.c
@@ -138,7 +138,7 @@ static void msl_print_resource_datatype(struct msl_generator *gen,
     switch (data_type)
     {
         case VSIR_DATA_F32:
-        case VKD3D_DATA_UNORM:
+        case VSIR_DATA_UNORM:
         case VKD3D_DATA_SNORM:
             vkd3d_string_buffer_printf(buffer, "float");
             break;
@@ -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 == VKD3D_DATA_UNORM || dst_data_type == VKD3D_DATA_SNORM)
+    if (dst_data_type == VSIR_DATA_UNORM || dst_data_type == VKD3D_DATA_SNORM)
         dst_data_type = VSIR_DATA_F32;
 
     switch (src_data_type)
@@ -1320,7 +1320,7 @@ 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 VKD3D_DATA_UNORM:
+            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 ad54a559c..4d613224e 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -751,7 +751,7 @@ static const enum vkd3d_shader_resource_type resource_type_table[] =
 static const enum vsir_data_type data_type_table[] =
 {
     /* 0 */                         VSIR_DATA_F32,
-    /* VKD3D_SM4_DATA_UNORM */      VKD3D_DATA_UNORM,
+    /* VKD3D_SM4_DATA_UNORM */      VSIR_DATA_UNORM,
     /* VKD3D_SM4_DATA_SNORM */      VKD3D_DATA_SNORM,
     /* VKD3D_SM4_DATA_INT */        VSIR_DATA_I32,
     /* VKD3D_SM4_DATA_UINT */       VSIR_DATA_U32,
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index b322071f2..188688d74 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_UNORM:
-            return VKD3D_SHADER_RESOURCE_DATA_UNORM;
         case VKD3D_DATA_SNORM:
             return VKD3D_SHADER_RESOURCE_DATA_SNORM;
         case VKD3D_DATA_MIXED:
@@ -1544,6 +1542,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_UNORM:
+            return VKD3D_SHADER_RESOURCE_DATA_UNORM;
         default:
             ERR("Invalid resource data type %#x.\n", data_type);
             return VKD3D_SHADER_RESOURCE_DATA_FLOAT;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index a1de5d59d..be4f53606 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_UNORM,
     VKD3D_DATA_SNORM,
     VKD3D_DATA_OPAQUE,
     VKD3D_DATA_MIXED,
@@ -729,6 +728,8 @@ enum vsir_data_type
     VSIR_DATA_U32,
     VSIR_DATA_U64,
 
+    VSIR_DATA_UNORM,
+
     VSIR_DATA_TYPE_COUNT,
 };
 
@@ -1806,7 +1807,7 @@ 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 VKD3D_DATA_UNORM:
+        case VSIR_DATA_UNORM:
         case VKD3D_DATA_SNORM:
             return VKD3D_SHADER_COMPONENT_FLOAT;
         case VSIR_DATA_F64: