mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add spir2cross submodule.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2016-03-21 11:22:31 +01:00
parent a21687b5d7
commit 6f01b8dc2c
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

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

9
Makefile.common
View File

@ -749,25 +749,30 @@ ifeq ($(HAVE_VULKAN), 1)
$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \ $(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp) $(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
SPIR2CROSS_SOURCES := deps/spir2cross/spir2cross.cpp
DEFINES += \ DEFINES += \
-Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \ -Ideps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM) \
-Ideps/glslang/glslang \ -Ideps/glslang/glslang \
-Ideps/glslang/glslang/glslang/MachineIndependent \ -Ideps/glslang/glslang/glslang/MachineIndependent \
-Ideps/glslang/glslang/glslang/Public \ -Ideps/glslang/glslang/glslang/Public \
-Ideps/glslang/glslang/SPIRV \ -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 CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -I./gfx/include/vulkan
CFLAGS += -I./gfx/include/vulkan CFLAGS += -I./gfx/include/vulkan
GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o) GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)
SPIR2CROSS_OBJ := $(SPIR2CROSS_SOURCES:.cpp=.o)
OBJ += gfx/drivers/vulkan.o \ OBJ += gfx/drivers/vulkan.o \
gfx/common/vulkan_common.o \ gfx/common/vulkan_common.o \
gfx/drivers_font/vulkan_raster_font.o \ gfx/drivers_font/vulkan_raster_font.o \
gfx/drivers_shader/shader_vulkan.o \ gfx/drivers_shader/shader_vulkan.o \
gfx/drivers_shader/glslang_util.o \ gfx/drivers_shader/glslang_util.o \
$(GLSLANG_OBJ) $(GLSLANG_OBJ) \
$(SPIR2CROSS_OBJ)
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/drivers_display/menu_display_vulkan.o OBJ += menu/drivers_display/menu_display_vulkan.o
endif endif

1
deps/spir2cross vendored Submodule

@ -0,0 +1 @@
Subproject commit 0ae2bcc3d0edc60e03180f6080a168f78edc82ca