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/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02 | |
| 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/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02')
| -rw-r--r-- | tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl | 2 | ||||
| -rw-r--r-- | tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl index 5a59aadc6..2f616870f 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_PS.hlsl @@ -1,3 +1,3 @@ -//TEST_IGNORE_FILE: Currently failing due to Spire compiler issues. +//TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. //TEST:COMPARE_HLSL: -target dxbc-assembly -profile ps_4_0 -entry PS #include "Tutorial02.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl index d58459b78..0b99b6163 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial02/Tutorial02_VS.hlsl @@ -1,3 +1,3 @@ -//TEST_IGNORE_FILE: Currently failing due to Spire compiler issues. +//TEST_IGNORE_FILE: Currently failing due to Slang compiler issues. //TEST:COMPARE_HLSL: -target dxbc-assembly -profile vs_4_0 -entry VS #include "Tutorial02.fx" |