From 4ae92cfc4b6bd579170d783d18763ee7bed038e1 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 15 May 2016 14:02:48 +0200 Subject: [PATCH] (Android) Bake in Vulkan, and use spirv-cross now --- griffin/griffin_cpp.cpp | 2 +- pkg/android/phoenix/jni/Android.mk | 2 +- pkg/android/phoenix/jni/Android2.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp index 442bdb3990..dcc2308726 100644 --- a/griffin/griffin_cpp.cpp +++ b/griffin/griffin_cpp.cpp @@ -141,7 +141,7 @@ VIDEO DRIVER #include "../gfx/drivers_shader/shader_vulkan.cpp" #include "../gfx/drivers_shader/glslang_util.cpp" #include "../gfx/drivers_shader/slang_reflection.cpp" -#include "../deps/spir2cross/spir2cross.cpp" +#include "../deps/SPIRV-Cross/spirv_cross.cpp" #endif /*============================================================ diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index cabb27547c..716418708f 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -5,7 +5,7 @@ RARCH_DIR := ../../../.. HAVE_NEON := 1 HAVE_LOGGER := 0 -HAVE_VULKAN := 0 +HAVE_VULKAN := 1 INCFLAGS := DEFINES := diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk index 05b7f196ad..7f3a24678e 100644 --- a/pkg/android/phoenix/jni/Android2.mk +++ b/pkg/android/phoenix/jni/Android2.mk @@ -5,7 +5,7 @@ RARCH_DIR := ../../../.. HAVE_NEON := 1 HAVE_LOGGER := 0 -HAVE_VULKAN := 0 +HAVE_VULKAN := 1 INCFLAGS := DEFINES :=