vkd3d-shader/glsl: Implement support for VKD3DSPR_CONSTBUFFER registers.

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

tests/hlsl/array-size-expr.shader_test

@@ -88,5 +88,5 @@ uniform 4 float 0.0
 uniform 8 float 0.0
 uniform 12 float 0.0
 uniform 16 float 42.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (42, 42, 42, 42)

tests/hlsl/asfloat.shader_test

@@ -20,7 +20,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 123.0 -2.0 456 0.01
-todo(glsl) draw quad
+draw quad
 probe (320,240) rgba (123.0, -2.0, 456.0, 0.01)
 
 [pixel shader]

tests/hlsl/cbuffer.shader_test

@@ -13,7 +13,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 [pixel shader fail(sm>=6)]
@@ -61,7 +61,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 [pixel shader fail(sm>=6)]
@@ -83,7 +83,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 [pixel shader]
@@ -97,7 +97,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 [pixel shader fail]
@@ -150,7 +150,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
 uniform 12 float4 12.0 13.0 14.0 15.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 2.0, 4.0, 8.0)
 
 
@@ -171,7 +171,7 @@ float4 main() : sv_target
 uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 4.0, 8.0, 9.0)
 
 
@@ -197,7 +197,7 @@ uniform 0 float4 0.0 1.0 2.0 3.0
 uniform 4 float4 4.0 5.0 6.0 7.0
 uniform 8 float4 8.0 9.0 10.0 11.0
 uniform 12 float4 12.0 13.0 14.0 15.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 4.0, 5.0, 6.0)
 
 
@@ -299,7 +299,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (2.0, 3.0, 2.0, 3.0)
 
 
@@ -435,7 +435,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (3.0, 4.0, 3.0, 4.0)
 
 
@@ -775,7 +775,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 0.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 [pixel shader fail(sm<6)]
@@ -925,7 +925,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 [pixel shader fail todo]

tests/hlsl/default-values.shader_test

@@ -17,7 +17,7 @@ if(sm<4)  uniform 8 float4 10 20 0 0
 if(sm>=4) uniform 0 float4 10 20 0 0
 if(sm>=4) uniform 4 float4 10 30 50 70
 if(sm>=4) uniform 8 float4 20 40 60 80
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (10, 20, 50, 60)
 
 
@@ -57,7 +57,7 @@ float4 main() : sv_target { return b; }
 
 [test]
 uniform 0 float4 10.0 20.0 30.0 40.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (10, 20, 30, 40)
 
 
@@ -134,7 +134,7 @@ if(sm<4)  uniform 8 float4 10 20 0 0
 if(sm>=4) uniform 0 float4 10 20 0 0
 if(sm>=4) uniform 4 float4 10 30 50 70
 if(sm>=4) uniform 8 float4 20 40 60 80
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (10, 20, 50, 60)
 
 
@@ -170,7 +170,7 @@ float4 main() : sv_target { return b; }
 
 [test]
 uniform 0 float4 10 20 30 40
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (10, 20, 30, 40)
 
 

tests/hlsl/determinant.shader_test

@@ -8,7 +8,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 9.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (9.0, 9.0, 9.0, 9.0)
 
 [pixel shader]
@@ -21,7 +21,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 
 [pixel shader]
@@ -49,7 +49,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 
 [pixel shader]

tests/hlsl/expr-indexing.shader_test

@@ -40,7 +40,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (3.0, 3.0, 3.0, 3.0)
 
 
@@ -78,7 +78,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (4.0, 4.0, 4.0, 4.0)
 
 

tests/hlsl/half.shader_test

@@ -19,5 +19,5 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float 10.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0)

tests/hlsl/majority-pragma.shader_test

@@ -40,7 +40,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 
 
@@ -61,7 +61,7 @@ uniform  0 float4 0.0 0.0 0.0 0.0
 uniform  4 float4 0.0 0.0 0.0 0.0
 uniform  8 float4 0.5 0.6 0.0 0.0
 uniform 12 float4 0.7 0.8 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.6, 0.7, 0.8)
 
 
@@ -112,7 +112,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 
 
@@ -150,7 +150,7 @@ uniform  0 float4 0.3 0.4 0.0 0.0
 uniform  4 float4 0.0 0.0 0.0 0.0
 uniform  8 float4 0.0 0.0 0.0 0.0
 uniform 12 float4 0.5 0.6 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6)
 
 
