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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/render-test/README.md | 2 | ||||
| -rw-r--r-- | tools/slang-test/slang-test.vcxproj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/render-test/README.md b/tools/render-test/README.md index 6d0d9111f..ba0d35c5f 100644 --- a/tools/render-test/README.md +++ b/tools/render-test/README.md @@ -1,4 +1,4 @@ Render Test =========== -This is a simple tool for running end-to-end tests that render with Spire, so that we can validate that it generates correct code. +This is a simple tool for running end-to-end tests that render with Slang, so that we can validate that it generates correct code. diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj index 70b35e93b..fc4e88493 100644 --- a/tools/slang-test/slang-test.vcxproj +++ b/tools/slang-test/slang-test.vcxproj @@ -21,7 +21,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{0C768A18-1D25-4000-9F37-DA5FE99E3B64}</ProjectGuid> <Keyword>Win32Proj</Keyword> - <RootNamespace>SpireTestTool</RootNamespace> + <RootNamespace>slang_test</RootNamespace> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
