wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests/shader-runner: Add shader model 6 texture UAV tests.

Browse Source 
The UAV default register allocation rules changed with SM 5.1.
This commit is contained in:
Conor McCarthy 2024-01-29 14:46:50 +10:00 committed by Alexandre Julliard
parent 805a4bc1e8
commit cf4ed988d0
Notes: Alexandre Julliard 2024-02-07 23:26:28 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/611
3 changed files with 227 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -170,6 +170,7 @@ vkd3d_shader_tests = \
tests/hlsl/sign.shader_test \ tests/hlsl/sign.shader_test \
tests/hlsl/single-numeric-initializer.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \
tests/hlsl/sm6-ternary.shader_test \ tests/hlsl/sm6-ternary.shader_test \
tests/hlsl/sm6-uav-rwtexture.shader_test \
tests/hlsl/smoothstep.shader_test \ tests/hlsl/smoothstep.shader_test \
tests/hlsl/sqrt.shader_test \ tests/hlsl/sqrt.shader_test \
tests/hlsl/state-block-syntax.shader_test \ tests/hlsl/state-block-syntax.shader_test \

208
tests/hlsl/sm6-uav-rwtexture.shader_test Normal file
View File

@ -0,0 +1,208 @@
[require]
shader model >= 6.0
[uav 0]
format r32 float
size (2, 2)
0.1 0.2
0.3 0.4
[uav 1]
size (1, 1)
0.5 0.6 0.7 0.8
[pixel shader]
RWTexture2D<float4> u : register(u1);
float4 main() : sv_target
{
/* Unlike SM < 6.0, all four components are not required to be written in a single statement. */
u[uint2(0, 0)].xy = float2(1, 2);
u[uint2(0, 0)].zw = float2(3, 4);
return 0;
}
[test]
todo draw quad
probe uav 1 (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader fail]
Texture2D<float4> u;
float4 main() : sv_target
{
/* SRVs are not writable. */
u[uint2(0, 0)].xyzw = float4(1, 2, 3, 4);
return 0;
}
[pixel shader]
RWTexture2D<float> u;
RWTexture2D<float4> v;
float4 main() : sv_target
{
u[uint2(0, 0)] = 0.5;
u[uint2(0, 1)].x = 0.6;
u[uint2(1, 1)] = 0.7;
v[uint2(0, 0)].yxwz = float4(1, 2, 3, 4);
return 0;
}
[test]
todo draw quad
probe uav 0 (0, 0) r (0.5)
probe uav 0 (0, 1) r (0.6)
probe uav 0 (1, 0) r (0.2)
probe uav 0 (1, 1) r (0.7)
probe uav 1 (0, 0) rgba (2.0, 1.0, 4.0, 3.0)
[uav 2]
size (1, 1)
0.1 0.2 0.3 0.4
[pixel shader]
RWTexture2D<float4> u : register(u2);
float4 main() : sv_target1
{
u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6);
return 0;
}
[test]
todo draw quad
probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
% Uppercase register set name
[pixel shader]
RWTexture2D<float4> u : register(U2);
float4 main() : sv_target1
{
u[uint2(0, 0)] = float4(0.9, 0.8, 0.7, 0.6);
return 0;
}
[test]
todo draw quad
probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
% Test that we can declare and use an array of UAVs.
[uav 1]
size (1, 1)
0.1 0.2 0.3 0.4
[uav 2]
size (1, 1)
0.5 0.6 0.7 0.8
[pixel shader]
RWTexture2D<float4> u[2] : register(u1);
float4 main() : sv_target1
{
u[0][uint2(0, 0)] = float4(1.1, 1.2, 1.3, 1.4);
u[1][uint2(0, 0)] = float4(2.1, 2.2, 2.3, 2.4);
return 0;
}
[test]
todo draw quad
probe uav 1 (0, 0) rgba (1.1, 1.2, 1.3, 1.4)
probe uav 2 (0, 0) rgba (2.1, 2.2, 2.3, 2.4)
% RWTexture1D types
[pixel shader]
RWTexture1D<float4> u : register(u1);
RWTexture1D<float> u0;
float4 main() : sv_target1
{
u[0] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}
% RWTexture1DArray types
[pixel shader]
RWTexture1DArray<float4> u : register(u1);
RWTexture1DArray<float> u0;
float4 main() : sv_target1
{
u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}
% RWTexture2D types
[pixel shader]
RWTexture2D<float4> u : register(u1);
RWTexture2D<float> u0;
float4 main() : sv_target1
{
u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}
% RWTexture2DArray types
[pixel shader]
RWTexture2DArray<float4> u : register(u1);
RWTexture2DArray<float> u0;
float4 main() : sv_target1
{
u[int3(0, 0, 0)] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}
% RWTexture3D types
[pixel shader]
RWTexture3D<float4> u : register(u1);
RWTexture3D<float> u0;
float4 main() : sv_target1
{
u[int3(0, 0, 0)] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}
% Structs are invalid in SM 6.
[pixel shader fail]
struct s
{
float4 a;
};
RWTexture2D<float4> u : register(u1);
RWTexture2D<struct s> u0;
float4 main() : sv_target1
{
u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}
% Matrices are invalid in SM 6.
[pixel shader fail]
RWTexture2D<float4> u : register(u1);
RWTexture2D<float2x2> u0;
float4 main() : sv_target1
{
u[int2(0, 0)] = float4(11.1, 12.2, 13.3, 14.4);
return 0;
}

