From 96273c661650dc594978fafc3c6a33510742302e Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sun, 21 Feb 2016 22:12:19 +0100
Subject: [PATCH] Turn off Vulkan in CMake-based and Qt-based builds, for now

---
 CMakeLists.txt  | 3 +++
 GPU/GPU.cpp     | 4 ++++
 Qt/Common.pro   | 1 +
 Qt/Settings.pri | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4185d47ac..e6f437726e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
 
 add_definitions(-DPPSSPP)
 
+# None of these platforms support Vulkan yet.
+add_definitions(-DNO_VULKAN)
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(_ARCH_64 1)
 	add_definitions(-D_ARCH_64=1)
diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp
index 5365e7dd42..eb02c65748 100644
--- a/GPU/GPU.cpp
+++ b/GPU/GPU.cpp
@@ -21,7 +21,9 @@
 #include "GPU/GPU.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/GLES/GLES_GPU.h"
+#ifndef NO_VULKAN
 #include "GPU/Vulkan/GPU_Vulkan.h"
+#endif
 #include "GPU/Null/NullGpu.h"
 #include "GPU/Software/SoftGpu.h"
 
@@ -61,9 +63,11 @@ bool GPU_Init(GraphicsContext *ctx) {
 		break;
 	case GPU_DIRECTX11:
 		return nullptr;
+#ifndef NO_VULKAN
 	case GPU_VULKAN:
 		SetGPU(new GPU_Vulkan(ctx));
 		break;
+#endif
 	}
 
 	return gpu != NULL;
diff --git a/Qt/Common.pro b/Qt/Common.pro
index 3a9b41a5ec..6aa505554d 100644
--- a/Qt/Common.pro
+++ b/Qt/Common.pro
@@ -72,4 +72,5 @@ HEADERS += $$P/Common/ChunkFile.h \
 	$$P/Common/Crypto/*.h
 
 INCLUDEPATH += $$P/ext/native
+INCLUDEPATH += $$P/ext
 
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index be855dfa00..83405099dc 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -1,5 +1,5 @@
 VERSION = 1.2.2.0
-DEFINES += USING_QT_UI USE_FFMPEG
+DEFINES += USING_QT_UI USE_FFMPEG NO_VULKAN
 
 exists( /usr/include/snappy-c.h ) {
 	DEFINES += SHARED_SNAPPY