vkd3d-shader/msl: Implement support for VSIR_DIMENSION_VEC4 immediate constants.

Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1274

libs/vkd3d-shader/msl.c

@@ -176,6 +176,33 @@ static void msl_print_register_name(struct vkd3d_string_buffer *buffer,
                     }
                     break;
 
+                case VSIR_DIMENSION_VEC4:
+                    switch (reg->data_type)
+                    {
+                        case VKD3D_DATA_INT:
+                            vkd3d_string_buffer_printf(buffer, "as_type<int4>(uint4(%#xu, %#xu, %#xu, %#xu))",
+                                    reg->u.immconst_u32[0], reg->u.immconst_u32[1],
+                                    reg->u.immconst_u32[2], reg->u.immconst_u32[3]);
+                            break;
+                        case VKD3D_DATA_UINT:
+                            vkd3d_string_buffer_printf(buffer, "uint4(%#xu, %#xu, %#xu, %#xu)",
+                                    reg->u.immconst_u32[0], reg->u.immconst_u32[1],
+                                    reg->u.immconst_u32[2], reg->u.immconst_u32[3]);
+                            vkd3d_string_buffer_printf(buffer, "%#xu", reg->u.immconst_u32[0]);
+                            break;
+                        case VKD3D_DATA_FLOAT:
+                            vkd3d_string_buffer_printf(buffer, "as_type<float4>(uint4(%#xu, %#xu, %#xu, %#xu))",
+                                    reg->u.immconst_u32[0], reg->u.immconst_u32[1],
+                                    reg->u.immconst_u32[2], reg->u.immconst_u32[3]);
+                            break;
+                        default:
+                            msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
+                                    "Internal compiler error: Unhandled immconst datatype %#x.", reg->data_type);
+                            vkd3d_string_buffer_printf(buffer, "<unrecognised immconst datatype %#x>", reg->data_type);
+                            break;
+                    }
+                    break;
+
                 default:
                     vkd3d_string_buffer_printf(buffer, "<unhandled_dimension %#x>", reg->dimension);
                     msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,

tests/hlsl/all.shader_test

@@ -11,17 +11,17 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 -1.1 1.6 1.3 0.5
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 
 [test]
 uniform 0 float4 0.0 1.6 1.3 0.5
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
 [test]
 uniform 0 float4 1.0 0.0 1.3 0.5
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
 [pixel shader]

tests/hlsl/arithmetic-float.shader_test

@@ -8,7 +8,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (20.0, -10.0, 75.0, 0.33333333)
 
 [pixel shader]
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0)
 
 [pixel shader]
@@ -34,7 +34,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) 16
 
 [pixel shader]
@@ -47,7 +47,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
 [pixel shader]
@@ -60,7 +60,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, -2.1, 4.0, 0.0) 6
 
 [require]
@@ -77,5 +77,5 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1e99, 1e99, 1e99, 1e99)

tests/hlsl/arithmetic-int.shader_test

@@ -8,7 +8,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (20.0, -10.0, 75.0, 0.0)
 
 [pixel shader]
@@ -21,7 +21,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0)
 
 [pixel shader]
@@ -34,7 +34,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (8.0, -8.0, -8.0, 8.0)
 
 [pixel shader]
@@ -47,7 +47,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0)
 
 [pixel shader]
@@ -60,7 +60,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (9.0, -9.0, -9.0, 9.0)
 
 [pixel shader]
@@ -73,7 +73,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
 [pixel shader fail(sm<6)]
@@ -118,7 +118,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<6)  probe (0,0) rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0)
 if(sm>=6) probe (0,0) rgba (0.0, 0.0, 0.0, 0.0)
 
@@ -134,5 +134,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (2.0, 3.0, 1.0, 3.0)

tests/hlsl/arithmetic-uint.shader_test

@@ -11,7 +11,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (20.0, 4294967296.0, 75.0, 0.0)
 
 [pixel shader]
@@ -24,7 +24,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 5.0, 4294967296.0, 3.0)
 
 [pixel shader fail(sm<6)]

tests/hlsl/array-parameters.shader_test

@@ -12,7 +12,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (25.0, 25.0, 25.0, 25.0)
 
 
@@ -78,7 +78,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (15.0, 26.0, 37.0, 48.0)
 
 
@@ -153,7 +153,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (136.0, 136.0, 136.0, 136.0)
 
 
@@ -171,5 +171,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (702.0, 702.0, 702.0, 702.0)

tests/hlsl/array-size-expr.shader_test

@@ -14,7 +14,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (21, 22, 23, 24)
 
 
@@ -36,7 +36,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (61, 62, 63, 64)
 
 [pixel shader]
@@ -49,7 +49,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (2, 3, 6, 1)
 
 % Additional level of indirection
@@ -64,7 +64,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (2, 3, 6, 1)
 
 

tests/hlsl/bitwise-assignment.shader_test

@@ -100,5 +100,5 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (55, 183, -16760, 0)

tests/hlsl/bitwise.shader_test

