diff --git a/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj b/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
index 3ef93d6aa2..b27d1659aa 100644
--- a/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
+++ b/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
@@ -371,20 +371,26 @@
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cfg.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_common.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_containers.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_error_handling.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_parsed_ir.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_util.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_glsl.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_hlsl.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_msl.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_parser.hpp" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cfg.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross.cpp" />
+    <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross_util.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_glsl.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_hlsl.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_msl.cpp" />
+    <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_parser.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -403,4 +409,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj.filters b/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj.filters
index ae84b6bb46..1156f79343 100644
--- a/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj.filters
+++ b/UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj.filters
@@ -14,6 +14,8 @@
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_hlsl.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_msl.cpp" />
     <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross_util.cpp" />
+    <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
+    <ClCompile Include="..\..\ext\SPIRV-Cross\spirv_parser.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -26,5 +28,9 @@
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_hlsl.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_msl.hpp" />
     <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_util.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_containers.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_error_handling.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_parsed_ir.hpp" />
+    <ClInclude Include="..\..\ext\SPIRV-Cross\spirv_parser.hpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index a266947e42..47174b4a10 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -150,7 +150,9 @@ SPIRV_CROSS_FILES := \
   $(SRC)/ext/SPIRV-Cross/spirv_cfg.cpp \
   $(SRC)/ext/SPIRV-Cross/spirv_cross.cpp \
   $(SRC)/ext/SPIRV-Cross/spirv_cross_util.cpp \
-  $(SRC)/ext/SPIRV-Cross/spirv_glsl.cpp
+  $(SRC)/ext/SPIRV-Cross/spirv_glsl.cpp \
+  $(SRC)/ext/SPIRV-Cross/spirv_parser.cpp \
+  $(SRC)/ext/SPIRV-Cross/spirv_cross_parsed_ir.cpp
 
 EXEC_AND_LIB_FILES := \
   $(ARCH_FILES) \
diff --git a/ext/SPIRV-Cross b/ext/SPIRV-Cross
index be7425ef70..a1f7c8dc8e 160000
--- a/ext/SPIRV-Cross
+++ b/ext/SPIRV-Cross
@@ -1 +1 @@
-Subproject commit be7425ef70231ab82930331959ab487d605d0482
+Subproject commit a1f7c8dc8ea2f94443951ee27003bffa562c1f13
diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj
index 4ce379b28f..8e916f1d1a 100644
--- a/ext/SPIRV-Cross.vcxproj
+++ b/ext/SPIRV-Cross.vcxproj
@@ -312,19 +312,25 @@
     <ClInclude Include="SPIRV-Cross\spirv_common.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_cpp.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_cross.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_cross_containers.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_cross_error_handling.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_cross_parsed_ir.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_cross_util.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_glsl.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_hlsl.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_msl.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_parser.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SPIRV-Cross\spirv_cfg.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_cpp.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_cross.cpp" />
+    <ClCompile Include="SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_cross_util.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_glsl.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_hlsl.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_msl.cpp" />
+    <ClCompile Include="SPIRV-Cross\spirv_parser.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/ext/SPIRV-Cross.vcxproj.filters b/ext/SPIRV-Cross.vcxproj.filters
index b2406869d2..de9c67fd82 100644
--- a/ext/SPIRV-Cross.vcxproj.filters
+++ b/ext/SPIRV-Cross.vcxproj.filters
@@ -10,6 +10,10 @@
     <ClInclude Include="SPIRV-Cross\spirv_hlsl.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_msl.hpp" />
     <ClInclude Include="SPIRV-Cross\spirv_cross_util.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_cross_containers.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_cross_error_handling.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_cross_parsed_ir.hpp" />
+    <ClInclude Include="SPIRV-Cross\spirv_parser.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SPIRV-Cross\spirv_cfg.cpp" />
@@ -19,5 +23,7 @@
     <ClCompile Include="SPIRV-Cross\spirv_hlsl.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_msl.cpp" />
     <ClCompile Include="SPIRV-Cross\spirv_cross_util.cpp" />
+    <ClCompile Include="SPIRV-Cross\spirv_cross_parsed_ir.cpp" />
+    <ClCompile Include="SPIRV-Cross\spirv_parser.cpp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 0fa0187167..e48ddbf990 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -248,7 +248,9 @@ SOURCES_CXX += \
 	$(EXTDIR)/SPIRV-Cross/spirv_cross.cpp \
 	$(EXTDIR)/SPIRV-Cross/spirv_cross_util.cpp \
 	$(EXTDIR)/SPIRV-Cross/spirv_glsl.cpp \
-   $(EXTDIR)/SPIRV-Cross/spirv_hlsl.cpp
+	$(EXTDIR)/SPIRV-Cross/spirv_hlsl.cpp \
+	$(EXTDIR)/SPIRV-Cross/spirv_parser.cpp \
+	$(EXTDIR)/SPIRV-Cross/spirv_cross_parsed_ir.cpp
 
 ifeq ($(PLATFORM_EXT), win32)
 SOURCES_CXX += $(COMMONDIR)/MemArenaWin32.cpp \