From 596cd320c6657e10026d7e74b6b0e41a7fa8c3d3 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Sat, 25 Jun 2016 14:44:56 +0200 Subject: [PATCH] Vulkan: Update SPIRV-Cross and glslang. --- Makefile.common | 3 ++- deps/SPIRV-Cross | 2 +- deps/glslang/glslang | 2 +- griffin/griffin_cpp.cpp | 9 +++++++++ pkg/android/phoenix/jni/Android.mk | 9 +++++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1e4f4e1cfa..eb274d42f2 100644 --- a/Makefile.common +++ b/Makefile.common @@ -808,6 +808,7 @@ ifeq ($(HAVE_VULKAN), 1) $(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/hlsl/*.cpp) \ $(wildcard deps/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp) SPIRV_CROSS_SOURCES := deps/SPIRV-Cross/spirv_cross.cpp @@ -826,7 +827,7 @@ ifeq ($(HAVE_VULKAN), 1) -Ideps/glslang \ -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 GLSLANG_OBJ := $(GLSLANG_SOURCES:.cpp=.o) diff --git a/deps/SPIRV-Cross b/deps/SPIRV-Cross index 44ef367141..05a97883d2 160000 --- a/deps/SPIRV-Cross +++ b/deps/SPIRV-Cross @@ -1 +1 @@ -Subproject commit 44ef367141f9935bc719c9cc25693a9055f61efa +Subproject commit 05a97883d2efa8cad6e105eaa39fc1521017238e diff --git a/deps/glslang/glslang b/deps/glslang/glslang index 5ace09a75b..a4a4d5e22c 160000 --- a/deps/glslang/glslang +++ b/deps/glslang/glslang @@ -1 +1 @@ -Subproject commit 5ace09a75be02bd32505f1f94b1b49a6aa3498b8 +Subproject commit a4a4d5e22c375d37bd286106904ef819eafff29b diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index c125f0e2ff..c9eefca3a5 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -35,10 +35,19 @@ #include "../deps/glslang/glslang/SPIRV/doc.cpp" #include "../deps/glslang/glslang/SPIRV/GlslangToSpv.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/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/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/RemoveTree.cpp" #include "../deps/glslang/glslang/glslang/MachineIndependent/limits.cpp" diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index f9cba21737..8bc79f5210 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -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/SPIRV-Cross +LOCAL_CFLAGS += -Wno-sign-compare -Wno-unused-variable -Wno-parentheses LOCAL_SRC_FILES += $(RARCH_DIR)/deps/glslang/glslang.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/InReadableOrder.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/glslang/GenericCodeGen/Link.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/propagateNoContraction.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/RemoveTree.cpp \