summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2018-03-29 13:40:55 -0700
committerGitHub <noreply@github.com>2018-03-29 13:40:55 -0700
commitb61371d06c3ac18d1df6798b8042d4252485d935 (patch)
treec476058a0f522125de644d03acbe0f1335932a6b /examples
parent8c50f9f2d51ffd77903b742993dae6a663b38286 (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 'examples')
-rw-r--r--examples/hello/README.md10
-rw-r--r--examples/hello/hello.slang2
-rw-r--r--examples/hello/hello.vcxproj2
-rw-r--r--examples/hello/hello.vcxproj.filters2
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/hello/README.md b/examples/hello/README.md
index 410bbd7bb..a571bb274 100644
--- a/examples/hello/README.md
+++ b/examples/hello/README.md
@@ -1,9 +1,9 @@
-Spire "Hello World" Example
+Slang "Hello World" Example
===========================
-The goal of this example is to demonstrate an almost minimal application that uses Spire for shading, and D3D11 for rendering.
+The goal of this example is to demonstrate an almost minimal application that uses Slang for shading, and D3D11 for rendering.
-The `hello.spire` file contains a simple declaration of a Spire *shader module*, along with a *pipeline declaration* that will be used for mapping shader code to the capabilities of the "engine" (in this case, just vertex and fragment shaders).
-The `hello.cpp` file contains the C++ application code, showing how to use the Spire C API to load and compile the shader code, and construct a (trivial) executable shader from Spire modules.
+The `hello.slang` file contains simple vertex and fragment shader entry points.
+The `hello.cpp` file contains the C++ application code, showing how to use the Slang C API to load and compile the shader code to DirectX shader bytecode (DXBC).
-Note that this example is not intended to demonstrate good practices for integrating Spire into a production engine; the goal is merely to use the minimum amount of code possible to demonstrate a complete applicaiton that uses Spire.
+Note that this example is not intended to demonstrate good practices for integrating Slang into a production engine; the goal is merely to use the minimum amount of code possible to demonstrate a complete applicaiton that uses Slang.
diff --git a/examples/hello/hello.slang b/examples/hello/hello.slang
index d563aab88..f495d12b4 100644
--- a/examples/hello/hello.slang
+++ b/examples/hello/hello.slang
@@ -1,4 +1,4 @@
-// shaders.spire
+// hello.slang
cbuffer Uniforms
{
diff --git a/examples/hello/hello.vcxproj b/examples/hello/hello.vcxproj
index 635cf985a..419d80a80 100644
--- a/examples/hello/hello.vcxproj
+++ b/examples/hello/hello.vcxproj
@@ -157,7 +157,7 @@
<ClCompile Include="hello.cpp" />
</ItemGroup>
<ItemGroup>
- <None Include="hello.spire" />
+ <None Include="hello.slang" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/examples/hello/hello.vcxproj.filters b/examples/hello/hello.vcxproj.filters
index 0265ee7a4..cedbc9831 100644
--- a/examples/hello/hello.vcxproj.filters
+++ b/examples/hello/hello.vcxproj.filters
@@ -4,6 +4,6 @@
<ClCompile Include="hello.cpp" />
</ItemGroup>
<ItemGroup>
- <None Include="hello.spire" />
+ <None Include="hello.slang" />
</ItemGroup>
</Project> \ No newline at end of file