libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Vulkan: Update SPIRV-Cross and glslang.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2016-06-25 14:44:56 +02:00
parent 3ee172c410
commit 596cd320c6
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -808,6 +808,7 @@ ifeq ($(HAVE_VULKAN), 1)
$(wildcard deps/glslang/glslang/OGLCompilersDLL/*.cpp) \ $(wildcard deps/glslang/glslang/OGLCompilersDLL/*.cpp) \
$(wildcard deps/glslang/glslang/glslang/MachineIndependent/*.cpp) \ $(wildcard deps/glslang/glslang/glslang/MachineIndependent/*.cpp) \
$(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \ $(wildcard deps/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
$(wildcard deps/glslang/glslang/hlsl/*.cpp) \
$(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp) $(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
SPIRV_CROSS_SOURCES := deps/SPIRV-Cross/spirv_cross.cpp SPIRV_CROSS_SOURCES := deps/SPIRV-Cross/spirv_cross.cpp
@ -826,7 +827,7 @@ ifeq ($(HAVE_VULKAN), 1)
-Ideps/glslang \ -Ideps/glslang \
-Ideps/SPIRV-Cross -Ideps/SPIRV-Cross
CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Igfx/include CXXFLAGS += -Wno-switch -Wno-sign-compare -fno-strict-aliasing -Wno-maybe-uninitialized -Wno-reorder -Wno-parentheses -Igfx/include
CFLAGS += -Igfx/include CFLAGS += -Igfx/include
GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o) GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o)

2
deps/SPIRV-Cross vendored

@ -1 +1 @@
Subproject commit 44ef367141f9935bc719c9cc25693a9055f61efa Subproject commit 05a97883d2efa8cad6e105eaa39fc1521017238e

2
deps/glslang/glslang vendored

@ -1 +1 @@
Subproject commit 5ace09a75be02bd32505f1f94b1b49a6aa3498b8 Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b

9
griffin/griffin_cpp.cpp
View File

@ -35,10 +35,19 @@
#include "../deps/glslang/glslang/SPIRV/doc.cpp" #include "../deps/glslang/glslang/SPIRV/doc.cpp"
#include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp" #include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp"
#include "../deps/glslang/glslang/SPIRV/disassemble.cpp" #include "../deps/glslang/glslang/SPIRV/disassemble.cpp"
#include "../deps/glslang/glslang/SPIRV/logger.cpp"
#include "../deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp" #include "../deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp"
#include "../deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp" #include "../deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp"
#include "../deps/glslang/glslang/hlsl/hlslGrammar.cpp"
#include "../deps/glslang/glslang/hlsl/hlslOpMap.cpp"
#include "../deps/glslang/glslang/hlsl/hlslTokenStream.cpp"
#include "../deps/glslang/glslang/hlsl/hlslScanContext.cpp"
#include "../deps/glslang/glslang/hlsl/hlslParseHelper.cpp"
#include "../deps/glslang/glslang/hlsl/hlslParseables.cpp"
#include "../deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp"
#include "../deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp" #include "../deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp"
#include "../deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp" #include "../deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp"
#include "../deps/glslang/glslang/glslang/MachineIndependent/propagateNoContraction.cpp"
#include "../deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp" #include "../deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp"
#include "../deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp" #include "../deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp"
#include "../deps/glslang/glslang/glslang/MachineIndependent/limits.cpp" #include "../deps/glslang/glslang/glslang/MachineIndependent/limits.cpp"

9
pkg/android/phoenix/jni/Android.mk
View File

@ -83,8 +83,10 @@ LOCAL_CPPFLAGS += -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/glslang \
-I$(LOCAL_PATH)/$(RARCH_DIR)/deps/spir2cross \ -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/spir2cross \
-I$(LOCAL_PATH)/$(RARCH_DIR)/deps/SPIRV-Cross -I$(LOCAL_PATH)/$(RARCH_DIR)/deps/SPIRV-Cross
LOCAL_CFLAGS += -Wno-sign-compare -Wno-unused-variable -Wno-parentheses
LOCAL_SRC_FILES += $(RARCH_DIR)/deps/glslang/glslang.cpp \ LOCAL_SRC_FILES += $(RARCH_DIR)/deps/glslang/glslang.cpp \
$(RARCH_DIR)/deps/glslang/glslang/SPIRV/SpvBuilder.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/SpvBuilder.cpp \
$(RARCH_DIR)/deps/glslang/glslang/SPIRV/Logger.cpp \
$(RARCH_DIR)/deps/glslang/glslang/SPIRV/SPVRemapper.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/SPVRemapper.cpp \
$(RARCH_DIR)/deps/glslang/glslang/SPIRV/InReadableOrder.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/InReadableOrder.cpp \
$(RARCH_DIR)/deps/glslang/glslang/SPIRV/doc.cpp \ $(RARCH_DIR)/deps/glslang/glslang/SPIRV/doc.cpp \
@ -93,7 +95,14 @@ LOCAL_SRC_FILES += $(RARCH_DIR)/deps/glslang/glslang.cpp \
$(RARCH_DIR)/deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp \ $(RARCH_DIR)/deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp \
$(RARCH_DIR)/deps/glslang/glslang/hlsl/hlslGrammar.cpp \
$(RARCH_DIR)/deps/glslang/glslang/hlsl/hlslOpMap.cpp \
$(RARCH_DIR)/deps/glslang/glslang/hlsl/hlslTokenStream.cpp \
$(RARCH_DIR)/deps/glslang/glslang/hlsl/hlslScanContext.cpp \
$(RARCH_DIR)/deps/glslang/glslang/hlsl/hlslParseHelper.cpp \
$(RARCH_DIR)/deps/glslang/glslang/hlsl/hlslParseables.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/propagateNoContraction.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/glslang_tab.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/glslang_tab.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp \
$(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp \ $(RARCH_DIR)/deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp \