summaryrefslogtreecommitdiff
path: root/tests/bindings/binding1.hlsl
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2018-03-29 13:40:55 -0700
committerGitHub <noreply@github.com>2018-03-29 13:40:55 -0700
commitb61371d06c3ac18d1df6798b8042d4252485d935 (patch)
treec476058a0f522125de644d03acbe0f1335932a6b /tests/bindings/binding1.hlsl
parent8c50f9f2d51ffd77903b742993dae6a663b38286 (diff)
Change uses of "spire" to "slang" (#461)
Fixes #350 When the Slang project forked off from the Spire research effort, we renamed things as we went, but many cases seem to have slipped through the cracks. The two biggest diffs here are: - The `hello` example program was incorrectly talking about what was in the shader file (Slang no longer supports the "module" or "pipeline" constructs from Spire), and so it wasn't just a simple rename. - The files under `tests/bindings` were mistakenly using `__SPIRE__` as a preprocessor guard, which means that they weren't actually testing what they meant to. Luckily, it looks like the relevant functionality didn't regress while these tests were unintentionally deactivated.
Diffstat (limited to 'tests/bindings/binding1.hlsl')
-rw-r--r--tests/bindings/binding1.hlsl6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/bindings/binding1.hlsl b/tests/bindings/binding1.hlsl
index 906b516eb..879a19816 100644
--- a/tests/bindings/binding1.hlsl
+++ b/tests/bindings/binding1.hlsl
@@ -1,6 +1,6 @@
//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main
-// We want to make sure that the registers that Spire generates
+// We want to make sure that the registers Slang generates
// are used, even if there are "dead" parameter earlier in the program.
//
// In this case, we declare two each of textures, samplers, and constant
@@ -8,10 +8,10 @@
// Left to its own devices, the HLSL compiler would usually shift the
// object that was used up to binding slot zero, and eliminate the one
// that wasn't used.
-// We expect Spire to generate explicit annotations that stop this from
+// We expect Slang to generate explicit annotations that stop this from
// happening.
-#ifdef __SPIRE__
+#ifdef __SLANG__
#define R(X) /**/
#else
#define R(X) X