mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-23 05:19:56 +00:00
glslang for vulkan: Use my proper glslang fork instead of the ugly old SDK-glslang fork
This commit is contained in:
Henrik Rydgard
parent
2cf3f0247a
commit
b46bb1efdb
4
.gitignore
vendored
4
.gitignore
vendored
@ -47,6 +47,10 @@ PPSSPPControls.dat
|
||||
# Qt Linguist files
|
||||
*.qm
|
||||
|
||||
#Android stuff
|
||||
.idea
|
||||
android/.idea
|
||||
|
||||
Logs
|
||||
Memstick
|
||||
memstick
|
||||
|
||||
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -13,6 +13,6 @@
|
||||
[submodule "ext/armips"]
|
||||
path = ext/armips
|
||||
url = https://github.com/Kingcom/armips
|
||||
[submodule "ext/ppsspp-glslang"]
|
||||
[submodule "ext/glslang"]
|
||||
path = ext/glslang
|
||||
url = https://github.com/hrydgard/ppsspp-glslang.git
|
||||
url = https://github.com/hrydgard/glslang.git
|
||||
|
||||
@ -5,3 +5,4 @@ endif()
|
||||
|
||||
add_subdirectory(snappy)
|
||||
add_subdirectory(udis86)
|
||||
add_subdirectory(glslang)
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 0bf900e4abee13eaea8aec2a6a50fb5f003df528
|
||||
Subproject commit 432576fdce62521d187afd941a8c27072ee5cfa1
|
||||
@ -154,9 +154,11 @@
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\Intermediate.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\intermOut.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\IntermTraverse.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\iomapper.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\limits.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\linkValidate.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\parseConst.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\ParseContextBase.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\ParseHelper.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\PoolAlloc.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
|
||||
@ -166,6 +168,7 @@
|
||||
<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" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\RemoveTree.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\Scan.cpp" />
|
||||
@ -173,11 +176,19 @@
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\SymbolTable.cpp" />
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp" />
|
||||
<ClCompile Include="glslang\glslang\OSDependent\Windows\ossource.cpp" />
|
||||
<ClCompile Include="glslang\hlsl\hlslAttributes.cpp" />
|
||||
<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" />
|
||||
<ClCompile Include="glslang\SPIRV\disassemble.cpp" />
|
||||
<ClCompile Include="glslang\SPIRV\doc.cpp" />
|
||||
<ClCompile Include="glslang\SPIRV\GlslangToSpv.cpp" />
|
||||
<ClCompile Include="glslang\SPIRV\InReadableOrder.cpp" />
|
||||
<ClCompile Include="glslang\SPIRV\Logger.cpp" />
|
||||
<ClCompile Include="glslang\SPIRV\SpvBuilder.cpp" />
|
||||
<ClCompile Include="glslang\SPIRV\SPVRemapper.cpp" />
|
||||
</ItemGroup>
|
||||
@ -191,15 +202,20 @@
|
||||
<ClInclude Include="glslang\glslang\Include\intermediate.h" />
|
||||
<ClInclude Include="glslang\glslang\Include\PoolAlloc.h" />
|
||||
<ClInclude Include="glslang\glslang\Include\ResourceLimits.h" />
|
||||
<ClInclude Include="glslang\glslang\Include\revision.h" />
|
||||
<ClInclude Include="glslang\glslang\Include\ShHandle.h" />
|
||||
<ClInclude Include="glslang\glslang\Include\Types.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\gl_types.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\Initialize.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\iomapper.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\LiveTraverser.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\localintermediate.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\ParseHelper.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\parseVersions.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\preprocessor\PpContext.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\propagateNoContraction.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\reflection.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\RemoveTree.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\Scan.h" />
|
||||
@ -207,11 +223,24 @@
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\SymbolTable.h" />
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\Versions.h" />
|
||||
<ClInclude Include="glslang\glslang\Public\ShaderLang.h" />
|
||||
<ClInclude Include="glslang\hlsl\hlslAttributes.h" />
|
||||
<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" />
|
||||
<ClInclude Include="glslang\OGLCompilersDLL\InitializeDll.h" />
|
||||
<ClInclude Include="glslang\SPIRV\bitutils.h" />
|
||||
<ClInclude Include="glslang\SPIRV\disassemble.h" />
|
||||
<ClInclude Include="glslang\SPIRV\doc.h" />
|
||||
<ClInclude Include="glslang\SPIRV\GLSL.ext.AMD.h" />
|
||||
<ClInclude Include="glslang\SPIRV\GLSL.ext.KHR.h" />
|
||||
<ClInclude Include="glslang\SPIRV\GLSL.std.450.h" />
|
||||
<ClInclude Include="glslang\SPIRV\GlslangToSpv.h" />
|
||||
<ClInclude Include="glslang\SPIRV\hex_float.h" />
|
||||
<ClInclude Include="glslang\SPIRV\Logger.h" />
|
||||
<ClInclude Include="glslang\SPIRV\spirv.hpp" />
|
||||
<ClInclude Include="glslang\SPIRV\SpvBuilder.h" />
|
||||
<ClInclude Include="glslang\SPIRV\spvIR.h" />
|
||||
@ -223,4 +252,4 @@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
@ -7,6 +7,9 @@
|
||||
<Filter Include="glslang">
|
||||
<UniqueIdentifier>{b58351f2-24d7-471d-b842-a8bf8f4f7e90}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="HLSL">
|
||||
<UniqueIdentifier>{bebc5043-a1be-442e-b458-6ee3dbd2309b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="glslang\SPIRV\disassemble.cpp">
|
||||
@ -110,6 +113,39 @@
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\glslang_tab.cpp">
|
||||
<Filter>glslang</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\iomapper.cpp">
|
||||
<Filter>glslang</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\ParseContextBase.cpp">
|
||||
<Filter>glslang</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\glslang\MachineIndependent\propagateNoContraction.cpp">
|
||||
<Filter>glslang</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\SPIRV\Logger.cpp">
|
||||
<Filter>SPIRV</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\hlsl\hlslAttributes.cpp">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\hlsl\hlslGrammar.cpp">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="glslang\hlsl\hlslOpMap.cpp">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClCompile>
|
||||
<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>
|
||||
<ClCompile Include="glslang\hlsl\hlslTokenStream.cpp">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="glslang\SPIRV\disassemble.h">
|
||||
@ -212,6 +248,60 @@
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\glslang_tab.cpp.h">
|
||||
<Filter>glslang</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\glslang\Include\revision.h">
|
||||
<Filter>glslang</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\iomapper.h">
|
||||
<Filter>glslang</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\LiveTraverser.h">
|
||||
<Filter>glslang</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\parseVersions.h">
|
||||
<Filter>glslang</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\glslang\MachineIndependent\propagateNoContraction.h">
|
||||
<Filter>glslang</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\SPIRV\bitutils.h">
|
||||
<Filter>SPIRV</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\SPIRV\GLSL.ext.AMD.h">
|
||||
<Filter>SPIRV</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\SPIRV\GLSL.ext.KHR.h">
|
||||
<Filter>SPIRV</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\SPIRV\hex_float.h">
|
||||
<Filter>SPIRV</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\SPIRV\Logger.h">
|
||||
<Filter>SPIRV</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\hlsl\hlslAttributes.h">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\hlsl\hlslGrammar.h">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\hlsl\hlslOpMap.h">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClInclude>
|
||||
<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>
|
||||
<ClInclude Include="glslang\hlsl\hlslTokens.h">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="glslang\hlsl\hlslTokenStream.h">
|
||||
<Filter>HLSL</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="glslang\glslang\MachineIndependent\glslang.y">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user