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 | |
| 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')
| -rw-r--r-- | tests/bindings/README.md | 4 | ||||
| -rw-r--r-- | tests/bindings/binding0.hlsl | 4 | ||||
| -rw-r--r-- | tests/bindings/binding1.hlsl | 6 | ||||
| -rw-r--r-- | tests/bindings/explicit-binding.hlsl | 2 | ||||
| -rw-r--r-- | tests/bindings/multi-file-extra.hlsl | 2 | ||||
| -rw-r--r-- | tests/bindings/multi-file.hlsl | 2 | ||||
| -rw-r--r-- | tests/bindings/packoffset.hlsl | 2 | ||||
| -rw-r--r-- | tests/bindings/resources-in-cbuffer.hlsl | 2 | ||||
| -rw-r--r-- | tests/bindings/resources-in-structs.hlsl.disabled | 4 | ||||
| -rw-r--r-- | tests/bindings/targets-and-uavs-structure.hlsl | 2 | ||||
| -rw-r--r-- | tests/bindings/targets-and-uavs.hlsl | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/tests/bindings/README.md b/tests/bindings/README.md index ccc9fecb9..c50edcf8d 100644 --- a/tests/bindings/README.md +++ b/tests/bindings/README.md @@ -21,9 +21,9 @@ The resulting code guarantees that `tb` will always be assigned to the same loca Methodology ----------- -These tests currently rely on the ability to run the same HLSL code through the Spire compiler driver and execute either Spire, or HLSL. We write an example like the above by wrapping explicit `register` semantics in a macro: +These tests currently rely on the ability to run the same HLSL code through the Slang compiler driver and execute either Slang, or HLSL. We write an example like the above by wrapping explicit `register` semantics in a macro: Texture2D ta R(: register(t0)); Texture2D tb R(: register(t1)); -In the HLSL case, these annotations will manually place things where we want them, while in the Spire case, we define the macro to have an empty expansion, so that the annotations express our expectation for what the compiler will auto-generate.
\ No newline at end of file +In the HLSL case, these annotations will manually place things where we want them, while in the Slang case, we define the macro to have an empty expansion, so that the annotations express our expectation for what the compiler will auto-generate.
\ No newline at end of file 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 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 diff --git a/tests/bindings/explicit-binding.hlsl b/tests/bindings/explicit-binding.hlsl index 3e9e660e5..313f5a091 100644 --- a/tests/bindings/explicit-binding.hlsl +++ b/tests/bindings/explicit-binding.hlsl @@ -3,7 +3,7 @@ // We need to allow the user to add explicit bindings to their parameters, // and we can't go and auto-assign anything to use the same locations. -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X diff --git a/tests/bindings/multi-file-extra.hlsl b/tests/bindings/multi-file-extra.hlsl index 45837c984..7852d7c48 100644 --- a/tests/bindings/multi-file-extra.hlsl +++ b/tests/bindings/multi-file-extra.hlsl @@ -5,7 +5,7 @@ // This file provides the fragment shader, and is only meant to be tested in combination with `multi-file.hlsl` -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X diff --git a/tests/bindings/multi-file.hlsl b/tests/bindings/multi-file.hlsl index 1248e134e..4038ea3ca 100644 --- a/tests/bindings/multi-file.hlsl +++ b/tests/bindings/multi-file.hlsl @@ -6,7 +6,7 @@ // This file provides the vertex shader, while the fragment shader resides in // the file `multi-file-extra.hlsl` -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X diff --git a/tests/bindings/packoffset.hlsl b/tests/bindings/packoffset.hlsl index f5f2994a3..69cebdc40 100644 --- a/tests/bindings/packoffset.hlsl +++ b/tests/bindings/packoffset.hlsl @@ -3,7 +3,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 diff --git a/tests/bindings/resources-in-cbuffer.hlsl b/tests/bindings/resources-in-cbuffer.hlsl index cdbc796fa..647e64c32 100644 --- a/tests/bindings/resources-in-cbuffer.hlsl +++ b/tests/bindings/resources-in-cbuffer.hlsl @@ -4,7 +4,7 @@ // including the case where there are *multiple* constant buffers // with reosurces. -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X diff --git a/tests/bindings/resources-in-structs.hlsl.disabled b/tests/bindings/resources-in-structs.hlsl.disabled index 05269d823..45c066f31 100644 --- a/tests/bindings/resources-in-structs.hlsl.disabled +++ b/tests/bindings/resources-in-structs.hlsl.disabled @@ -1,8 +1,8 @@ -//SPIRE_TEST_OPTS:-target dxbc-assembly -profile ps_5_0 -entry main +//SLANG_TEST_OPTS:-target dxbc-assembly -profile ps_5_0 -entry main // Confirm that resources inside `struct` types work reasonably well, -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X diff --git a/tests/bindings/targets-and-uavs-structure.hlsl b/tests/bindings/targets-and-uavs-structure.hlsl index 1d57c06e4..6c9ee0340 100644 --- a/tests/bindings/targets-and-uavs-structure.hlsl +++ b/tests/bindings/targets-and-uavs-structure.hlsl @@ -3,7 +3,7 @@ // Handle the case where the fragment shader output is // defined a structure, and the semantics are on the sub-fields -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X diff --git a/tests/bindings/targets-and-uavs.hlsl b/tests/bindings/targets-and-uavs.hlsl index 004b9aed2..ad0d84e5c 100644 --- a/tests/bindings/targets-and-uavs.hlsl +++ b/tests/bindings/targets-and-uavs.hlsl @@ -5,7 +5,7 @@ // make sure that any `u` registers we allocate don't // interfere with render targets. -#ifdef __SPIRE__ +#ifdef __SLANG__ #define R(X) /**/ #else #define R(X) X |
