From f74b56622a70da92b4525ede02569e5c152047d2 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@locutus.nl>
Date: Mon, 21 Jul 2025 15:17:51 +0200
Subject: [PATCH] vkd3d-shader/ir: Rename VKD3D_DATA_CONTINUED to
 VSIR_DATA_CONTINUED.

---
 libs/vkd3d-shader/d3d_asm.c              | 2 +-
 libs/vkd3d-shader/tpf.c                  | 2 +-
 libs/vkd3d-shader/vkd3d_shader_main.c    | 4 ++--
 libs/vkd3d-shader/vkd3d_shader_private.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c
index 50fe9ebdf..0dd5f2191 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_CONTINUED] = "<continued>",
         [VKD3D_DATA_UNUSED   ] = "<unused>",
         [VKD3D_DATA_BOOL     ] = "bool",
         [VSIR_DATA_F16      ] = "half",
@@ -403,6 +402,7 @@ static void shader_print_data_type(struct vkd3d_d3d_asm_compiler *compiler, enum
         [VSIR_DATA_UNORM    ] = "unorm",
         [VSIR_DATA_OPAQUE   ] = "opaque",
         [VSIR_DATA_MIXED    ] = "mixed",
+        [VSIR_DATA_CONTINUED] = "<continued>",
     };
 
     if (type < ARRAY_SIZE(data_type_names))
diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index bb095cb0e..52fe2b5cf 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -758,7 +758,7 @@ static const enum vsir_data_type data_type_table[] =
     /* VKD3D_SM4_DATA_FLOAT */      VSIR_DATA_F32,
     /* VKD3D_SM4_DATA_MIXED */      VSIR_DATA_MIXED,
     /* VKD3D_SM4_DATA_DOUBLE */     VSIR_DATA_F64,
-    /* VKD3D_SM4_DATA_CONTINUED */  VKD3D_DATA_CONTINUED,
+    /* VKD3D_SM4_DATA_CONTINUED */  VSIR_DATA_CONTINUED,
     /* VKD3D_SM4_DATA_UNUSED */     VKD3D_DATA_UNUSED,
 };
 
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 35c5ae2cf..13bff754f 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_CONTINUED:
-            return VKD3D_SHADER_RESOURCE_DATA_CONTINUED;
         case VKD3D_DATA_UNUSED:
             return VKD3D_SHADER_RESOURCE_DATA_NONE;
         case VSIR_DATA_F32:
@@ -1544,6 +1542,8 @@ static enum vkd3d_shader_resource_data_type vkd3d_resource_data_type_from_data_t
             return VKD3D_SHADER_RESOURCE_DATA_UNORM;
         case VSIR_DATA_MIXED:
             return VKD3D_SHADER_RESOURCE_DATA_MIXED;
+        case VSIR_DATA_CONTINUED:
+            return VKD3D_SHADER_RESOURCE_DATA_CONTINUED;
         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 f29bbbe7a..556c7b85c 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_CONTINUED,
     VKD3D_DATA_UNUSED,
     VKD3D_DATA_BOOL,
 
@@ -730,6 +729,7 @@ enum vsir_data_type
 
     VSIR_DATA_OPAQUE,
     VSIR_DATA_MIXED,
+    VSIR_DATA_CONTINUED,
 
     VSIR_DATA_TYPE_COUNT,
 };