diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-10-11 15:47:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 15:47:49 -0400 |
| commit | 09c8486f8e6aa1be0511b1d66586ada4d6bab196 (patch) | |
| tree | eff8f4863313881dbefc6e4578b7591c7d1c01dc /source | |
| parent | a8c8b1698d8aff5d2cf2ddfd664d506096dbaf0f (diff) | |
Update stdlib docs/small fixes (#1972)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Upgrade to GLSLANG 11.16.0+
* Small edit to readme - really to kick another build.
* Upgrade slang-binaries to include new glslang binaries.
* Update slang-binaries to include linux-x86
* Upgrade slang-binaries.
* Support for GL_NV_ray_tracing_motion_blur extension.
* Fix issues with doc output around spirv_direct
Updated docs.
* Remove spirv_direct from names of codegen targets.
* Improvements around spirv_direct in docs.
* Updated stdlib docs.
Diffstat (limited to 'source')
| -rw-r--r-- | source/core/slang-type-text-util.cpp | 6 | ||||
| -rw-r--r-- | source/slang/slang-doc-markdown-writer.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/source/core/slang-type-text-util.cpp b/source/core/slang-type-text-util.cpp index c67b6ec6e..5be097d15 100644 --- a/source/core/slang-type-text-util.cpp +++ b/source/core/slang-type-text-util.cpp @@ -64,7 +64,7 @@ static const CompileTargetInfo s_compileTargetInfos[] = { SLANG_GLSL, "glsl,vert,frag,geom,tesc,tese,comp", "glsl" }, { SLANG_GLSL_VULKAN, "", "glsl-vulkan" }, { SLANG_GLSL_VULKAN_ONE_DESC, "", "glsl-vulkan-one-desc" }, - { SLANG_SPIRV, "spv", "spirv" }, + { SLANG_SPIRV, "spv", "spirv"}, { SLANG_SPIRV_ASM, "spv.asm", "spirv-asm,spirv-assembly" }, { SLANG_C_SOURCE, "c", "c" }, { SLANG_CPP_SOURCE, "cpp,c++,cxx", "cpp,c++,cxx" }, @@ -72,7 +72,9 @@ static const CompileTargetInfo s_compileTargetInfos[] = { SLANG_SHARED_LIBRARY, "dll,so", "sharedlib,sharedlibrary,dll" }, { SLANG_CUDA_SOURCE, "cu", "cuda,cu" }, { SLANG_PTX, "ptx", "ptx" }, - { SLANG_HOST_CALLABLE, "", "host-callable,callable" } + { SLANG_HOST_CALLABLE, "", "host-callable,callable" }, + { SLANG_OBJECT_CODE, "obj,o", "object-code" }, + }; struct ArchiveTypeInfo diff --git a/source/slang/slang-doc-markdown-writer.cpp b/source/slang/slang-doc-markdown-writer.cpp index c2bc05dbb..2a1226bb7 100644 --- a/source/slang/slang-doc-markdown-writer.cpp +++ b/source/slang/slang-doc-markdown-writer.cpp @@ -422,6 +422,11 @@ static DocMarkdownWriter::Requirement _getRequirementFromTargetToken(const Token } auto targetName = tok.getContent(); + if (targetName == "spirv_direct") + { + return Requirement{CodeGenTarget::SPIRV, UnownedStringSlice("")}; + } + const CapabilityAtom targetCap = findCapabilityAtom(targetName); if (targetCap == CapabilityAtom::Invalid) @@ -543,6 +548,7 @@ void DocMarkdownWriter::_writeTargetRequirements(const Requirement* reqs, Index // Okay we need the name of the CodeGen target UnownedStringSlice name = TypeTextUtil::getCompileTargetName(SlangCompileTarget(reqs->target)); + out << toSlice("**") << String(name).toUpper() << toSlice("**"); if (!(reqsCount == 1 && reqs[0].value.getLength() == 0)) |