tests/hlsl: Attempt to deduce the data type of unspecified type texture data.

Try parsing first as integer, and if the parse stops at a decimal separator, parse as float.
This commit is contained in:
Victor Chiletto
2025-03-17 19:23:09 -03:00
committed by Henri Verbeet
parent 7b21183f45
commit cc9f4ac587
Notes: Henri Verbeet 2025-04-08 20:55:13 +02:00
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1428
7 changed files with 28 additions and 21 deletions

View File

@@ -10,8 +10,8 @@ address clamp clamp clamp
[srv 0]
size (2d, 2, 2)
1 1 0 1 0 1 1 1
1 0 0 1 1 0 1 1
1.0 1.0 0.0 1.0 0.0 1.0 1.0 1.0
1.0 0.0 0.0 1.0 1.0 0.0 1.0 1.0
[vertex shader]
float4 main(out float2 t : texcoord) : sv_position

View File

@@ -62,10 +62,10 @@ probe (0, 0) rgba (10.0, 8.0, 7.0, 3.0)
0 r32g32b32a32-float COLOR 2
[vb 0]
-1.0 -1.0 0 1 1 1 0 1 0 0 0 1 0 1
-1.0 1.0 0 1 1 1 0 1 0 0 0 1 0 1
1.0 -1.0 0 1 1 1 0 1 0 0 0 1 0 1
1.0 1.0 0 1 1 1 0 1 0 0 0 1 0 1
-1.0 -1.0 0.0 1.0 1.0 1.0 0.0 1.0 0.0 0.0 0.0 1.0 0.0 1.0
-1.0 1.0 0.0 1.0 1.0 1.0 0.0 1.0 0.0 0.0 0.0 1.0 0.0 1.0
1.0 -1.0 0.0 1.0 1.0 1.0 0.0 1.0 0.0 0.0 0.0 1.0 0.0 1.0
1.0 1.0 0.0 1.0 1.0 1.0 0.0 1.0 0.0 0.0 0.0 1.0 0.0 1.0
[vertex shader]
uint3 index;

View File

@@ -6,8 +6,8 @@ shader model < 4.0
0 r32-float psize
[vb 0]
-0.5 0 20
0.5 0 40
-0.5 0.0 20.0
0.5 0.0 40.0
[vertex shader fail]
void main(inout float4 pos : position, out float2 size : psize)

View File

@@ -7,10 +7,10 @@ shader model >= 4.0
[srv 0]
size (2d, 4, 4)
1 1 1 1 2 2 2 2 3 3 3 3 4 4 4 4
5 5 5 5 6 6 6 6 7 7 7 7 8 8 8 8
9 9 9 9 10 10 10 10 11 11 11 11 12 12 12 12
13 13 13 13 14 14 14 14 14 15 15 15 16 16 16 16
1.0 1.0 1.0 1.0 2.0 2.0 2.0 2.0 3.0 3.0 3.0 3.0 4.0 4.0 4.0 4.0
5.0 5.0 5.0 5.0 6.0 6.0 6.0 6.0 7.0 7.0 7.0 7.0 8.0 8.0 8.0 8.0
9.0 9.0 9.0 9.0 10.0 10.0 10.0 10.0 11.0 11.0 11.0 11.0 12.0 12.0 12.0 12.0
13.0 13.0 13.0 13.0 14.0 14.0 14.0 14.0 14.0 15.0 15.0 15.0 16.0 16.0 16.0 16.0
[pixel shader]

View File

@@ -3,9 +3,9 @@ shader model >= 4.0
[srv 0]
size (2d, 3, 3)
0 0 0 1 1 0 0 1 2 0 0 1
0 1 0 1 1 1 0 1 2 1 0 1
0 2 0 1 1 2 0 1 2 2 0 1
0.0 0.0 0.0 1.0 1.0 0.0 0.0 1.0 2.0 0.0 0.0 1.0
0.0 1.0 0.0 1.0 1.0 1.0 0.0 1.0 2.0 1.0 0.0 1.0
0.0 2.0 0.0 1.0 1.0 2.0 0.0 1.0 2.0 2.0 0.0 1.0
[pixel shader]