From d4a4844bff8cf763af940c2e5a2eff715ec352de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 16 Mar 2018 21:29:16 +0100 Subject: [PATCH] Update glslang to the latest version --- ext/glslang | 2 +- ext/glslang-build/Android.mk | 1 + ext/glslang.vcxproj | 2 ++ ext/glslang.vcxproj.filters | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ext/glslang b/ext/glslang index 2edde6665d..0af69da12e 160000 --- a/ext/glslang +++ b/ext/glslang @@ -1 +1 @@ -Subproject commit 2edde6665d9a56ead5ea0e55b4e64d9a803e6164 +Subproject commit 0af69da12ede4ce588b7316be55fb095dfe2fb7d diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk index 8bf8106ca0..47e232c5cf 100644 --- a/ext/glslang-build/Android.mk +++ b/ext/glslang-build/Android.mk @@ -9,6 +9,7 @@ LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := \ ../glslang/glslang/GenericCodeGen/CodeGen.cpp \ ../glslang/glslang/GenericCodeGen/Link.cpp \ + ../glslang/glslang/MachineIndependent/attribute.cpp \ ../glslang/glslang/MachineIndependent/Constant.cpp \ ../glslang/glslang/MachineIndependent/glslang_tab.cpp \ ../glslang/glslang/MachineIndependent/InfoSink.cpp \ diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj index 54b3581255..3711148daa 100644 --- a/ext/glslang.vcxproj +++ b/ext/glslang.vcxproj @@ -152,6 +152,7 @@ + @@ -207,6 +208,7 @@ + diff --git a/ext/glslang.vcxproj.filters b/ext/glslang.vcxproj.filters index af94d50565..d37c8c805e 100644 --- a/ext/glslang.vcxproj.filters +++ b/ext/glslang.vcxproj.filters @@ -137,6 +137,9 @@ HLSL + + glslang + @@ -290,6 +293,9 @@ HLSL + + glslang +