Skip to content

Commit 37b44a7

Browse files
Xottab-DUTYXottab-DUTY
committed
Update glslang
1 parent d21e34a commit 37b44a7

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

‎Externals/SPIRV.vcxproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,17 @@
9595
<ClInclude Include="glslang\SPIRV\SPVRemapper.h" />
9696
</ItemGroup>
9797
<ItemGroup>
98+
<ProjectReference Include="glslang.vcxproj">
99+
<Project>{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}</Project>
100+
</ProjectReference>
98101
<ProjectReference Include="HLSL.vcxproj">
99-
<Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
100-
<Name>HLSL</Name>
102+
<Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
101103
</ProjectReference>
102104
<ProjectReference Include="OGLCompiler.vcxproj">
103-
<Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
104-
<Name>OGLCompiler</Name>
105+
<Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
105106
</ProjectReference>
106107
<ProjectReference Include="OSDependent.vcxproj">
107-
<Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
108-
<Name>OSDependent</Name>
109-
</ProjectReference>
110-
<ProjectReference Include="glslang.vcxproj">
111-
<Project>8559BC92-BC07-32EF-BEED-0C50FE6CA3C3</Project>
112-
<Name>glslang</Name>
108+
<Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
113109
</ProjectReference>
114110
</ItemGroup>
115111
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Externals/glslang‎

Submodule glslang updated 772 files

‎Externals/glslang.vcxproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
</ResourceCompile>
7373
</ItemDefinitionGroup>
7474
<ItemGroup>
75+
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp" />
7576
<ClCompile Include="glslang\glslang\MachineIndependent\Constant.cpp" />
7677
<ClCompile Include="glslang\glslang\MachineIndependent\glslang_tab.cpp" />
7778
<ClCompile Include="glslang\glslang\MachineIndependent\InfoSink.cpp" />
@@ -98,6 +99,7 @@
9899
<ClCompile Include="glslang\glslang\MachineIndependent\ShaderLang.cpp" />
99100
<ClCompile Include="glslang\glslang\MachineIndependent\SymbolTable.cpp" />
100101
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp" />
102+
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h" />
101103
<ClInclude Include="glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
102104
<ClInclude Include="glslang\glslang\MachineIndependent\gl_types.h" />
103105
<ClInclude Include="glslang\glslang\MachineIndependent\Initialize.h" />
@@ -131,23 +133,20 @@
131133
<ClCompile Include="glslang\glslang\GenericCodeGen\CodeGen.cpp" />
132134
<ClCompile Include="glslang\glslang\GenericCodeGen\Link.cpp" />
133135
</ItemGroup>
136+
<ItemGroup>
137+
<None Include="glslang\glslang\MachineIndependent\glslang.y" />
138+
</ItemGroup>
134139
<ItemGroup>
135140
<ProjectReference Include="HLSL.vcxproj">
136-
<Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
137-
<Name>HLSL</Name>
141+
<Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
138142
</ProjectReference>
139143
<ProjectReference Include="OGLCompiler.vcxproj">
140-
<Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
141-
<Name>OGLCompiler</Name>
144+
<Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
142145
</ProjectReference>
143146
<ProjectReference Include="OSDependent.vcxproj">
144-
<Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
145-
<Name>OSDependent</Name>
147+
<Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
146148
</ProjectReference>
147149
</ItemGroup>
148-
<ItemGroup>
149-
<None Include="glslang\glslang\MachineIndependent\glslang.y" />
150-
</ItemGroup>
151150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
152151
<ImportGroup Label="ExtensionTargets">
153152
</ImportGroup>

‎Externals/glslang.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp">
8686
<Filter>MachineIndependent</Filter>
8787
</ClCompile>
88+
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp">
89+
<Filter>MachineIndependent</Filter>
90+
</ClCompile>
8891
</ItemGroup>
8992
<ItemGroup>
9093
<ClInclude Include="glslang\glslang\Public\ShaderLang.h">
@@ -177,6 +180,9 @@
177180
<ClInclude Include="glslang\glslang\MachineIndependent\Versions.h">
178181
<Filter>MachineIndependent</Filter>
179182
</ClInclude>
183+
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h">
184+
<Filter>MachineIndependent</Filter>
185+
</ClInclude>
180186
</ItemGroup>
181187
<ItemGroup>
182188
<Filter Include="Public">

‎src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8282
</ClCompile>
8383
<Link>
84-
<AdditionalDependencies>nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
84+
<AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
8585
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
8686
</Link>
8787
</ItemDefinitionGroup>
@@ -91,7 +91,7 @@
9191
<PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9292
</ClCompile>
9393
<Link>
94-
<AdditionalDependencies>nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
94+
<AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
9595
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9696
</Link>
9797
</ItemDefinitionGroup>
@@ -101,7 +101,7 @@
101101
<PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102102
</ClCompile>
103103
<Link>
104-
<AdditionalDependencies>nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
104+
<AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
105105
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
106106
</Link>
107107
</ItemDefinitionGroup>
@@ -112,7 +112,7 @@
112112
<FloatingPointModel>Precise</FloatingPointModel>
113113
</ClCompile>
114114
<Link>
115-
<AdditionalDependencies>nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
115+
<AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
116116
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
117117
</Link>
118118
</ItemDefinitionGroup>
@@ -122,7 +122,7 @@
122122
<PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123123
</ClCompile>
124124
<Link>
125-
<AdditionalDependencies>nvapi.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
125+
<AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
126126
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
127127
</Link>
128128
</ItemDefinitionGroup>
@@ -132,7 +132,7 @@
132132
<PreprocessorDefinitions>_USRDLL;XRRENDER_GL_EXPORTS;USE_OGL;NO_XR_VDECLARATOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133133
</ClCompile>
134134
<Link>
135-
<AdditionalDependencies>nvapi64.lib;amd_ags_$(PlatformShortName).lib;oalib.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
135+
<AdditionalDependencies>oalib.lib;opengl32.lib;glu32.lib;nvapi64.lib;amd_ags_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
136136
<AdditionalLibraryDirectories>$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\amd64;$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
137137
</Link>
138138
</ItemDefinitionGroup>
@@ -474,6 +474,9 @@
474474
<ProjectReference Include="..\..\..\Externals\glslang.vcxproj">
475475
<Project>{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}</Project>
476476
</ProjectReference>
477+
<ProjectReference Include="..\..\..\Externals\SPIRV.vcxproj">
478+
<Project>{3af44175-2eed-3c67-b324-93b1572b7edd}</Project>
479+
</ProjectReference>
477480
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
478481
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
479482
</ProjectReference>

0 commit comments

Comments
 (0)