Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
74c998a2
Commit
74c998a2
authored
11 months ago
by
Francisco Casas
Committed by
Alexandre Julliard
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
tests: Add additional conditional tests for shader model 3.0.
parent
dbb9cfd9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!794
vkd3d-shader/hlsl: Improve SM1 support for non-float operations, part 6.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/hlsl/conditional.shader_test
+168
-0
168 additions, 0 deletions
tests/hlsl/conditional.shader_test
with
168 additions
and
0 deletions
tests/hlsl/conditional.shader_test
+
168
−
0
View file @
74c998a2
...
...
@@ -74,6 +74,26 @@ float main() : sv_target
[require]
shader model >= 3.0
[pixel shader todo(sm<4)]
uniform float a;
float4 main() : sv_target
{
if (a < 4)
return float4(1, 2, 3, 4);
return float4(10, 20, 30, 40);
}
[test]
uniform 0 float -2
todo(sm<4 | glsl) draw quad
probe all rgba (1, 2, 3, 4)
uniform 0 float 10
todo(sm<4 | glsl) draw quad
probe all rgba (10, 20, 30, 40)
[pixel shader todo(sm<4)]
uniform float4 u;
...
...
@@ -107,3 +127,151 @@ float4 main() : sv_target
[test]
todo(glsl) draw quad
probe all rgba (9.0, 10.0, 11.0, 12.0)
[pixel shader todo(sm<4)]
int a, b;
float4 main() : sv_target
{
if (a < b)
return -1.0;
else
return 1.0;
}
[test]
if(sm<4) uniform 0 float 8
if(sm<4) uniform 4 float 9
if(sm>=4) uniform 0 int 8
if(sm>=4) uniform 1 int 9
todo(sm<4 | glsl) draw quad
probe all rgba (-1.0, -1.0, -1.0, -1.0)
if(sm<4) uniform 0 float -3
if(sm<4) uniform 4 float -4
if(sm>=4) uniform 0 int -3
if(sm>=4) uniform 1 int -4
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
if(sm<4) uniform 0 float 7
if(sm<4) uniform 4 float 7
if(sm>=4) uniform 0 int 7
if(sm>=4) uniform 1 int 7
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
[pixel shader todo(sm<4)]
int a, b;
float4 main() : sv_target
{
if (a <= b)
return -1.0;
else
return 1.0;
}
[test]
if(sm<4) uniform 0 float 8
if(sm<4) uniform 4 float 9
if(sm>=4) uniform 0 int 8
if(sm>=4) uniform 1 int 9
todo(sm<4 | glsl) draw quad
probe all rgba (-1.0, -1.0, -1.0, -1.0)
if(sm<4) uniform 0 float -3
if(sm<4) uniform 4 float -4
if(sm>=4) uniform 0 int -3
if(sm>=4) uniform 1 int -4
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
if(sm<4) uniform 0 float 7
if(sm<4) uniform 4 float 7
if(sm>=4) uniform 0 int 7
if(sm>=4) uniform 1 int 7
todo(sm<4 | glsl) draw quad
probe all rgba (-1.0, -1.0, -1.0, -1.0)
[pixel shader todo(sm<4)]
int a, b;
float4 main() : sv_target
{
if (a != b)
return -1.0;
else
return 1.0;
}
[test]
if(sm<4) uniform 0 float -3
if(sm<4) uniform 4 float -2
if(sm>=4) uniform 0 int -3
if(sm>=4) uniform 1 int -2
todo(sm<4 | glsl) draw quad
probe all rgba (-1.0, -1.0, -1.0, -1.0)
if(sm<4) uniform 0 float 4
if(sm<4) uniform 4 float 4
if(sm>=4) uniform 0 int 4
if(sm>=4) uniform 1 int 4
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
% Test "if" conditionals, using resource loads to ensure we aren't removing these instruction with optimizations.
[srv 0]
size (2d, 2, 2)
0.0 0.0 0.0 4.0 1.0 0.0 0.0 4.0
0.0 1.0 0.0 4.0 1.0 1.0 0.0 4.0
[sampler 0]
filter linear linear linear
address clamp clamp clamp
[pixel shader todo(sm<4)]
Texture2D tex;
sampler sam;
float a;
float4 main() : sv_target
{
if (a < 4)
return tex.Sample(sam, float2(0, 0));
return float4(1, 2, 3, 4);
}
[test]
uniform 0 float -2
todo(sm<4 | glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 4.0)
uniform 0 float 4
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 2.0, 3.0, 4.0)
[pixel shader todo(sm<4)]
Texture2D tex;
sampler sam;
float a;
float4 main() : sv_target
{
if (a >= 2)
return tex.Sample(sam, float2(0, 0));
else if (a >= 1)
return tex.Sample(sam, float2(1, 0));
else
return tex.Sample(sam, float2(1, 1));
}
[test]
uniform 0 float 2
todo(sm<4 | glsl) draw quad
probe all rgba (0.0, 0.0, 0.0, 4.0)
uniform 0 float 1
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 0.0, 0.0, 4.0)
uniform 0 float 0
todo(sm<4 | glsl) draw quad
probe all rgba (1.0, 1.0, 0.0, 4.0)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment