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
591ae5e18e
vkd3d/tests/hlsl/combined-samplers.shader_test

191 lines
3.1 KiB
Plaintext
Raw Normal View History

tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
[require]
tests/shader-runner: Test shaders with dxcompiler. The location of dxcompiler should be set during configuration with 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', and then at runtime with LD_LIBRARY_PATH, WINEPATH or PATH as applicable. A new 'fail(sm<6)' decoration is needed on many shader declarations because dxcompiler succeeds on many shaders which fail with fxc. The opposite case is less common and is flagged with 'fail(sm>=6)'. A few tests cause dxcompiler to crash or hang, so these are avoided using [require], which now skips tests until reset instead of exiting. Also, 'todo(sm<6)' and 'todo(sm>=6)' are used to separate checking of results.
2023-09-14 02:29:24 -07:00
shader model < 6.0
tests: Fix the usage of require directives. They are reset each time "[require]" is encountered.
2023-10-16 03:45:32 -07:00
options: backcompat
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
[sampler 0]
filter linear linear linear
address clamp clamp clamp
[sampler 1]
filter linear linear linear
address clamp clamp clamp
[sampler 2]
filter linear linear linear
address clamp clamp clamp
tests/shader-runner: Change resource declaration syntax on shader_test files. On shader_test files, now resources should be declared this way: [texture n] -> [srv n] [srv buffer n] -> [srv n] [uav n] -> [uav n] [uav buffer n] -> [uav n] [vertex buffer n] -> [vb n] [render target n] -> [rtv n] The dimension (buffer or 2D) is now specified as an additional parameter in the "size" directive: For 2D resources: size (n, m) -> size (2d, n, m) For buffers: size (n, 1) -> size (buffer, n)
2024-01-24 11:11:17 -08:00
[srv 0]
tests: Add another combined sampler test. Shader provided by Francisco Casas.
2024-06-18 11:01:31 -07:00
size (2d, 2, 2)
0.0 0.0 0.0 1.0 0.0 1.0 0.0 1.0
0.0 0.0 1.0 1.0 1.0 0.0 0.0 1.0
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
tests/shader-runner: Change resource declaration syntax on shader_test files. On shader_test files, now resources should be declared this way: [texture n] -> [srv n] [srv buffer n] -> [srv n] [uav n] -> [uav n] [uav buffer n] -> [uav n] [vertex buffer n] -> [vb n] [render target n] -> [rtv n] The dimension (buffer or 2D) is now specified as an additional parameter in the "size" directive: For 2D resources: size (n, m) -> size (2d, n, m) For buffers: size (n, 1) -> size (buffer, n)
2024-01-24 11:11:17 -08:00
[srv 1]
size (2d, 1, 1)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
1.0 1.0 1.0 1.0
tests/shader-runner: Change resource declaration syntax on shader_test files. On shader_test files, now resources should be declared this way: [texture n] -> [srv n] [srv buffer n] -> [srv n] [uav n] -> [uav n] [uav buffer n] -> [uav n] [vertex buffer n] -> [vb n] [render target n] -> [rtv n] The dimension (buffer or 2D) is now specified as an additional parameter in the "size" directive: For 2D resources: size (n, m) -> size (2d, n, m) For buffers: size (n, 1) -> size (buffer, n)
2024-01-24 11:11:17 -08:00
[srv 2]
size (2d, 1, 1)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
2.0 2.0 2.0 1.0
tests/shader-runner: Change resource declaration syntax on shader_test files. On shader_test files, now resources should be declared this way: [texture n] -> [srv n] [srv buffer n] -> [srv n] [uav n] -> [uav n] [uav buffer n] -> [uav n] [vertex buffer n] -> [vb n] [render target n] -> [rtv n] The dimension (buffer or 2D) is now specified as an additional parameter in the "size" directive: For 2D resources: size (n, m) -> size (2d, n, m) For buffers: size (n, 1) -> size (buffer, n)
2024-01-24 11:11:17 -08:00
[srv 3]
size (2d, 1, 1)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
3.0 3.0 3.0 1.0
tests/shader-runner: Change resource declaration syntax on shader_test files. On shader_test files, now resources should be declared this way: [texture n] -> [srv n] [srv buffer n] -> [srv n] [uav n] -> [uav n] [uav buffer n] -> [uav n] [vertex buffer n] -> [vb n] [render target n] -> [rtv n] The dimension (buffer or 2D) is now specified as an additional parameter in the "size" directive: For 2D resources: size (n, m) -> size (2d, n, m) For buffers: size (n, 1) -> size (buffer, n)
2024-01-24 11:11:17 -08:00
[srv 4]
size (2d, 1, 1)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
4.0 4.0 4.0 1.0
vkd3d-shader/hlsl: Lower combined samplers to separate sampler and texture objects for SM4. Co-authored-by: Francisco Casas <fcasas@codeweavers.com>
2023-05-29 18:59:17 -07:00
[pixel shader]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
sampler sam;
float4 main() : sv_target
{
return tex2D(sam, float2(0, 0));
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0).
2024-02-10 11:16:22 -08:00
probe (0, 0) rgba (0, 0, 0, 1)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
tests: Add another combined sampler test. Shader provided by Francisco Casas.
2024-06-18 11:01:31 -07:00
[pixel shader]
sampler sam;
float v;
float4 main() : sv_target
{
return tex2D(sam, float2(0, 0)) + v;
}
[test]
uniform 0 float4 0.5 0.0 0.0 0.0
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Add another combined sampler test. Shader provided by Francisco Casas.
2024-06-18 11:01:31 -07:00
probe (0, 0) rgba (0.5, 0.5, 0.5, 1.5)
tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier.
2024-06-18 10:56:27 -07:00
% On sm4, textures for new separated samplers are allocated before regular textures.
% On sm1, textures for new combined samplers are allocated before regular samplers.
vkd3d-shader/hlsl: Lower combined samplers to separate sampler and texture objects for SM4. Co-authored-by: Francisco Casas <fcasas@codeweavers.com>
2023-05-29 18:59:17 -07:00
[pixel shader]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
Texture2D tex;
sampler sam;
float4 main() : sv_target
{
return 10 * tex.Sample(sam, float2(0, 0)) + tex2D(sam, float2(0, 0));
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier.
2024-06-18 10:56:27 -07:00
if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11)
if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11)
[pixel shader]
Texture2D tex;
sampler sam;
float4 main() : sv_target
{
return 10 * tex.Sample(sam, float2(0, 0)) + tex2D(sam, float2(0, 0));
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier.
2024-06-18 10:56:27 -07:00
if(sm<4) todo probe (0, 0) rgba (1, 1, 1, 11)
if(sm>=4) probe (0, 0) rgba (10, 10, 10, 11)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
tests: Use the vulkan runner to run SM1 compilation tests. At the current moment this is a little odd because for SM1 [test] directives are skipped, and the [shader] directives are not executed by the shader_runner_vulkan.c:compile_shader() but by the general shader_runner.c:compile_shader(). So in principle it is a little weird that we go through the vulkan runner. But fret not, because in the future we plan to make the parser agnostic to the language of the tests, so we will get rid of the general shader_runner.c:compile_shader() function and instead call a runner->compile_shader() function, defined for each runner. Granted, most of these may call a generic implementation that uses native compiler in Windows, and vkd3d-shader on Linux, but it would be more conceptually correct.
2023-11-15 12:41:33 -08:00
[pixel shader todo(sm<4)]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
Texture2D tex;
sampler sam[2];
float4 main() : sv_target
{
return 10 * tex.Sample(sam[0], float2(0, 0)) + tex2D(sam[1], float2(0, 0));
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
todo(sm<4) draw quad
tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0).
2024-02-10 11:16:22 -08:00
probe (0, 0) rgba (21, 21, 21, 11)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
vkd3d-shader/hlsl: Lower combined samplers to separate sampler and texture objects for SM4. Co-authored-by: Francisco Casas <fcasas@codeweavers.com>
2023-05-29 18:59:17 -07:00
[pixel shader]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
sampler sam0;
sampler sam1;
sampler sam2;
float4 main() : sv_target
{
return 100 * tex2D(sam1, float2(0, 0)) + 10 * tex2D(sam0, float2(0, 0))
+ tex2D(sam2, float2(0, 0));
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier.
2024-06-18 10:56:27 -07:00
if(sm<4) probe (0, 0) rgba (102, 102, 102, 111)
if(sm>=4) probe (0, 0) rgba (12, 12, 12, 111)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
tests: Run combined-samplers.shader_test on sm1 as well. Now that we have if() this is easier.
2024-06-18 10:56:27 -07:00
[pixel shader notimpl(sm<4)]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
Texture2D tex[2][2];
sampler sam;
float4 main() : sv_target
{
return 100 * tex[0][0].Load(int3(0, 0, 0)) + 10 * tex2D(sam, float2(0, 0))
+ tex[1][1].Sample(sam, float2(0, 0));
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0).
2024-02-10 11:16:22 -08:00
probe (0, 0) rgba (104, 104, 104, 111)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
% Sampler arrays with components that have different usage dimensions are only forbidden in SM4 upwards.
% However, tex2D and tex1D are considered the same dimension for these purposes.
tests: Use the vulkan runner to run SM1 compilation tests. At the current moment this is a little odd because for SM1 [test] directives are skipped, and the [shader] directives are not executed by the shader_runner_vulkan.c:compile_shader() but by the general shader_runner.c:compile_shader(). So in principle it is a little weird that we go through the vulkan runner. But fret not, because in the future we plan to make the parser agnostic to the language of the tests, so we will get rid of the general shader_runner.c:compile_shader() function and instead call a runner->compile_shader() function, defined for each runner. Granted, most of these may call a generic implementation that uses native compiler in Windows, and vkd3d-shader on Linux, but it would be more conceptually correct.
2023-11-15 12:41:33 -08:00
[pixel shader fail(sm>=4)]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
sampler sam[2];
float4 main() : sv_target
{
return tex2D(sam[0], float2(0, 0)) + tex3D(sam[1], float3(0, 0, 0));
}
vkd3d-shader/hlsl: Produce 2D resource declarations and loads for tex1D(). Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
2023-09-11 03:23:04 -07:00
[pixel shader]
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
sampler sam[2];
float4 main() : sv_target
{
return 10 * tex2D(sam[0], float2(0, 0)) + tex1D(sam[1], 0);
}
[test]
vkd3d-shader/glsl: Implement VKD3DSIH_SAMPLE.
2024-09-29 12:04:57 -07:00
draw quad
tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0).
2024-02-10 11:16:22 -08:00
probe (0, 0) rgba (1, 1, 1, 11)
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
[require]
shader model >= 5.0
tests/shader-runner: Test shaders with dxcompiler. The location of dxcompiler should be set during configuration with 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', and then at runtime with LD_LIBRARY_PATH, WINEPATH or PATH as applicable. A new 'fail(sm<6)' decoration is needed on many shader declarations because dxcompiler succeeds on many shaders which fail with fxc. The opposite case is less common and is flagged with 'fail(sm>=6)'. A few tests cause dxcompiler to crash or hang, so these are avoided using [require], which now skips tests until reset instead of exiting. Also, 'todo(sm<6)' and 'todo(sm>=6)' are used to separate checking of results.
2023-09-14 02:29:24 -07:00
shader model < 6.0
tests: Fix the usage of require directives. They are reset each time "[require]" is encountered.
2023-10-16 03:45:32 -07:00
options: backcompat
tests: Add lowering combined samplers tests.
2022-12-01 11:50:17 -08:00
[pixel shader todo]
struct
{
Texture2D tex;
sampler sam;
} foo;
float4 main() : sv_target
{
return 10 * foo.tex.Sample(foo.sam, float2(0, 0)) + tex2D(foo.sam, float2(0, 0));
}
[test]
todo draw quad
tests: Stop probing all pixels when drawing a uniform colour. This is simply unnecessary and wastes time. As part of this, simply remove the "all" directive. Only for a couple of tests is it even potentially interesting to validate all pixels (e.g. nointerpolation.shader_test), and for those "all" is replaced with an explicit (0, 0, 640, 480) rect. In all other cases we just probe (0, 0).
2024-02-10 11:16:22 -08:00
todo probe (0,0) rgba (10, 10, 10, 11)
Reference in New Issue Copy Permalink