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/hlsl: Lower combined samplers to separate sampler and texture objects for SM4.

Browse Source 
Co-authored-by: Francisco Casas <fcasas@codeweavers.com>
This commit is contained in:
Zebediah Figura
2023-05-29 21:59:17 -04:00
committed by Alexandre Julliard
parent 15ea5ff9db
commit a55973d695
Notes: Alexandre Julliard 2023-07-17 23:25:21 +02: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/209
5 changed files with 126 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/hlsl/combined-samplers.shader_test
View File

@@ -35,7 +35,7 @@ size (1, 1)
4.0 4.0 4.0 1.0
[pixel shader todo]
[pixel shader]
sampler sam;
float4 main() : sv_target
@@ -44,12 +44,12 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (0, 0, 0, 1)
draw quad
probe all rgba (0, 0, 0, 1)
% Textures for new separated samplers are allocated before regular textures.
[pixel shader todo]
[pixel shader]
Texture2D tex;
sampler sam;
@@ -59,11 +59,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
draw quad
todo probe all rgba (10, 10, 10, 11)
[pixel shader todo]
[pixel shader]
Texture2D tex;
sampler sam[2];
@@ -73,11 +73,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
draw quad
todo probe all rgba (21, 21, 21, 11)
[pixel shader todo]
[pixel shader]
sampler sam0;
sampler sam1;
sampler sam2;
@@ -89,11 +89,11 @@ float4 main() : sv_target
}
[test]
todo draw quad
todo probe all rgba (12, 12, 12, 111)
draw quad
probe all rgba (12, 12, 12, 111)
[pixel shader todo]
[pixel shader]
Texture2D tex[2][2];
sampler sam;
@@ -104,13 +104,13 @@ float4 main() : sv_target
}
[test]
todo draw quad
draw quad
todo probe all rgba (104, 104, 104, 111)
% 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.
[pixel shader fail todo]
[pixel shader fail]
sampler sam[2];
float4 main() : sv_target