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 | |
| 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')
16 files changed, 16 insertions, 16 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" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl index 29b6e8b2c..28f8b72a5 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_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 "Tutorial03.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl index db47ead28..f1b51570c 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial03/Tutorial03_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 "Tutorial03.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx index deb7b585f..91ffee3df 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04.fx @@ -1,4 +1,4 @@ -//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 -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial04.fx diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl index dc627637c..3adba841b 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_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 "Tutorial04.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl index 96d0a642c..471c70452 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial04/Tutorial04_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 "Tutorial04.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx index b15c99e49..c26ab0865 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05.fx @@ -1,4 +1,4 @@ -//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 -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial05.fx diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl index acc900ff5..caa4855ee 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_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 "Tutorial05.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl index 726f05979..7003df52b 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial05/Tutorial05_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 "Tutorial05.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx index 7d839009d..e3f60ae88 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06.fx @@ -1,4 +1,4 @@ -//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 -profile ps_4_0 -entry PS -entry PSSolid //-------------------------------------------------------------------------------------- // File: Tutorial06.fx diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl index 31ed082e7..4b2795b3b 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_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 "Tutorial06.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl index a5512efb6..8d39fd6ed 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial06/Tutorial06_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 "Tutorial06.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx index 0baad7a0c..af6d671bd 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07.fx @@ -1,4 +1,4 @@ -//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 -profile ps_4_0 -entry PS //-------------------------------------------------------------------------------------- // File: Tutorial07.fx diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl index c3c101943..bfbf669d9 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_PS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_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 "Tutorial07.fx" diff --git a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl index 4c287c790..f3626569e 100644 --- a/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_VS.hlsl +++ b/tests/hlsl/dxsdk/Direct3D11Tutorials/Tutorial07/Tutorial07_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 "Tutorial07.fx" |
