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/render | |
| 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/render')
| -rw-r--r-- | tests/render/cross-compile0.hlsl | 4 | ||||
| -rw-r--r-- | tests/render/imported-parameters.hlsl | 2 | ||||
| -rw-r--r-- | tests/render/unused-discard.hlsl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/render/cross-compile0.hlsl b/tests/render/cross-compile0.hlsl index 713bbdcd3..1d33b68bf 100644 --- a/tests/render/cross-compile0.hlsl +++ b/tests/render/cross-compile0.hlsl @@ -4,11 +4,11 @@ // // We will define distinct HLSL and GLSL entry points, // but the two will share a dependency on a file of -// pure Spire code that provides the actual shading logic. +// pure Slang code that provides the actual shading logic. #if defined(__HLSL__) -// Pull in Spire code depdendency using extended syntax: +// Pull in Slang code depdendency using extended syntax: __import cross_compile0; cbuffer Uniforms diff --git a/tests/render/imported-parameters.hlsl b/tests/render/imported-parameters.hlsl index faffeaf24..495ff8da2 100644 --- a/tests/render/imported-parameters.hlsl +++ b/tests/render/imported-parameters.hlsl @@ -6,7 +6,7 @@ #if defined(__HLSL__) -// Pull in Spire code depdendency using extended syntax: +// Pull in Slang code depdendency using extended syntax: __import imported_parameters; struct AssembledVertex diff --git a/tests/render/unused-discard.hlsl b/tests/render/unused-discard.hlsl index a47405f56..76b04b862 100644 --- a/tests/render/unused-discard.hlsl +++ b/tests/render/unused-discard.hlsl @@ -4,12 +4,12 @@ // // We will define distinct HLSL and GLSL entry points, // but the two will share a dependency on a file of -// pure Spire code that provides the actual shading logic. +// pure Slang code that provides the actual shading logic. #if defined(__HLSL__) -// Pull in Spire code depdendency using extended syntax: +// Pull in Slang code depdendency using extended syntax: __import unused_discard; cbuffer Uniforms |