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 /build | |
| 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 'build')
4 files changed, 8 insertions, 4 deletions
diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj index 57b2c759f..aef6066fb 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj @@ -173,6 +173,7 @@ <ClInclude Include="..\..\..\source\compiler-core\slang-core-diagnostics.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-diagnostic-sink.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-downstream-compiler.h" /> + <ClInclude Include="..\..\..\source\compiler-core\slang-dxc-compiler.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-fxc-compiler.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-gcc-compiler-util.h" /> <ClInclude Include="..\..\..\source\compiler-core\slang-include-system.h" /> @@ -192,6 +193,7 @@ <ClCompile Include="..\..\..\source\compiler-core\slang-core-diagnostics.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-diagnostic-sink.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-downstream-compiler.cpp" /> + <ClCompile Include="..\..\..\source\compiler-core\slang-dxc-compiler.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-fxc-compiler.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-gcc-compiler-util.cpp" /> <ClCompile Include="..\..\..\source\compiler-core\slang-include-system.cpp" /> diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters index 1b2df55c6..bd10293c2 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters @@ -18,6 +18,9 @@ <ClInclude Include="..\..\..\source\compiler-core\slang-downstream-compiler.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\source\compiler-core\slang-dxc-compiler.h"> + <Filter>Header Files</Filter> + </ClInclude> <ClInclude Include="..\..\..\source\compiler-core\slang-fxc-compiler.h"> <Filter>Header Files</Filter> </ClInclude> @@ -71,6 +74,9 @@ <ClCompile Include="..\..\..\source\compiler-core\slang-downstream-compiler.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\compiler-core\slang-dxc-compiler.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\source\compiler-core\slang-fxc-compiler.cpp"> <Filter>Source Files</Filter> </ClCompile> diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj index d90635ccb..00b7f6b02 100644 --- a/build/visual-studio/slang/slang.vcxproj +++ b/build/visual-studio/slang/slang.vcxproj @@ -333,7 +333,6 @@ <ClCompile Include="..\..\..\source\slang\slang-diagnostics.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-doc-extractor.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-doc-markdown-writer.cpp" /> - <ClCompile Include="..\..\..\source\slang\slang-dxc-support.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-emit-c-like.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-emit-cpp.cpp" /> <ClCompile Include="..\..\..\source\slang\slang-emit-cuda.cpp" /> diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters index 1806fb8d0..8580ead0a 100644 --- a/build/visual-studio/slang/slang.vcxproj.filters +++ b/build/visual-studio/slang/slang.vcxproj.filters @@ -446,9 +446,6 @@ <ClCompile Include="..\..\..\source\slang\slang-doc-markdown-writer.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\slang\slang-dxc-support.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\slang\slang-emit-c-like.cpp"> <Filter>Source Files</Filter> </ClCompile> |