Conor McCarthy : vkd3d-shader/spirv: Introduce a UINT64 component type.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 13459a55f148b88a33e726d2bbf250bb989a219d
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/13459a55f148b88a33e726d2bbf250...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Tue Nov 21 16:43:36 2023 +1000

vkd3d-shader/spirv: Introduce a UINT64 component type.

---

 include/vkd3d_shader.h                   | 2 ++
 libs/vkd3d-shader/spirv.c                | 6 +++++-
 libs/vkd3d-shader/vkd3d_shader_private.h | 4 +++-
 tests/hlsl/bitwise.shader_test           | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index a6bf8964..b1a1fff6 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -1569,6 +1569,8 @@ enum vkd3d_shader_component_type
     VKD3D_SHADER_COMPONENT_BOOL     = 0x4,
     /** 64-bit IEEE floating-point. */
     VKD3D_SHADER_COMPONENT_DOUBLE   = 0x5,
+    /** 64-bit unsigned integer. \since 1.11 */
+    VKD3D_SHADER_COMPONENT_UINT64   = 0x6,
 
     VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPONENT_TYPE),
 };
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 585fc862..b5316b7d 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -1797,6 +1797,8 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder,
                 break;
             case VKD3D_SHADER_COMPONENT_DOUBLE:
                 return vkd3d_spirv_get_op_type_float(builder, 64);
+            case VKD3D_SHADER_COMPONENT_UINT64:
+                return vkd3d_spirv_get_op_type_int(builder, 64, 0);
             default:
                 FIXME("Unhandled component type %#x.\n", component_type);
                 return 0;
@@ -1830,6 +1832,8 @@ static uint32_t vkd3d_spirv_get_type_id_for_data_type(struct vkd3d_spirv_builder
                 break;
             case VKD3D_DATA_DOUBLE:
                 return vkd3d_spirv_get_op_type_float(builder, 64);
+            case VKD3D_DATA_UINT64:
+                return vkd3d_spirv_get_op_type_int(builder, 64, 0);
             case VKD3D_DATA_BOOL:
                 return vkd3d_spirv_get_op_type_bool(builder);
             default:
@@ -2988,7 +2992,7 @@ static uint32_t spirv_compiler_get_constant64(struct spirv_compiler *compiler,
     assert(0 < component_count && component_count <= VKD3D_DVEC2_SIZE);
     type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count);
 
-    if (component_type != VKD3D_SHADER_COMPONENT_DOUBLE)
+    if (component_type != VKD3D_SHADER_COMPONENT_DOUBLE && component_type != VKD3D_SHADER_COMPONENT_UINT64)
     {
         FIXME("Unhandled component_type %#x.\n", component_type);
         return vkd3d_spirv_get_op_undef(builder, type_id);
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index a49b21d5..bd6aa086 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -622,7 +622,7 @@ static inline bool data_type_is_bool(enum vkd3d_data_type data_type)
 
 static inline bool data_type_is_64_bit(enum vkd3d_data_type data_type)
 {
-    return data_type == VKD3D_DATA_DOUBLE;
+    return data_type == VKD3D_DATA_DOUBLE || data_type == VKD3D_DATA_UINT64;
 }
 
 enum vsir_dimension
@@ -1460,6 +1460,8 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty
             return VKD3D_SHADER_COMPONENT_INT;
         case VKD3D_DATA_DOUBLE:
             return VKD3D_SHADER_COMPONENT_DOUBLE;
+        case VKD3D_DATA_UINT64:
+            return VKD3D_SHADER_COMPONENT_UINT64;
         case VKD3D_DATA_BOOL:
             return VKD3D_SHADER_COMPONENT_BOOL;
         default:
diff --git a/tests/hlsl/bitwise.shader_test b/tests/hlsl/bitwise.shader_test
index 7b5b4f6b..7fc8f744 100644
--- a/tests/hlsl/bitwise.shader_test
+++ b/tests/hlsl/bitwise.shader_test
@@ -244,4 +244,4 @@ float4 main() : sv_target
 [test]
 uniform 0 uint64_t2 0x300000000 0x500000000
 draw quad
-todo probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1
+probe all rgba (25769803776.0, 4294967296.0, 30064771072.0, 1.844674404e19) 1