diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2021-02-04 18:45:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-04 15:45:50 -0800 |
| commit | fb053433ef64bbae50a8a10ea4381a5695019fac (patch) | |
| tree | 87298897bf88ec79b40343a868a283d1885357b9 /build | |
| parent | c40f10b704b8bd5a744cc9b3964344585436b1ac (diff) | |
Fix line offset problem (#1690)
* #include an absolute path didn't work - because paths were taken to always be relative.
* WIP diagnostics for line number output.
* Small param naming change
* Use x macro for pass through compile human name lookup/getting.
* WIP on parsing downstream compiler output.
* Split out parsing into ParseDiagnosticUtil.
Added test result of single line.
* Dump out the std output on fail to parse diagnostics.
* Change test type for syntax-error-intrinsic.slang be TEST not TEST_DIAGNOSTIC
* Use Index for StringUtil.
* WIP: First pass support for parsing Slang diagnostics.
* WIP Testing comparing with ParseDiagnosticUtil with previous ad-hoc mechanism.
* Use the new parsing mechanism for diagnostic comparisons.
* Fix layout on GLSL, doesn't have CR so runs into main.
* Split out switch on outputting intrinsic 'specials'.
Output code around intrinsic as emit - so that we get the appropriate indenting (and potentially other benefits).
* Improvements to diagnostics parsing.
Better error handling, and fallback handling.
Added ability to parse downstream compilers without a prefix.
Added ability to parse Slang with a prefix.
* DownstreamDiagnostic::Type -> Severity and related fixes.
* Small fixes around moving from DownstreamDiagnostic::Type -> Severity
* Fix handling of 'special intrinsic' expansion
* Split out the handling of intrinsic expansion into it's own type and files.
* Fixes to reading expected output - for SimpleLine test.
* Test using += to check #line output.
* A test around += and return.
* Small comment fixes.
Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/visual-studio/slang/slang.vcxproj | 2 | ||||
| -rw-r--r-- | build/visual-studio/slang/slang.vcxproj.filters | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj index 642ddab7a..55233f013 100644 --- a/build/visual-studio/slang/slang.vcxproj +++ b/build/visual-studio/slang/slang.vcxproj @@ -219,6 +219,7 @@ <ClInclude Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.h" /> <ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h" /> <ClInclude Include="..\..\..\source\slang\slang-include-system.h" /> + <ClInclude Include="..\..\..\source\slang\slang-intrinsic-expand.h" /> <ClInclude Include="..\..\..\source\slang\slang-ir-any-value-marshalling.h" /> <ClInclude Include="..\..\..\source\slang\slang-ir-augment-make-existential.h" /> <ClInclude Include="..\..\..\source\slang\slang-ir-bind-existentials.h" /> @@ -345,6 +346,7 @@ <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-hlsl-intrinsic-set.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-include-system.cpp" /> + <ClCompile Include="..\..\..\source\slang\slang-intrinsic-expand.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-ir-any-value-marshalling.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-ir-augment-make-existential.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-ir-bind-existentials.cpp" /> diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters index 60b3f0d65..a31688e05 100644 --- a/build/visual-studio/slang/slang.vcxproj.filters +++ b/build/visual-studio/slang/slang.vcxproj.filters @@ -108,6 +108,9 @@ <ClInclude Include="..\..\..\source\slang\slang-include-system.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\slang\slang-intrinsic-expand.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\..\..\source\slang\slang-ir-any-value-marshalling.h"> <Filter>Header Files</Filter> </ClInclude> @@ -482,6 +485,9 @@ <ClCompile Include="..\..\..\source\slang\slang-include-system.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\slang\slang-intrinsic-expand.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\source\slang\slang-ir-any-value-marshalling.cpp"> <Filter>Source Files</Filter> </ClCompile> |