From 304367b028c2ca9cb8478a2f2ec0e0128eb4fb48 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 9 Oct 2015 20:45:31 +0200
Subject: [PATCH] Change include paths from <vulkan/...> to just <...>

* This is inconsistent between windows and linux - on linux it's vulkan/
  but on windows the files are just in the Include folder.
* For final ship, we may well in-line the header in our own source tree
  as we do with GL, since it might even be custom-built.
---
 renderdoc/driver/vulkan/Makefile                 |  2 +-
 renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj |  4 ++--
 renderdoc/driver/vulkan/vk_common.h              | 10 +++++-----
 renderdoc/driver/vulkan/vk_dispatchtables.h      |  2 +-
 renderdoc/driver/vulkan/vk_replay.h              |  2 +-
 renderdoc/driver/vulkan/vk_tracelayer.cpp        |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile
index 45e70c0aa..fbea9a6a0 100644
--- a/renderdoc/driver/vulkan/Makefile
+++ b/renderdoc/driver/vulkan/Makefile
@@ -5,7 +5,7 @@ MACROS=-DLINUX \
 			 -DRENDERDOC_PLATFORM=linux \
 			 -DRENDERDOC_EXPORTS \
 			 -DGIT_COMMIT_HASH="\"$(COMMIT)\""
-CFLAGS=-c -Wall -Werror -Wno-unused -Wno-unknown-pragmas -fPIC $(MACROS) -I../../ -I../../3rdparty/ -I$(VK_SDK_PATH)/include
+CFLAGS=-c -Wall -Werror -Wno-unused -Wno-unknown-pragmas -fPIC $(MACROS) -I../../ -I../../3rdparty/ -I$(VK_SDK_PATH)/include/vulkan
 CPPFLAGS=-std=c++11 -g -Wno-reorder -fvisibility=hidden -fvisibility-inlines-hidden
 OBJDIR=.obj
 OBJECTS=vk_dispatchtables.o \
diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
index 1bfd31135..cefa1b758 100644
--- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
+++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj
@@ -116,8 +116,8 @@
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <IncludePath>$(VULKAN_SDK)\Include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(VULKAN_SDK)\Source\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(VK_SDK_PATH)\Include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
     <ExcludePath>$(ExcludePath)</ExcludePath>
     <TargetName>driver_$(ProjectName)</TargetName>
   </PropertyGroup>
diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h
index f75c6cea5..66a3a647f 100644
--- a/renderdoc/driver/vulkan/vk_common.h
+++ b/renderdoc/driver/vulkan/vk_common.h
@@ -54,11 +54,11 @@
 #include <xcb/xcb.h>
 #endif
 
-#include <vulkan/vulkan.h>
-#include <vulkan/vk_debug_marker_lunarg.h>
-#include <vulkan/vk_debug_report_lunarg.h>
-#include <vulkan/vk_ext_khr_swapchain.h>
-#include <vulkan/vk_ext_khr_device_swapchain.h>
+#include <vulkan.h>
+#include <vk_debug_marker_lunarg.h>
+#include <vk_debug_report_lunarg.h>
+#include <vk_ext_khr_swapchain.h>
+#include <vk_ext_khr_device_swapchain.h>
 
 #include "api/replay/renderdoc_replay.h"
 
diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.h b/renderdoc/driver/vulkan/vk_dispatchtables.h
index c01db0fbb..89267da81 100644
--- a/renderdoc/driver/vulkan/vk_dispatchtables.h
+++ b/renderdoc/driver/vulkan/vk_dispatchtables.h
@@ -32,7 +32,7 @@
 #undef CreateSemaphore
 #endif
 
-#include <vulkan/vk_layer.h>
+#include <vk_layer.h>
 
 void InitReplayTables();
 void InitDeviceReplayTables(VkDevice device);
diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h
index 3b9561880..61ab8427a 100644
--- a/renderdoc/driver/vulkan/vk_replay.h
+++ b/renderdoc/driver/vulkan/vk_replay.h
@@ -35,7 +35,7 @@
 #undef CreateSemaphore
 #endif
 
-#include <vulkan/vk_layer.h>
+#include <vk_layer.h>
 
 #if defined(WIN32)
 
diff --git a/renderdoc/driver/vulkan/vk_tracelayer.cpp b/renderdoc/driver/vulkan/vk_tracelayer.cpp
index 2d72ef386..5c98fd4ac 100644
--- a/renderdoc/driver/vulkan/vk_tracelayer.cpp
+++ b/renderdoc/driver/vulkan/vk_tracelayer.cpp
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <vulkan/vk_layer.h>
+#include <vk_layer.h>
 
 // RenderDoc Includes