diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-09-10 16:31:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 13:31:26 -0700 |
| commit | 27ce5eb0de9f792f3e433bcb239c07d79371cf45 (patch) | |
| tree | bb85155ceafd280a3931432141fc1cc1dae20959 /source/core | |
| parent | 28adf8917e53953dbfebd746410a427a55eed814 (diff) | |
First Slang LLVM integration (#1934)
* #include an absolute path didn't work - because paths were taken to always be relative.
* First integration with 'slang-llvm'.
* Fix project.
* Fix test output.
* First pass assert support.
* Add inline impls for min and max.
* Add abs inline abs impl for llvm.
* Make abs not use ternary op
* Fix typo in slang-llvm.h
* Sundary fixes to make remaining tests using llvm backend pass.
Diffstat (limited to 'source/core')
| -rw-r--r-- | source/core/slang-type-text-util.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source/core/slang-type-text-util.cpp b/source/core/slang-type-text-util.cpp index 89cd4504b..c67b6ec6e 100644 --- a/source/core/slang-type-text-util.cpp +++ b/source/core/slang-type-text-util.cpp @@ -27,7 +27,8 @@ namespace Slang x(clang, CLANG) \ x(gcc, GCC) \ x(genericcpp, GENERIC_C_CPP) \ - x(nvrtc, NVRTC) + x(nvrtc, NVRTC) \ + x(llvm, LLVM) namespace { // anonymous @@ -136,7 +137,8 @@ static const ArchiveTypeInfo s_archiveTypeInfos[] = x(NVRTC, "NVRTC") \ x(FXC, "fxc") \ x(DXC, "dxc") \ - x(GLSLANG, "glslang") + x(GLSLANG, "glslang") \ + x(LLVM, "LLVM/Clang") /* static */UnownedStringSlice TypeTextUtil::getPassThroughAsHumanText(SlangPassThrough type) { @@ -192,15 +194,15 @@ static const ArchiveTypeInfo s_archiveTypeInfos[] = SLANG_PASS_THROUGH_TYPES(SLANG_PASS_THROUGH_NAME_TO_TYPE) - // Other options - if (slice == "c" || slice == "cpp") - { - return SLANG_PASS_THROUGH_GENERIC_C_CPP; - } - else if (slice == "vs") - { - return SLANG_PASS_THROUGH_VISUAL_STUDIO; - } + // Other options + if (slice == "c" || slice == "cpp") + { + return SLANG_PASS_THROUGH_GENERIC_C_CPP; + } + else if (slice == "vs") + { + return SLANG_PASS_THROUGH_VISUAL_STUDIO; + } return SLANG_PASS_THROUGH_NONE; } |