diff options
| author | Yong He <yongh@outlook.com> | 2018-01-03 12:47:46 -0800 |
|---|---|---|
| committer | Yong He <yongh@outlook.com> | 2018-01-03 12:47:46 -0800 |
| commit | 36bc65aa95210f383df9564c75bf1fa9efdadf8a (patch) | |
| tree | 57dd54ff5b71e16c9efe99b5730405e347f2d8a5 | |
| parent | 9f89c3b2de80c49222c4a6b48e845894c4256a5d (diff) | |
| parent | 51f0701989ac4730cd87f0d8c656a1c6b1618255 (diff) | |
Merge https://github.com/shader-slang/slang
| -rw-r--r-- | source/slang/emit.cpp | 1 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj | 1 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj.filters | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp index 080478225..e60941e50 100644 --- a/source/slang/emit.cpp +++ b/source/slang/emit.cpp @@ -7122,6 +7122,7 @@ emitDeclImpl(decl, nullptr); case kIROp_global_var: { auto irGlobal = (IRGlobalVar*) value; + emitIRUsedType(ctx, irGlobal->type); emitIRUsedTypesForGlobalValueWithCode(ctx, irGlobal); } break; diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index 9835640e0..21ed1504c 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -165,6 +165,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> + <Natvis Include="..\core\core.natvis" /> <Natvis Include="slang.natvis" /> </ItemGroup> <ItemGroup> diff --git a/source/slang/slang.vcxproj.filters b/source/slang/slang.vcxproj.filters index f207c6dcd..e147e60d6 100644 --- a/source/slang/slang.vcxproj.filters +++ b/source/slang/slang.vcxproj.filters @@ -2,6 +2,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Natvis Include="slang.natvis" /> + <Natvis Include="..\core\core.natvis" /> </ItemGroup> <ItemGroup> <ClInclude Include="compiler.h" /> |
