summaryrefslogtreecommitdiffstats
path: root/tests/reflection
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2017-10-13 18:14:42 -0700
committerGitHub <noreply@github.com>2017-10-13 18:14:42 -0700
commit64ddefb90cf440df7879d1f2f9cc61de71e0f181 (patch)
tree03d113b2e58c9e232021df38350744226600f79c /tests/reflection
parent575230b93370fea86ecccb53fba73927280e917b (diff)
Move reflection JSON generation into separate text fixture (#211)
Move reflection JSON generation into separate test fixture
Diffstat (limited to 'tests/reflection')
-rw-r--r--tests/reflection/arrays.hlsl2
-rw-r--r--tests/reflection/cross-compile.slang2
-rw-r--r--tests/reflection/gh-55.glsl2
-rw-r--r--tests/reflection/global-uniforms.hlsl2
-rw-r--r--tests/reflection/image-types.glsl2
-rw-r--r--tests/reflection/multi-file.hlsl2
-rw-r--r--tests/reflection/reflect-imported-code.hlsl2
-rw-r--r--tests/reflection/reflection0.hlsl2
-rw-r--r--tests/reflection/resource-in-cbuffer.hlsl2
-rw-r--r--tests/reflection/sample-rate-input.glsl2
-rw-r--r--tests/reflection/std430-layout.glsl2
-rw-r--r--tests/reflection/thread-group-size.comp2
-rw-r--r--tests/reflection/thread-group-size.hlsl2
13 files changed, 13 insertions, 13 deletions
diff --git a/tests/reflection/arrays.hlsl b/tests/reflection/arrays.hlsl
index 3ef512d31..d013bc498 100644
--- a/tests/reflection/arrays.hlsl
+++ b/tests/reflection/arrays.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
+//TEST:REFLECTION:-profile ps_4_0 -target hlsl
// Confirm that we can generate reflection info for arrays
//
diff --git a/tests/reflection/cross-compile.slang b/tests/reflection/cross-compile.slang
index 12376c82a..600f3ed0f 100644
--- a/tests/reflection/cross-compile.slang
+++ b/tests/reflection/cross-compile.slang
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile glsl_fragment -target glsl -target reflection-json
+//TEST(smoke):REFLECTION:-profile glsl_fragment -target glsl
// Confirm that when targetting GLSL via cross compilation,
// we use the Vulkan layout rules instead of HLSL ones
diff --git a/tests/reflection/gh-55.glsl b/tests/reflection/gh-55.glsl
index ab8177c77..f6db07482 100644
--- a/tests/reflection/gh-55.glsl
+++ b/tests/reflection/gh-55.glsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target glsl -target reflection-json
+//TEST(smoke):REFLECTION:-profile ps_4_0 -target glsl
// Confirm fix for GitHub issue #55
diff --git a/tests/reflection/global-uniforms.hlsl b/tests/reflection/global-uniforms.hlsl
index 4ad1a4bbb..884042cfa 100644
--- a/tests/reflection/global-uniforms.hlsl
+++ b/tests/reflection/global-uniforms.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
+//TEST:REFLECTION:-profile ps_4_0 -target hlsl
// Confirm that we handle uniforms at global scope
diff --git a/tests/reflection/image-types.glsl b/tests/reflection/image-types.glsl
index bf7c396af..9bba69d3d 100644
--- a/tests/reflection/image-types.glsl
+++ b/tests/reflection/image-types.glsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target glsl -target reflection-json
+//TEST(smoke):REFLECTION:-profile ps_4_0 -target glsl
// Confirm that we expose GLSL `image` types through reflection
diff --git a/tests/reflection/multi-file.hlsl b/tests/reflection/multi-file.hlsl
index 47264f2ec..3282c12f4 100644
--- a/tests/reflection/multi-file.hlsl
+++ b/tests/reflection/multi-file.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -entry mainFS -target hlsl -target reflection-json tests/reflection/multi-file-extra.hlsl -profile vs_4_0 -entry mainVS
+//TEST:REFLECTION:-profile ps_4_0 -entry mainFS -target hlsl tests/reflection/multi-file-extra.hlsl -profile vs_4_0 -entry mainVS
// Here we are testing the case where multiple translation units are provided
// at once, so that we want combined reflection information for the resulting
diff --git a/tests/reflection/reflect-imported-code.hlsl b/tests/reflection/reflect-imported-code.hlsl
index 04f58af19..c3562af35 100644
--- a/tests/reflection/reflect-imported-code.hlsl
+++ b/tests/reflection/reflect-imported-code.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
+//TEST:REFLECTION:-profile ps_4_0 -target hlsl
// Confirm that shader parameters in imported modules get reflected properly.
diff --git a/tests/reflection/reflection0.hlsl b/tests/reflection/reflection0.hlsl
index 944bb795e..22232b59a 100644
--- a/tests/reflection/reflection0.hlsl
+++ b/tests/reflection/reflection0.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
+//TEST:REFLECTION:-profile ps_4_0 -target hlsl
// Confirm that basic reflection info can be output
diff --git a/tests/reflection/resource-in-cbuffer.hlsl b/tests/reflection/resource-in-cbuffer.hlsl
index b54399bd7..b96f73113 100644
--- a/tests/reflection/resource-in-cbuffer.hlsl
+++ b/tests/reflection/resource-in-cbuffer.hlsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target hlsl -target reflection-json
+//TEST(smoke):REFLECTION:-profile ps_4_0 -target hlsl
// Confirm that we can generate reflection
// information for resources nested inside
diff --git a/tests/reflection/sample-rate-input.glsl b/tests/reflection/sample-rate-input.glsl
index 66763f45d..b8151aee1 100644
--- a/tests/reflection/sample-rate-input.glsl
+++ b/tests/reflection/sample-rate-input.glsl
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:-profile ps_4_0 -no-checking -target reflection-json
+//TEST(smoke):REFLECTION:-profile ps_4_0 -no-checking
// Check that we report sample-rate entry point input correctly
diff --git a/tests/reflection/std430-layout.glsl b/tests/reflection/std430-layout.glsl
index 8afda8e0c..73e48a8a0 100644
--- a/tests/reflection/std430-layout.glsl
+++ b/tests/reflection/std430-layout.glsl
@@ -1,5 +1,5 @@
#version 450
-//TEST(smoke):SIMPLE:-profile ps_4_0 -target glsl -target reflection-json
+//TEST(smoke):REFLECTION:-profile ps_4_0 -target glsl
// Confirm fix for GitHub issue #55
diff --git a/tests/reflection/thread-group-size.comp b/tests/reflection/thread-group-size.comp
index fac755433..ff29490a5 100644
--- a/tests/reflection/thread-group-size.comp
+++ b/tests/reflection/thread-group-size.comp
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-no-checking -target glsl -target reflection-json
+//TEST:REFLECTION:-no-checking -target glsl
// Confirm that we provide reflection data for the `local_size_*` attributes
diff --git a/tests/reflection/thread-group-size.hlsl b/tests/reflection/thread-group-size.hlsl
index eb2fb98ad..7e0400b46 100644
--- a/tests/reflection/thread-group-size.hlsl
+++ b/tests/reflection/thread-group-size.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-profile cs_5_0 -target hlsl -target reflection-json
+//TEST:REFLECTION:-profile cs_5_0 -target hlsl
// Confirm that we provide reflection data for the `numthreads` attribute