summaryrefslogtreecommitdiffstats
path: root/build/visual-studio
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-05-19 15:57:11 -0400
committerGitHub <noreply@github.com>2021-05-19 12:57:11 -0700
commit61e9154cb797cffe19cfbf3205b4a5a614e8b552 (patch)
tree94270d53c8189d25e6d11dee14860704759b7129 /build/visual-studio
parentd5e8044d0a9723bb0bbd7ae1738d1157265da783 (diff)
Glslang as DownstreamCompiler (#1846)
* #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. * FIrst pass of Glslang as DownstreamCompiler * Fix some problems with parsing for glslang replacement. * Add slang-glslang-compiler.cpp/.h * Fix downstream for spir-v output. * dissassemble -> disassemble * Fix typo and improve some naming/comments. * Remove getSharedLibrary from DownstreamCompiler * Removed some no longer used diagnostics.
Diffstat (limited to 'build/visual-studio')
-rw-r--r--build/visual-studio/compiler-core/compiler-core.vcxproj2
-rw-r--r--build/visual-studio/compiler-core/compiler-core.vcxproj.filters6
2 files changed, 8 insertions, 0 deletions
diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj
index aef6066fb..7e815d4fa 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj
@@ -176,6 +176,7 @@
<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-glslang-compiler.h" />
<ClInclude Include="..\..\..\source\compiler-core\slang-include-system.h" />
<ClInclude Include="..\..\..\source\compiler-core\slang-lexer-diagnostic-defs.h" />
<ClInclude Include="..\..\..\source\compiler-core\slang-lexer.h" />
@@ -196,6 +197,7 @@
<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-glslang-compiler.cpp" />
<ClCompile Include="..\..\..\source\compiler-core\slang-include-system.cpp" />
<ClCompile Include="..\..\..\source\compiler-core\slang-lexer.cpp" />
<ClCompile Include="..\..\..\source\compiler-core\slang-name-convention-util.cpp" />
diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
index bd10293c2..a4fc4e2c2 100644
--- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
+++ b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters
@@ -27,6 +27,9 @@
<ClInclude Include="..\..\..\source\compiler-core\slang-gcc-compiler-util.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\source\compiler-core\slang-glslang-compiler.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\source\compiler-core\slang-include-system.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -83,6 +86,9 @@
<ClCompile Include="..\..\..\source\compiler-core\slang-gcc-compiler-util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\source\compiler-core\slang-glslang-compiler.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\source\compiler-core\slang-include-system.cpp">
<Filter>Source Files</Filter>
</ClCompile>