Vulkan backend for RetroArch

.gitignore

@@ -62,6 +62,9 @@ menu/driverspzarch.c
 /media/shaders_glsl/
 /obj-w32/
 
+# Ctags
+/tags
+
 # Android
 /pkg/android/phoenix/obj/
 /pkg/android/phoenix/assets/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "deps/glslang/glslang"]
+	path = deps/glslang/glslang
+	url = git://github.com/KhronosGroup/glslang.git

Makefile

@@ -60,7 +60,9 @@ endif
 endif
 
 CFLAGS   += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) $(DEBUG_FLAG) -I.
-CXXFLAGS := $(CFLAGS) -std=c++98 -D__STDC_CONSTANT_MACROS
+
+APPEND_CFLAGS := $(CFLAGS)
+CXXFLAGS += $(APPEND_CFLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS
 OBJCFLAGS :=  $(CFLAGS) -D__STDC_CONSTANT_MACROS
 
 ifeq ($(CXX_BUILD), 1)
@@ -127,7 +129,7 @@ $(OBJDIR)/%.o: %.c config.h config.mk
 	@$(if $(Q), $(shell echo echo CC $<),)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -MMD -c -o $@ $<
 
-$(OBJDIR)/%.o: %.cpp
+$(OBJDIR)/%.o: %.cpp config.h config.mk
 	@mkdir -p $(dir $@)
 	@$(if $(Q), $(shell echo echo CXX $<),)
 	$(Q)$(CXX) $(CXXFLAGS) $(DEFINES) -MMD -c -o $@ $<

Makefile.common

@@ -630,6 +630,9 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
       ifeq ($(HAVE_EGL), 1)
         OBJ += gfx/drivers_context/wayland_ctx.o
       endif
+      ifeq ($(HAVE_VULKAN), 1)
+         OBJ += gfx/drivers_context/wayland_ctx_vulkan.o
+      endif
    endif
 
    ifeq ($(HAVE_GLES), 1)
@@ -694,6 +697,45 @@ ifeq ($(HAVE_SDL2), 1)
    HAVE_SDL = 0
 endif
 
+ifeq ($(HAVE_VULKAN), 1)
+	ifeq ($(platform), win)
+		GLSLANG_PLATFORM := Windows
+	else
+		GLSLANG_PLATFORM := Unix
+	endif
+	GLSLANG_SOURCES := \
+		$(wildcard deps/glslang/*.cpp) \
+		$(wildcard deps/glslang/glslang/SPIRV/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/GenericCodeGen/*.cpp) \
+		$(wildcard deps/glslang/glslang/OGLCompilersDLL/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
+		$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.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
+
+	CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized
+
+	GLSLANG_OBJ := $(GLSLANG_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)
+	ifeq ($(HAVE_MENU_COMMON), 1)
+		OBJ += menu/drivers_display/menu_display_vulkan.o
+	endif
+	LIBS += -lvulkan -lstdc++
+endif
+
 ifeq ($(HAVE_OMAP), 1)
    OBJ += gfx/drivers/omap_gfx.o
 endif

command.c

@@ -42,6 +42,8 @@
 #define COMMAND_EXT_GLSLP        0x0f840c87U
 #define COMMAND_EXT_CG           0x0059776fU
 #define COMMAND_EXT_CGP          0x0b8865bfU
+#define COMMAND_EXT_SLANG        0x105ce63aU
+#define COMMAND_EXT_SLANGP       0x1bf9adeaU
 
 struct rarch_cmd
 {
@@ -234,6 +236,10 @@ static bool cmd_set_shader(const char *arg)
       case COMMAND_EXT_CGP:
          type = RARCH_SHADER_CG;
          break;
+      case COMMAND_EXT_SLANG:
+      case COMMAND_EXT_SLANGP:
+         type = RARCH_SHADER_SLANG;
+         break;
       default:
          return false;
    }

config.def.h

@@ -29,6 +29,7 @@
 enum
 {
    VIDEO_GL = 0,
+   VIDEO_VULKAN,
    VIDEO_XVIDEO,
    VIDEO_SDL,
    VIDEO_SDL2,

cores/libretro-test-vulkan/Makefile

@@ -0,0 +1,65 @@
+ifeq ($(platform),)
+	platform = unix
+	ifeq ($(shell uname -a),)
+		platform = win
+	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+		platform = win
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		platform = osx
+		arch = intel
+	ifeq ($(shell uname -p),powerpc)
+		arch = ppc
+	endif
+	else ifneq ($(findstring win,$(shell uname -a)),)
+		platform = win
+	endif
+endif
+
+# system platform
+system_platform = unix
+ifeq ($(shell uname -a),)
+	EXE_EXT = .exe
+	system_platform = win
+else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	system_platform = win
+endif
+
+TARGET_NAME = testvulkan
+
+ifeq ($(platform), unix)
+   TARGET := $(TARGET_NAME)_libretro.so
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+   VULKAN_LIB := -lvulkan
+else
+   CC = gcc
+   TARGET := $(TARGET_NAME)_libretro.dll
+   SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
+   VULKAN_LIB := -lvulkan
+   CFLAGS += -I..
+endif
+
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+endif
+
+CFLAGS += -std=gnu99
+OBJECTS := libretro-test.o
+CFLAGS += -Wall -pedantic $(fpic)
+LIBS += $(VULKAN_LIB)
+
+all: $(TARGET)
+
+$(TARGET): $(OBJECTS)
+	$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LIBS) -lm $(EXTRA_VULKAN_LIBS)
+
+%.o: %.c
+	$(CC) -I../../libretro-common/include $(CFLAGS) -c -o $@ $<
+
+clean:
+	rm -f $(OBJECTS) $(TARGET)
+
+.PHONY: clean
+