diff --git a/Makefile.am b/Makefile.am index 46772fd9..73b2bd7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,8 @@ vkd3d_shader_tests = \ tests/hlsl/effect-technique-fx_4.shader_test \ tests/hlsl/effect-technique-fx_5.shader_test \ tests/hlsl/effect-variables-fx_2.shader_test \ + tests/hlsl/effect-variables-fx_4.shader_test \ + tests/hlsl/effect-variables-fx_5.shader_test \ tests/hlsl/entry-point-semantics.shader_test \ tests/hlsl/exp.shader_test \ tests/hlsl/expr-indexing.shader_test \ diff --git a/tests/hlsl/effect-variables-fx_2.shader_test b/tests/hlsl/effect-variables-fx_2.shader_test index 8e9fd4d5..779f5156 100644 --- a/tests/hlsl/effect-variables-fx_2.shader_test +++ b/tests/hlsl/effect-variables-fx_2.shader_test @@ -24,3 +24,23 @@ Texture3D tex7; technique { } + +[effect] +struct s +{ + Texture t; + float4 f; +}; + +technique {} + +[effect fail] +struct s +{ + Texture t; + float4 f; +}; + +s var; + +technique {} diff --git a/tests/hlsl/effect-variables-fx_4.shader_test b/tests/hlsl/effect-variables-fx_4.shader_test new file mode 100644 index 00000000..85bbcffd --- /dev/null +++ b/tests/hlsl/effect-variables-fx_4.shader_test @@ -0,0 +1,19 @@ +[require] +shader model >= 4.0 +shader model < 6.0 + +[effect] +struct s +{ + Texture t; + float4 f; +}; + +[effect fail] +struct s +{ + Texture t; + float4 f; +}; + +s var; diff --git a/tests/hlsl/effect-variables-fx_5.shader_test b/tests/hlsl/effect-variables-fx_5.shader_test new file mode 100644 index 00000000..13773b06 --- /dev/null +++ b/tests/hlsl/effect-variables-fx_5.shader_test @@ -0,0 +1,19 @@ +[require] +shader model >= 5.0 +shader model < 6.0 + +[effect] +struct s +{ + Texture t; + float4 f; +}; + +[effect fail todo] +struct s +{ + Texture t; + float4 f; +}; + +s var;