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/bindings/binding0.hlsl | |
| 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/bindings/binding0.hlsl')
| -rw-r--r-- | tests/bindings/binding0.hlsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/bindings/binding0.hlsl b/tests/bindings/binding0.hlsl index bef3bcb7a..9ca092562 100644 --- a/tests/bindings/binding0.hlsl +++ b/tests/bindings/binding0.hlsl @@ -1,10 +1,10 @@ //TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile ps_4_0 -entry main -// Let's first confirm that Spire can reproduce what the +// Let's first confirm that Slang can reproduce what the // HLSL compiler would already do in the simple case (when // all shader parameters are actually used). -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X |