diff --git a/.gitmodules b/.gitmodules
index 9a7de532c9..49f252a8ef 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "deps/glslang/glslang"]
 	path = deps/glslang/glslang
 	url = git://github.com/KhronosGroup/glslang.git
+[submodule "deps/spir2cross"]
+	path = deps/spir2cross
+	url = git://github.com/ARM-software/spir2cross
diff --git a/Makefile.common b/Makefile.common
index 232ecbcb33..ec9ac1dec8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -749,25 +749,30 @@ ifeq ($(HAVE_VULKAN), 1)
 		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
 		$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
 
+	SPIR2CROSS_SOURCES := deps/spir2cross/spir2cross.cpp
+
 	DEFINES += \
 			  -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
 			  -Ideps/glslang/glslang \
 			  -Ideps/glslang/glslang/glslang/MachineIndependent \
 			  -Ideps/glslang/glslang/glslang/Public \
 			  -Ideps/glslang/glslang/SPIRV \
-			  -Ideps/glslang
+			  -Ideps/glslang \
+			  -Ideps/spir2cross
 
 	CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
    CFLAGS  += -I./gfx/include/vulkan
 
 	GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
+	SPIR2CROSS_OBJ := $(SPIR2CROSS_SOURCES:.cpp=.o)
 
 	OBJ += gfx/drivers/vulkan.o \
 			 gfx/common/vulkan_common.o \
 			 gfx/drivers_font/vulkan_raster_font.o \
 			 gfx/drivers_shader/shader_vulkan.o \
 			 gfx/drivers_shader/glslang_util.o \
-			 $(GLSLANG_OBJ)
+			 $(GLSLANG_OBJ) \
+			 $(SPIR2CROSS_OBJ)
 	ifeq ($(HAVE_MENU_COMMON), 1)
 		OBJ += menu/drivers_display/menu_display_vulkan.o
 	endif
diff --git a/deps/spir2cross b/deps/spir2cross
new file mode 160000
index 0000000000..0ae2bcc3d0
--- /dev/null
+++ b/deps/spir2cross
@@ -0,0 +1 @@
+Subproject commit 0ae2bcc3d0edc60e03180f6080a168f78edc82ca