diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-03-29 13:40:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 13:40:55 -0700 |
| commit | b61371d06c3ac18d1df6798b8042d4252485d935 (patch) | |
| tree | c476058a0f522125de644d03acbe0f1335932a6b /tests/reflection | |
| parent | 8c50f9f2d51ffd77903b742993dae6a663b38286 (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/reflection')
| -rw-r--r-- | tests/reflection/multi-file-extra.hlsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/reflection/multi-file-extra.hlsl b/tests/reflection/multi-file-extra.hlsl index a5da70635..be5757d14 100644 --- a/tests/reflection/multi-file-extra.hlsl +++ b/tests/reflection/multi-file-extra.hlsl @@ -8,7 +8,7 @@ // Let's make sure we generate correct output in cases // where there are non-trivial `packoffset`s needed -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X |