@@ -174,7 +174,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 
 
@@ -202,7 +202,7 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.2 0.4 0.0 0.0
 uniform  4 float4 0.3 0.5 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.2, 0.3, 0.4, 0.5)
 
 
@@ -222,7 +222,7 @@ uniform  0 float4 0.3 0.0 0.0 0.0
 uniform  4 float4 0.4 0.0 0.0 0.0
 uniform  8 float4 0.0 0.5 0.0 0.0
 uniform 12 float4 0.0 0.6 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.3, 0.4, 0.5, 0.6)
 
 % Compiler options
@@ -246,7 +246,7 @@ uniform  0 float4 0.1 0.5 0.9 1.3
 uniform  4 float4 0.2 0.6 1.0 1.4
 uniform  8 float4 0.3 0.7 1.1 1.5
 uniform 12 float4 0.4 0.8 1.2 1.6
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1
 
 [require]
@@ -268,7 +268,7 @@ uniform  0 float4 0.1 0.5 0.9 1.3
 uniform  4 float4 0.2 0.6 1.0 1.4
 uniform  8 float4 0.3 0.7 1.1 1.5
 uniform 12 float4 0.4 0.8 1.2 1.6
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.2, 0.3, 0.6, 0.7) 1
 
 [require]
@@ -290,7 +290,7 @@ uniform  0 float4 0.1 0.5 0.9 1.3
 uniform  4 float4 0.2 0.6 1.0 1.4
 uniform  8 float4 0.3 0.7 1.1 1.5
 uniform 12 float4 0.4 0.8 1.2 1.6
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.9, 0.6, 1.0) 1
 
 [require]
@@ -318,7 +318,7 @@ uniform 16 float4 1.7 2.1 2.5 2.9
 uniform 20 float4 1.8 2.2 2.6 3.0
 uniform 24 float4 1.9 2.3 2.7 3.1
 uniform 28 float4 2.0 2.4 2.8 3.2
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.3, 0.4, 2.5, 2.9) 1
 
 [require]
@@ -346,7 +346,7 @@ uniform 16 float4 1.7 2.1 2.5 2.9
 uniform 20 float4 1.8 2.2 2.6 3.0
 uniform 24 float4 1.9 2.3 2.7 3.1
 uniform 28 float4 2.0 2.4 2.8 3.2
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.2, 1.6, 3.1, 3.2) 1
 
 [require]
@@ -366,5 +366,5 @@ float4 main() : sv_target
 [test]
 uniform  0 float4 0.1 0.2 0.0 0.0
 uniform  4 float4 0.3 0.4 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.3, 0.2, 0.4) 1

tests/hlsl/majority-syntax.shader_test

@@ -11,7 +11,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.1 0.3 0.0 0.0
 uniform 4 float4 0.2 0.4 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.3, 0.2, 0.4)
 
 [pixel shader fail(sm<6)]

tests/hlsl/matrix-indexing.shader_test

@@ -11,7 +11,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 10.0, 15.0)
 
 [pixel shader]
@@ -27,7 +27,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 10.0, 15.0)
 
 [pixel shader]
@@ -43,7 +43,7 @@ uniform 0 float4 1.0 2.0 3.0 4.0
 uniform 4 float4 5.0 6.0 7.0 8.0
 uniform 8 float4 9.0 10.0 11.0 12.0
 uniform 12 float4 13.0 14.0 15.0 16.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 5.0, 7.0, 12.0)
 
 [pixel shader]
@@ -58,7 +58,7 @@ float4 main() : SV_TARGET
 [test]
 uniform 0 float4 1.0 2.0 3.0 0.0
 uniform 4 float4 5.0 6.0 7.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 3.0, 6.0, 7.0)
 
 [pixel shader]

tests/hlsl/nested-arrays.shader_test

@@ -21,5 +21,5 @@ uniform  8 float4 0.3 0.0 0.0 0.0
 uniform 12 float4 0.4 0.0 0.0 0.0
 uniform 16 float4 0.5 0.0 0.0 0.0
 uniform 20 float4 0.6 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.4, 0.1, 0.6, 0.3)

tests/hlsl/precise-modifier.shader_test

@@ -9,7 +9,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 0.1 0.2 0.3 0.4
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 
 [pixel shader fail(sm>=6)]