@@ -11,7 +11,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 163840.0, 480.0)
 
 [pixel shader]
@@ -26,7 +26,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (-2147483648.0, 4.0, 2147483650.0, 4.0)
 
 [pixel shader]
@@ -41,7 +41,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 536870912.0, 1.0, 1073741824.0)
 
 [pixel shader]
@@ -54,7 +54,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 15.0, 10.0, -6.0)
 
 [pixel shader]
@@ -67,7 +67,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0)
 
 [pixel shader]
@@ -80,7 +80,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0)
 
 [pixel shader]
@@ -93,7 +93,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0)
 
 [pixel shader]
@@ -113,7 +113,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0)
 
 [pixel shader]
@@ -126,7 +126,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 163840.0, 480.0)
 
 [pixel shader fail]
@@ -157,7 +157,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 15.0, 10.0, 4294967296.0)
 
 [pixel shader]
@@ -170,7 +170,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 1.0)
 
 [pixel shader]
@@ -183,7 +183,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 1.0, 1.0, 1.0)
 
 [pixel shader]
@@ -196,7 +196,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 1.0, 1.0, 0.0)
 
 [rtv 0]

tests/hlsl/bool-cast.shader_test

@@ -10,7 +10,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 1.0, 1.0)
 
 

tests/hlsl/cast-broadcast.shader_test

@@ -19,7 +19,7 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (84.0, 84.0, 84.0, 84.0)
 
 
@@ -94,5 +94,5 @@ float4 main() : SV_TARGET
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (33.0, 33.0, 33.0, 33.0)

tests/hlsl/cast-componentwise-compatible.shader_test

@@ -16,7 +16,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0)
 
 
@@ -39,7 +39,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0)
 
 
@@ -55,7 +55,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 
@@ -86,7 +86,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (7.0, 7.0, 7.0, 7.0)
 
 
@@ -119,7 +119,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0)
 
 
@@ -159,7 +159,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (10.0, 20.0, 30.0, 30.0)
 
 
@@ -181,7 +181,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (10.0, 10.0, 11.4, 12.4)
 
 
@@ -197,7 +197,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (11.0, 12.0, 13.0, 14.0)
 
 
@@ -220,7 +220,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0)
 
 
@@ -236,7 +236,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (31.0, 32.0, 33.0, 33.0)
 
 
@@ -258,7 +258,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (41.0, 42.0, 43.0, 44.0)
 
 
@@ -297,7 +297,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (55.0, 56.0, 57.0, 58.0)
 
 
@@ -329,7 +329,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (61.0, 62.0, 63.0, 64.0)
 
 
@@ -355,7 +355,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (71.0, 72.0, 73.0, 74.0)
 
 
@@ -404,7 +404,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (81.0, 82.0, 83.0, 84.0)
 
 
@@ -420,7 +420,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (91.0, 92.0, 93.0, 0.0)
 
 
@@ -436,7 +436,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (11.0, 12.0, 13.0, 0.0)
 
 
@@ -477,7 +477,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (21.0, 22.0, 23.0, 24.0)
 
 
@@ -499,7 +499,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (31.0, 32.0, 33.0, 0.0)
 
 
@@ -521,7 +521,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (41.0, 42.0, 43.0, 0.0)
 
 
@@ -537,7 +537,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (51.0, 52.0, 53.0, 0.0)
 
 
@@ -564,7 +564,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (61.0, 62.0, 63.0, 0.0)
 
 
@@ -580,5 +580,5 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (71.0, 72.0, 73.0, 0.0)

tests/hlsl/cast-componentwise-equal.shader_test

@@ -50,7 +50,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 1.0)
 
 
@@ -89,7 +89,7 @@ float4 main() : sv_target
 
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 6.0, 7.0, 8.0)
 
 
@@ -120,7 +120,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0)
 
 
@@ -154,7 +154,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 5.0, 5.0, 5.0)
 
 
@@ -199,7 +199,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (71.0, 73.0, 73.0, 74.0)
 
 

tests/hlsl/cast-to-float.shader_test

@@ -33,5 +33,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5)

tests/hlsl/cast-to-half.shader_test

@@ -33,5 +33,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5)

tests/hlsl/cast-to-int.shader_test

@@ -61,6 +61,6 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4) todo probe (0,0) rgba (0.5, 4.2949673e+009, 0.5, 0.5)
 if(sm>=4) probe (0,0) rgba (0.5, 0.5, 0.5, 0.5)

tests/hlsl/cast-to-uint.shader_test

@@ -46,5 +46,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.5, 0.5, 0.5)

tests/hlsl/ceil.shader_test

@@ -5,7 +5,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 7.0, 8.0, 4.0) 4
 
 [pixel shader]

tests/hlsl/clamp.shader_test

@@ -24,7 +24,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5.5, 5.0, 4.2, 5.2)
 
 

tests/hlsl/comma.shader_test

@@ -6,5 +6,5 @@ float4 main(): sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.6, 0.7, 0.8, 0.9)