wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Support relative addressing for indexable temps in SM4.

Browse Source 
For relative addressing, the vkd3d_shader_registers must point to
another vkd3d_shader_src_param. For now, use the sm4_instruction to save
them, since the only purpose of this struct is to be used as paramter
for write_sm4_instruction.
This commit is contained in:
Francisco Casas
2023-10-06 13:16:48 -03:00
committed by Alexandre Julliard
parent 281796c526
commit 0ef25ad137
Notes: Alexandre Julliard 2023-11-07 22:39:54 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/435
5 changed files with 123 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/hlsl/function-return.shader_test
View File

@@ -258,7 +258,7 @@ uniform 0 float 0.9
todo(sm>=6) draw quad
probe all rgba (0.4, 0.1, 0.7, 0.6) 1
[pixel shader todo]
[pixel shader]
uniform float4 f[3];
@@ -295,21 +295,21 @@ float4 main() : sv_target
uniform 0 float4 0.3 0.0 0.0 0.0
uniform 4 float4 0.0 0.0 0.0 0.0
uniform 8 float4 0.1 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.3, 0.2, 0.6, 0.6) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.3, 0.2, 0.6, 0.6) 1
uniform 4 float4 0.35 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.3, 0.3, 0.6, 0.6) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.3, 0.3, 0.6, 0.6) 1
uniform 8 float4 0.5 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.3, 0.5, 0.6, 0.6) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.3, 0.5, 0.6, 0.6) 1
uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.3, 0.5, 0.6, 0.6) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.3, 0.5, 0.6, 0.6) 1
uniform 4 float4 2.0 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.4, 0.1, 0.6, 0.6) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.4, 0.1, 0.6, 0.6) 1

6
tests/hlsl/matrix-indexing.shader_test
View File

@@ -124,7 +124,7 @@ todo(sm>=6) draw quad
probe all rgba (8, 9, 10, 11)
[pixel shader todo]
[pixel shader]
uniform float i;
float4 main() : sv_target
@@ -136,5 +136,5 @@ float4 main() : sv_target
[test]
uniform 0 float 3
todo draw quad
todo probe all rgba (12, 13, 14, 15)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (12, 13, 14, 15)

66
tests/hlsl/non-const-indexing.shader_test
View File

@@ -1,4 +1,4 @@
[pixel shader todo]
[pixel shader]
uniform float4 f[3];
uniform float2 i;
@@ -12,17 +12,17 @@ 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 0 0 0 0
todo draw quad
todo probe all rgba (1.0, 2.0, 3.0, 4.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (1.0, 2.0, 3.0, 4.0)
uniform 12 float4 1 0 0 0
todo draw quad
todo probe all rgba (5.0, 6.0, 7.0, 8.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (5.0, 6.0, 7.0, 8.0)
uniform 12 float4 0 1 0 0
todo draw quad
todo probe all rgba (5.0, 6.0, 7.0, 8.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (5.0, 6.0, 7.0, 8.0)
uniform 12 float4 1 1 0 0
todo draw quad
todo probe all rgba (9.0, 10.0, 11.0, 12.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (9.0, 10.0, 11.0, 12.0)
[pixel shader]
@@ -49,7 +49,7 @@ todo(sm>=6) draw quad
probe all rgba (14.0, 14.0, 14.0, 14.0)
[pixel shader todo]
[pixel shader]
float i;
float4 main() : sv_target
@@ -61,8 +61,8 @@ float4 main() : sv_target
[test]
uniform 0 float 2.3
todo draw quad
todo probe all rgba (3, 3, 3, 3)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (3, 3, 3, 3)
[pixel shader]
@@ -90,7 +90,7 @@ todo(sm>=6) draw quad
probe all rgba (24.0, 0.0, 21.0, 1.0)
[pixel shader todo]
[pixel shader]
uniform float2 i;
float4 main() : sv_target
@@ -102,20 +102,20 @@ float4 main() : sv_target
[test]
uniform 0 float4 0 0 0 0
todo draw quad
todo probe all rgba (1.0, 2.0, 3.0, 4.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (1.0, 2.0, 3.0, 4.0)
uniform 0 float4 1 0 0 0
todo draw quad
todo probe all rgba (5.0, 6.0, 7.0, 8.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (5.0, 6.0, 7.0, 8.0)
uniform 0 float4 0 1 0 0
todo draw quad
todo probe all rgba (5.0, 6.0, 7.0, 8.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (5.0, 6.0, 7.0, 8.0)
uniform 0 float4 1 1 0 0
todo draw quad
todo probe all rgba (9.0, 10.0, 11.0, 12.0)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (9.0, 10.0, 11.0, 12.0)
[pixel shader todo]
[pixel shader]
float4 a;
float4 main() : sv_target
@@ -130,7 +130,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 0 0 2.4 0
todo draw quad
todo(sm>=6) draw quad
probe all rgba (1.0, 120.0, 90.0, 4.0)
@@ -138,7 +138,7 @@ probe all rgba (1.0, 120.0, 90.0, 4.0)
[require]
shader model >= 4.0
[pixel shader todo]
[pixel shader]
int i, j;
float4 main() : sv_target
@@ -155,19 +155,19 @@ float4 main() : sv_target
[test]
uniform 0 int 0
uniform 1 int 0
todo draw quad
todo probe all rgba (100, 6, 7, 8)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (100, 6, 7, 8)
uniform 0 int 2
uniform 1 int 2
todo draw quad
todo probe all rgba (5, 6, 100, 8)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (5, 6, 100, 8)
uniform 0 int 1
uniform 1 int 3
todo draw quad
todo probe all rgba (5, 6, 7, 4)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (5, 6, 7, 4)
[pixel shader todo]
[pixel shader]
float a, b, c, d;
float e, f, g, h;
int i, j;
@@ -192,5 +192,5 @@ uniform 0 float4 1 2 3 4
uniform 4 float4 5 6 7 8
uniform 8 int 3
uniform 9 int 4
todo draw quad
todo probe all rgba (1126, 3344, 5566, 3788)
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (1126, 3344, 5566, 3788)

22
tests/hlsl/return.shader_test
View File

@@ -217,7 +217,7 @@ uniform 0 float 0.8
todo(sm>=6) draw quad
probe all rgba (0.5, 0.5, 0.5, 0.5)
[pixel shader todo]
[pixel shader]
uniform float4 f[3];
@@ -243,21 +243,21 @@ void main(out float4 ret : sv_target)
uniform 0 float4 0.3 0.0 0.0 0.0
uniform 4 float4 0.0 0.0 0.0 0.0
uniform 8 float4 0.1 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.1, 0.1, 0.1, 0.1) 1
uniform 4 float4 0.35 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.2, 0.2, 0.2, 0.2) 1
uniform 8 float4 0.5 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.4, 0.4, 0.4, 0.4) 1
uniform 0 float4 1.0 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.4, 0.4, 0.4, 0.4) 1
uniform 4 float4 2.0 0.0 0.0 0.0
todo draw quad
todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1
todo(sm>=6) draw quad
todo(sm>=6) probe all rgba (0.9, 0.9, 0.9, 0.9) 1