@@ -23,7 +23,7 @@ precise main() : sv_target
 
 [test]
 uniform 0 float4 0.1 0.2 0.3 0.4
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)
 
 [pixel shader]
@@ -37,5 +37,5 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 0.1 0.2 0.3 0.4
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.1, 0.2, 0.3, 0.4)

tests/hlsl/register-reservations-numeric.shader_test

@@ -56,7 +56,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 0.1 0.2 0.3 0.4
 uniform 4 float4 1.1 1.2 1.3 1.4
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.1, 1.4, 0.2, 0.3)
 
 
@@ -75,7 +75,7 @@ uniform 4 float4 1.1 1.2 1.3 1.4
 uniform 8 float4 2.1 2.2 2.3 2.4
 uniform 12 float4 3.1 3.2 3.3 3.4
 uniform 16 float4 4.1 4.2 4.3 4.4
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (4.1, 4.2, 1.3, 1.4)
 
 
@@ -207,7 +207,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 100
 uniform 4 float 101
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (100, 100, 100, 100)
 
 
@@ -221,7 +221,7 @@ float4 main(uniform float a : register(c1)) : sv_target
 [test]
 uniform 0 float 100
 uniform 4 float 101
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (100, 100, 100, 100)
 
 [pixel shader todo]
@@ -326,7 +326,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float 1.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 
 [pixel shader]
@@ -341,7 +341,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 1.0
 uniform 4 float 2.0
-todo(glsl) draw quad
+draw quad
 if(sm<6) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0)
 if(sm>=6) probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0)
 
@@ -357,7 +357,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 0.0
 uniform 4 float 1.0
-todo(glsl) draw quad
+draw quad
 if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
@@ -373,7 +373,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 0.0
 uniform 4 float 1.0
-todo(glsl) draw quad
+draw quad
 if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
@@ -389,7 +389,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 0.0
 uniform 4 float 1.0
-todo(glsl) draw quad
+draw quad
 if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
@@ -404,7 +404,7 @@ float4 main() : sv_target
 
 [test]
 uniform 4 float 1.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0)
 
 % Weird FXC behavior.
@@ -420,7 +420,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float 1.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0)
 
 % Testing other reservation types. This is a parse failure, i.e "X3530: register sa not valid"
@@ -460,7 +460,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float 0.0
 uniform 4 float 2.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0)
 
 [require]

tests/hlsl/struct-array.shader_test

@@ -18,5 +18,5 @@ float4 main() : sv_target
 uniform 0 float4 0.1 0.2 0.0 0.0
 uniform 4 float4 0.3 0.4 0.0 0.0
 uniform 8 float4 0.5 0.6 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.2, 0.3, 0.6, 0.5)

tests/hlsl/swizzle-matrix.shader_test

@@ -9,7 +9,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 11 21 31 -1
 uniform 4 float4 12 22 32 -1
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (21.0, 31.0, 11.0, 12.0)
 
 
@@ -24,7 +24,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 11 21 31 -1
 uniform 4 float4 12 22 32 -1
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (11.0, 31.0, 12.0, 32.0)
 
 
@@ -40,7 +40,7 @@ float4 main() : sv_target
 uniform 0 float4 11 12 -1 -1
 uniform 4 float4 21 22 -1 -1
 uniform 8 float4 31 32 -1 -1
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (11.0, 31.0, 12.0, 32.0)
 
 

tests/hlsl/swizzles.shader_test

@@ -149,7 +149,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 
@@ -166,5 +166,5 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 4.0, 2.0, 3.0)

tests/hlsl/uniform-parameters.shader_test

@@ -18,7 +18,7 @@ float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv
 
 [test]
 uniform 0 float4 123.0 -2.0 456 0.01
-todo(glsl) draw quad
+draw quad
 probe (320,240) rgba (123.0, -2.0, 456.0, 0.01)
 
 [pixel shader]

tests/hlsl/uniform-semantics.shader_test

@@ -10,7 +10,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float 3.5
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (3.5, 3.5, 3.5, 3.5)
 
 
@@ -24,5 +24,5 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 4.0 5.0 6.0 7.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (4.0, 5.0, 4.0, 5.0)

tests/hlsl/vector-indexing.shader_test

@@ -23,7 +23,7 @@ float4 main() : SV_TARGET
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 2.0, 3.0)