31
tests/hlsl/uav-rwtexture.shader_test
View File

@ -1,7 +1,8 @@
[require] [require]
shader model >= 5.0 shader model >= 5.0
shader model < 6.0
[pixel shader fail(sm<6)] [pixel shader fail]
RWTexture2D<float4> u; RWTexture2D<float4> u;
float4 main() : sv_target float4 main() : sv_target
@ -49,7 +50,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm>=6) draw quad draw quad
probe uav 1 (0, 0) r (0.5) probe uav 1 (0, 0) r (0.5)
probe uav 1 (0, 1) r (0.6) probe uav 1 (0, 1) r (0.6)
probe uav 1 (1, 0) r (0.2) probe uav 1 (1, 0) r (0.2)
@ -71,7 +72,7 @@ size (1, 1)
0.1 0.2 0.3 0.4 0.1 0.2 0.3 0.4
[pixel shader fail(sm<6)] [pixel shader fail]
RWTexture2D<float4> u : register(u0); RWTexture2D<float4> u : register(u0);
float4 main() : sv_target1 float4 main() : sv_target1
@ -80,7 +81,7 @@ float4 main() : sv_target1
return 0; return 0;
} }
[pixel shader fail(sm<6)] [pixel shader fail]
RWTexture2D<float4> u : register(u1); RWTexture2D<float4> u : register(u1);
float4 main() : sv_target1 float4 main() : sv_target1
@ -99,7 +100,7 @@ float4 main() : sv_target1
} }
[test] [test]
todo(sm>=6) draw quad draw quad
probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) probe uav 2 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
@ -118,7 +119,7 @@ float4 main() : sv_target1
} }
[test] [test]
todo(sm>=6) draw quad draw quad
probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
% Uppercase register set name % Uppercase register set name
@ -132,7 +133,7 @@ float4 main() : sv_target1
} }
[test] [test]
todo(sm>=6) draw quad draw quad
probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6) probe uav 3 (0, 0) rgba (0.9, 0.8, 0.7, 0.6)
% Test that we can declare and use an array of UAVs. % Test that we can declare and use an array of UAVs.
@ -158,12 +159,12 @@ float4 main() : sv_target1
} }
[test] [test]
todo(sm>=6) draw quad draw quad
probe uav 2 (0, 0) rgba (1.1, 1.2, 1.3, 1.4) probe uav 2 (0, 0) rgba (1.1, 1.2, 1.3, 1.4)
probe uav 3 (0, 0) rgba (2.1, 2.2, 2.3, 2.4) probe uav 3 (0, 0) rgba (2.1, 2.2, 2.3, 2.4)
% RWTexture1D types % RWTexture1D types
[pixel shader fail(sm>=6)] [pixel shader]
struct s struct s
{ {
float3 a; float3 a;
@ -181,7 +182,7 @@ float4 main() : sv_target1
} }
% RWTexture1DArray types % RWTexture1DArray types
[pixel shader fail(sm>=6)] [pixel shader]
struct s struct s
{ {
float3 a; float3 a;
@ -199,7 +200,7 @@ float4 main() : sv_target1
} }
% RWTexture2D types % RWTexture2D types
[pixel shader fail(sm>=6)] [pixel shader]
struct s struct s
{ {
float3 a; float3 a;
@ -217,7 +218,7 @@ float4 main() : sv_target1
} }
% RWTexture2DArray types % RWTexture2DArray types
[pixel shader fail(sm>=6)] [pixel shader]
struct s struct s
{ {
float3 a; float3 a;
@ -235,7 +236,7 @@ float4 main() : sv_target1
} }
% RWTexture3D types % RWTexture3D types
[pixel shader fail(sm>=6)] [pixel shader]
struct s struct s
{ {
float3 a; float3 a;
@ -252,6 +253,10 @@ float4 main() : sv_target1
return 0; return 0;
} }
[require]
shader model >= 5.0
% Type is too wide % Type is too wide
[pixel shader fail] [pixel shader fail]
struct s struct s