Permalink
Browse files

Merge pull request #10076 from hrydgard/upgrade-glslang

Upgrade glslang to a fresh version (used to compile Vulkan shaders).
  • Loading branch information...
hrydgard committed Nov 9, 2017
2 parents 845b02a + b689e8e commit cd55e9d2a84a184acd236bf33728ad3530e5a662
@@ -323,7 +323,6 @@
<ClInclude Include="..\..\ext\glslang\hlsl\hlslGrammar.h" />
<ClInclude Include="..\..\ext\glslang\hlsl\hlslOpMap.h" />
<ClInclude Include="..\..\ext\glslang\hlsl\hlslParseables.h" />
<ClInclude Include="..\..\ext\glslang\hlsl\hlslParseHelper.h" />
<ClInclude Include="..\..\ext\glslang\hlsl\hlslScanContext.h" />
<ClInclude Include="..\..\ext\glslang\hlsl\hlslTokens.h" />
<ClInclude Include="..\..\ext\glslang\hlsl\hlslTokenStream.h" />
@@ -365,9 +364,7 @@
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\propagateNoContraction.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\reflection.cpp" />
@@ -381,7 +378,6 @@
<ClCompile Include="..\..\ext\glslang\hlsl\hlslGrammar.cpp" />
<ClCompile Include="..\..\ext\glslang\hlsl\hlslOpMap.cpp" />
<ClCompile Include="..\..\ext\glslang\hlsl\hlslParseables.cpp" />
<ClCompile Include="..\..\ext\glslang\hlsl\hlslParseHelper.cpp" />
<ClCompile Include="..\..\ext\glslang\hlsl\hlslScanContext.cpp" />
<ClCompile Include="..\..\ext\glslang\hlsl\hlslTokenStream.cpp" />
<ClCompile Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.cpp" />
@@ -407,4 +403,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
@@ -103,15 +103,9 @@
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
<Filter>glslang\MachineIndependent\Preprocessor</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp">
<Filter>glslang\MachineIndependent\Preprocessor</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
<Filter>glslang\MachineIndependent\Preprocessor</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp">
<Filter>glslang\MachineIndependent\Preprocessor</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
<Filter>glslang\MachineIndependent\Preprocessor</Filter>
</ClCompile>
@@ -154,9 +148,6 @@
<ClCompile Include="..\..\ext\glslang\hlsl\hlslParseables.cpp">
<Filter>hlsl</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\hlsl\hlslParseHelper.cpp">
<Filter>hlsl</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\hlsl\hlslScanContext.cpp">
<Filter>hlsl</Filter>
</ClCompile>
@@ -314,9 +305,6 @@
<ClInclude Include="..\..\ext\glslang\hlsl\hlslParseables.h">
<Filter>hlsl</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\glslang\hlsl\hlslParseHelper.h">
<Filter>hlsl</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\glslang\hlsl\hlslScanContext.h">
<Filter>hlsl</Filter>
</ClInclude>
@@ -330,4 +318,4 @@
<Filter>OGLCompilersDLL</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>
@@ -304,6 +304,7 @@ bool AndroidVulkanContext::Init(ANativeWindow *wnd, int desiredBackbufferSizeX,
ILOG("Creating vulkan device");
if (g_Vulkan->CreateDevice() != VK_SUCCESS) {
ILOG("Failed to create vulkan device: %s", g_Vulkan->InitError().c_str());
System_SendMessage("toast", "No Vulkan driver found. Using OpenGL instead.");
delete g_Vulkan;
g_Vulkan = nullptr;
return false;
Submodule glslang updated 812 files
@@ -33,16 +33,13 @@ LOCAL_SRC_FILES := \
../glslang/glslang/MachineIndependent/preprocessor/Pp.cpp \
../glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp \
../glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp \
../glslang/glslang/MachineIndependent/preprocessor/PpMemory.cpp \
../glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp \
../glslang/glslang/MachineIndependent/preprocessor/PpSymbols.cpp \
../glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp \
../glslang/glslang/OSDependent/Unix/ossource.cpp \
../glslang/hlsl/hlslAttributes.cpp \
../glslang/hlsl/hlslGrammar.cpp \
../glslang/hlsl/hlslOpMap.cpp \
../glslang/hlsl/hlslParseables.cpp \
../glslang/hlsl/hlslParseHelper.cpp \
../glslang/hlsl/hlslScanContext.cpp \
../glslang/hlsl/hlslTokenStream.cpp \
../glslang/SPIRV/disassemble.cpp \
View
@@ -22,7 +22,8 @@
<ProjectGuid>{EDFA2E87-8AC1-4853-95D4-D7594FF81947}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>glslang</RootNamespace>
<WindowsTargetPlatformVersion></WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>
</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -168,9 +169,7 @@
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\propagateNoContraction.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\reflection.cpp" />
@@ -184,7 +183,6 @@
<ClCompile Include="glslang\hlsl\hlslGrammar.cpp" />
<ClCompile Include="glslang\hlsl\hlslOpMap.cpp" />
<ClCompile Include="glslang\hlsl\hlslParseables.cpp" />
<ClCompile Include="glslang\hlsl\hlslParseHelper.cpp" />
<ClCompile Include="glslang\hlsl\hlslScanContext.cpp" />
<ClCompile Include="glslang\hlsl\hlslTokenStream.cpp" />
<ClCompile Include="glslang\OGLCompilersDLL\InitializeDll.cpp" />
@@ -231,7 +229,6 @@
<ClInclude Include="glslang\hlsl\hlslGrammar.h" />
<ClInclude Include="glslang\hlsl\hlslOpMap.h" />
<ClInclude Include="glslang\hlsl\hlslParseables.h" />
<ClInclude Include="glslang\hlsl\hlslParseHelper.h" />
<ClInclude Include="glslang\hlsl\hlslScanContext.h" />
<ClInclude Include="glslang\hlsl\hlslTokens.h" />
<ClInclude Include="glslang\hlsl\hlslTokenStream.h" />
@@ -42,15 +42,9 @@
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
<Filter>glslang</Filter>
</ClCompile>
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp">
<Filter>glslang</Filter>
</ClCompile>
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
<Filter>glslang</Filter>
</ClCompile>
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp">
<Filter>glslang</Filter>
</ClCompile>
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
<Filter>glslang</Filter>
</ClCompile>
@@ -137,9 +131,6 @@
<ClCompile Include="glslang\hlsl\hlslParseables.cpp">
<Filter>HLSL</Filter>
</ClCompile>
<ClCompile Include="glslang\hlsl\hlslParseHelper.cpp">
<Filter>HLSL</Filter>
</ClCompile>
<ClCompile Include="glslang\hlsl\hlslScanContext.cpp">
<Filter>HLSL</Filter>
</ClCompile>
@@ -290,9 +281,6 @@
<ClInclude Include="glslang\hlsl\hlslParseables.h">
<Filter>HLSL</Filter>
</ClInclude>
<ClInclude Include="glslang\hlsl\hlslParseHelper.h">
<Filter>HLSL</Filter>
</ClInclude>
<ClInclude Include="glslang\hlsl\hlslScanContext.h">
<Filter>HLSL</Filter>
</ClInclude>

0 comments on commit cd55e9d

Please sign in to comment.