mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-11-21 16:46:41 -08:00
tests: Run combined-samplers.shader_test on sm1 as well.
Now that we have if() this is easier.
This commit is contained in:
parent
46a1b66df7
commit
669e85171e
@ -1,5 +1,4 @@
|
|||||||
[require]
|
[require]
|
||||||
shader model >= 4.0
|
|
||||||
shader model < 6.0
|
shader model < 6.0
|
||||||
options: backcompat
|
options: backcompat
|
||||||
|
|
||||||
@ -49,7 +48,8 @@ todo(glsl) draw quad
|
|||||||
probe (0, 0) rgba (0, 0, 0, 1)
|
probe (0, 0) rgba (0, 0, 0, 1)
|
||||||
|
|
||||||
|
|
||||||
% Textures for new separated samplers are allocated before regular textures.
|
% On sm4, textures for new separated samplers are allocated before regular textures.
|
||||||
|
% On sm1, textures for new combined samplers are allocated before regular samplers.
|
||||||
[pixel shader]
|
[pixel shader]
|
||||||
Texture2D tex;
|
Texture2D tex;
|
||||||
sampler sam;
|
sampler sam;
|
||||||
@ -61,7 +61,23 @@ float4 main() : sv_target
|
|||||||
|
|
||||||
[test]
|
[test]
|
||||||
todo(glsl) draw quad
|
todo(glsl) draw quad
|
||||||
probe (0, 0) rgba (10, 10, 10, 11)
|
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]
|
||||||
|
todo(glsl) draw quad
|
||||||
|
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 todo(sm<4)]
|
[pixel shader todo(sm<4)]
|
||||||
@ -74,7 +90,7 @@ float4 main() : sv_target
|
|||||||
}
|
}
|
||||||
|
|
||||||
[test]
|
[test]
|
||||||
todo(glsl) draw quad
|
todo(sm<4 | glsl) draw quad
|
||||||
probe (0, 0) rgba (21, 21, 21, 11)
|
probe (0, 0) rgba (21, 21, 21, 11)
|
||||||
|
|
||||||
|
|
||||||
@ -91,10 +107,11 @@ float4 main() : sv_target
|
|||||||
|
|
||||||
[test]
|
[test]
|
||||||
todo(glsl) draw quad
|
todo(glsl) draw quad
|
||||||
probe (0, 0) rgba (12, 12, 12, 111)
|
if(sm<4) probe (0, 0) rgba (102, 102, 102, 111)
|
||||||
|
if(sm>=4) probe (0, 0) rgba (12, 12, 12, 111)
|
||||||
|
|
||||||
|
|
||||||
[pixel shader]
|
[pixel shader notimpl(sm<4)]
|
||||||
Texture2D tex[2][2];
|
Texture2D tex[2][2];
|
||||||
sampler sam;
|
sampler sam;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user