Skip to content

Commit 137cc8d

Browse files
authored
Merge branch 'shader-slang:main' into fix/community-page
2 parents 0df641d + bf2eca6 commit 137cc8d

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

docs/conf.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@ def setup(app):
178178
linkcheck_ignore = [
179179
r"https://github.com/your-name/.*",
180180
r"http://claude.ai/code",
181-
r"http://libllvm\.so.*",
182-
r"http://libLLVM\.so.*",
183-
r"http://slang\.so.*",
181+
r"http://[^\.]+\.so.*",
184182
r'https://www\.shadertoy\.com/.*',
185183
]
186184
linkcheck_report_timeouts_as_broken = True

docs/external/slang

Submodule slang updated 87 files

docs/understanding-generics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ Benefits of Slang's approach:
298298
what methods are valid for generic types, unlike C++ template parameters.
299299
300300
There are certain things which work with C++ style templates, which are
301-
(deliberatly) disallowed with Slang generics. For example the following code
301+
(deliberately) disallowed with Slang generics. For example the following code
302302
will work in C++ but the naïve equivalent in Slang will not compile.
303303
304304
```cpp
305305
// This function will compile when instantiated at a type which supports the +
306306
// operator. However this restriction is only discovered at the call site.
307-
template<T>
308-
float addValue(T v0, T v1) { return v0.x + v1.x; }
307+
template<typename T>
308+
float addValue(T v0, T v1) { return v0 + v1; }
309309
310310
// We happen to call `addValue` with a type that supports addition.
311311
void user() {addValue(1,2); }

0 commit comments

Comments
 (0)