Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update glslang to latest as of 2016-06-26

Browse source
This commit is contained in:
Henrik Rydgård 2018-06-26 21:16:19 +02:00
parent b37938b061
commit c404214042
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
GPU/Common/ShaderTranslation.cpp
View file

@ -242,7 +242,16 @@ bool TranslateShader(std::string *dest, ShaderLanguage destLang, TranslatedShade
std::vector<unsigned int> spirv;
// Can't fail, parsing worked, "linking" worked.
glslang::GlslangToSpv(*program.getIntermediate(shaderStage), spirv);
glslang::SpvOptions options;
options.disableOptimizer = false;
options.optimizeSize = false;
options.generateDebugInfo = false;
glslang::GlslangToSpv(*program.getIntermediate(shaderStage), spirv, &options);
// For whatever reason, with our config, the above outputs an invalid SPIR-V version, 0.
// Patch it up so spirv-cross accepts it.
spirv[1] = glslang::EShTargetSpv_1_0;
// Alright, step 1 done. Now let's take this SPIR-V shader and output in our desired format.

2
ext/glslang

@ -1 +1 @@
Subproject commit 2edde6665d9a56ead5ea0e55b4e64d9a803e6164
Subproject commit 806af25f749b4d7cd861eaebc32474b3a7d102c0

1
ext/glslang-build/Android.mk
View file

@ -9,6 +9,7 @@ LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := \
../glslang/glslang/GenericCodeGen/CodeGen.cpp \
../glslang/glslang/GenericCodeGen/Link.cpp \
../glslang/glslang/MachineIndependent/attribute.cpp \
../glslang/glslang/MachineIndependent/Constant.cpp \
../glslang/glslang/MachineIndependent/glslang_tab.cpp \
../glslang/glslang/MachineIndependent/InfoSink.cpp \

2
ext/glslang.vcxproj
View file

@ -152,6 +152,7 @@
<ItemGroup>
<ClCompile Include="glslang\glslang\GenericCodeGen\CodeGen.cpp" />
<ClCompile Include="glslang\glslang\GenericCodeGen\Link.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\Constant.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\glslang_tab.cpp" />
<ClCompile Include="glslang\glslang\MachineIndependent\InfoSink.cpp" />
@ -207,6 +208,7 @@
<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\attribute.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" />

6
ext/glslang.vcxproj.filters
View file

@ -137,6 +137,9 @@
<ClCompile Include="glslang\hlsl\hlslTokenStream.cpp">
<Filter>HLSL</Filter>
</ClCompile>
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp">
<Filter>glslang</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="glslang\SPIRV\disassemble.h">
@ -290,6 +293,9 @@
<ClInclude Include="glslang\hlsl\hlslTokenStream.h">
<Filter>HLSL</Filter>
</ClInclude>
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h">
<Filter>glslang</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="glslang\glslang\MachineIndependent\glslang.y">