Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
[submodule "docs/external/slangpy"]
path = docs/external/slangpy
url = https://github.com/shader-slang/slangpy.git
[submodule "docs/external/stdlib-reference"]
path = docs/external/stdlib-reference
[submodule "docs/external/core-module-reference"]
path = docs/external/core-module-reference
url = https://github.com/shader-slang/stdlib-reference.git
2 changes: 1 addition & 1 deletion _data/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ overview:
link_label: "User Guide"
- title: "Standard Modules Reference"
description: "The reference of the standard modules that comes with the Slang compiler."
link_url: "https://docs.shader-slang.org/en/latest/external/stdlib-reference/"
link_url: "https://docs.shader-slang.org/en/latest/external/core-module-reference/"
link_label: "Modules Reference"
- title: "Language Specification"
description: "The formal specification of the Slang programming language. Work in progress.."
Expand Down
10 changes: 5 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ def setup(app):
]
include_patterns = ['index.rst', '*.md',
"external/slang/docs/user-guide/*.md",
"external/stdlib-reference/index.md",
"external/stdlib-reference/attributes/**",
"external/stdlib-reference/global-decls/**",
"external/stdlib-reference/interfaces/**",
"external/stdlib-reference/types/**",
"external/core-module-reference/index.md",
"external/core-module-reference/attributes/**",
"external/core-module-reference/global-decls/**",
"external/core-module-reference/interfaces/**",
"external/core-module-reference/types/**",
"external/slangpy/docs/**",
]

Expand Down
1 change: 1 addition & 0 deletions docs/external/core-module-reference
Submodule core-module-reference added at 696266
1 change: 0 additions & 1 deletion docs/external/stdlib-reference
Submodule stdlib-reference deleted from 78b2b2
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Slang Documentation
:titlesonly:

User Guide <external/slang/docs/user-guide/index>
Standard Modules Reference <external/stdlib-reference/index>
Standard Modules Reference <external/core-module-reference/index>
Language Spec <https://github.com/shader-slang/spec>
SlangPy User Guide <external/slangpy/docs/index.rst>
Feature Matureness <feature_matureness>
Expand Down
4 changes: 2 additions & 2 deletions docs/understanding-generics.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,9 @@ float addValue<T>(T v0, T v1) where T : IArithmetic { return v0 + v1; }

It is still possible to write functions which can generically operate over
scalars and vectors, for example using the
[`IArithmetic`](https://shader-slang.com/stdlib-reference/interfaces/iarithmetic-01/index.html)
[`IArithmetic`](https://docs.shader-slang.org/en/latest/external/core-module-reference/interfaces/iarithmetic-01/index.html)
or
[`IFloat`](https://shader-slang.com/stdlib-reference/interfaces/ifloat-01/index.html)
[`IFloat`](https://docs.shader-slang.org/en/latest/external/core-module-reference/interfaces/ifloat-01/index.html)
interfaces.

### Advanced Generic Features
Expand Down