libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-03 22:17:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade glslang to a fresh version (used to compile Vulkan shaders). Might help #10065 ?)

Browse Source
This commit is contained in:
Henrik Rydgård 2017-11-09 13:07:30 +01:00
parent 845b02a6c5
commit 4e04780adc
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/jni/app-android.cpp
View File

@ -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;

2
ext/glslang

@ -1 +1 @@
Subproject commit 136b1e2d5d90284fd7bdd77ed605c70a8d31c8c4
Subproject commit 2edde6665d9a56ead5ea0e55b4e64d9a803e6164

7
ext/glslang.vcxproj
View File

@ -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" />

12
ext/glslang.vcxproj.filters
View File

@ -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>