diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-05-14 18:38:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 18:38:08 -0400 |
| commit | 1856b8ad85266ed66985b42bd2321a35f8573a00 (patch) | |
| tree | 0b978ac765741c3a7b29493608d96915013fb571 /tools | |
| parent | d4316c88457a32f1169b2d7d82053ccbc05fa7ed (diff) | |
DXC as DownstreamCompiler (#1845)
* #include an absolute path didn't work - because paths were taken to always be relative.
* WIP Fxc as downstream compiler.
* First pass FXC downstream compiler working.
* GCC compile fix.
* Fix FXC parsing issue.
* Special case filesystem access.
* Use StringUtil getSlice.
* Fix isses with not emitting source for FXC.
* WIP on DXC.
* Small fixes for DXBC handling.
* Removed DXC from ParseDiagnosticUtil (can use generic)
Try to improve output for notes from DXC.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/slang-test/parse-diagnostic-util.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/tools/slang-test/parse-diagnostic-util.cpp b/tools/slang-test/parse-diagnostic-util.cpp index 39d7274a7..c3c1669f1 100644 --- a/tools/slang-test/parse-diagnostic-util.cpp +++ b/tools/slang-test/parse-diagnostic-util.cpp @@ -15,34 +15,6 @@ using namespace Slang; -/* static */SlangResult ParseDiagnosticUtil::parseDXCLine(const UnownedStringSlice& line, List<UnownedStringSlice>& lineSlices, DownstreamDiagnostic& outDiagnostic) -{ - /* tests/diagnostics/syntax-error-intrinsic.slang:14:2: error: expected expression */ - if (lineSlices.getCount() < 5) - { - return SLANG_FAIL; - } - - outDiagnostic.filePath = lineSlices[0]; - - SLANG_RETURN_ON_FAIL(StringUtil::parseInt(lineSlices[1], outDiagnostic.fileLine)); - - Int lineCol; - SLANG_RETURN_ON_FAIL(StringUtil::parseInt(lineSlices[2], lineCol)); - - UnownedStringSlice severitySlice = lineSlices[3].trim(); - - outDiagnostic.severity = DownstreamDiagnostic::Severity::Error; - if (severitySlice == UnownedStringSlice::fromLiteral("warning")) - { - outDiagnostic.severity = DownstreamDiagnostic::Severity::Warning; - } - - // The rest of the line - outDiagnostic.text = UnownedStringSlice(lineSlices[4].begin(), line.end()); - return SLANG_OK; -} - /* static */ SlangResult ParseDiagnosticUtil::parseGlslangLine(const UnownedStringSlice& line, List<UnownedStringSlice>& lineSlices, DownstreamDiagnostic& outDiagnostic) { /* ERROR: tests/diagnostics/syntax-error-intrinsic.slang:13: '@' : unexpected token */ @@ -290,7 +262,6 @@ static SlangResult _findDownstreamCompiler(const UnownedStringSlice& slice, Slan { switch (compilerIdentity.m_downstreamCompiler) { - case SLANG_PASS_THROUGH_DXC: return &parseDXCLine; case SLANG_PASS_THROUGH_GLSLANG: return &parseGlslangLine; default: return &parseGenericLine; } |
