Merge branch 'david_include_change_20151106'

Move header files to include/vulkan

8 files changed, 14 insertions, 14 deletions

diff --git a/loader/debug_report.c b/loader/debug_report.c
index 08ef8ca8..40a4b5b2 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -35,7 +35,7 @@
 #endif
 #include "vk_loader_platform.h"
 #include "debug_report.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
 
 typedef void (VKAPI *PFN_stringCallback)(char *message);
 
diff --git a/loader/debug_report.h b/loader/debug_report.h
index 00c97e67..62969c2b 100644
--- a/loader/debug_report.h
+++ b/loader/debug_report.h
@@ -27,7 +27,7 @@
 
 #include "vk_loader_platform.h"
 #include "loader.h"
-#include "vk_debug_report_lunarg.h"
+#include "vulkan/vk_debug_report_lunarg.h"
     /*
      * CreateMsgCallback is global and needs to be
      * applied to all layers and ICDs.
diff --git a/loader/loader.c b/loader/loader.c
index d8926478..edf36c74 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -45,7 +45,7 @@
 #include "table_ops.h"
 #include "debug_report.h"
 #include "wsi_swapchain.h"
-#include "vk_icd.h"
+#include "vulkan/vk_icd.h"
 #include "cJSON.h"
 
 static loader_platform_dl_handle loader_add_layer_lib(
diff --git a/loader/loader.h b/loader/loader.h
index 41deacf1..62a8b5fc 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -32,12 +32,12 @@
 #ifndef LOADER_H
 #define LOADER_H
 
-#include <vulkan.h>
+#include <vulkan/vulkan.h>
 #include <vk_loader_platform.h>
-#include <vk_debug_report_lunarg.h>
-#include <vk_ext_khr_swapchain.h>
-#include <vk_layer.h>
-#include <vk_icd.h>
+#include <vulkan/vk_debug_report_lunarg.h>
+#include <vulkan/vk_ext_khr_swapchain.h>
+#include <vulkan/vk_layer.h>
+#include <vulkan/vk_icd.h>
 #include <assert.h>
 
 #if defined(__GNUC__) && __GNUC__ >= 4
diff --git a/loader/table_ops.h b/loader/table_ops.h
index d582fd49..2b113e36 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -25,8 +25,8 @@
  * Author: Tony Barbour <tony@LunarG.com>
  */
 
-#include <vulkan.h>
-#include <vk_layer.h>
+#include <vulkan/vulkan.h>
+#include <vulkan/vk_layer.h>
 #include <string.h>
 #include "loader.h"
 #include "vk_loader_platform.h"
diff --git a/loader/vk-loader-generate.py b/loader/vk-loader-generate.py
index 15bd253f..143af61f 100755
--- a/loader/vk-loader-generate.py
+++ b/loader/vk-loader-generate.py
@@ -222,7 +222,7 @@ class DispatchTableOpsSubcommand(Subcommand):
         super().run()
 
     def generate_header(self):
-        return "\n".join(["#include <vulkan.h>",
+        return "\n".join(["#include <vulkan/vulkan.h>",
                           "#include <vkLayer.h>",
                           "#include <string.h>",
                           "#include \"loader_platform.h\""])
diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
index 4fecaed6..530546d9 100644
--- a/loader/vk_loader_platform.h
+++ b/loader/vk_loader_platform.h
@@ -29,8 +29,8 @@
  */
 #pragma once
 
-#include "vk_platform.h"
-#include "vk_sdk_platform.h"
+#include "vulkan/vk_platform.h"
+#include "vulkan/vk_sdk_platform.h"
 
 #if defined(__linux__)
 /* Linux-specific common code: */
diff --git a/loader/wsi_swapchain.h b/loader/wsi_swapchain.h
index bf292bdb..0a0ce891 100644
--- a/loader/wsi_swapchain.h
+++ b/loader/wsi_swapchain.h
@@ -26,7 +26,7 @@
 
 #include "vk_loader_platform.h"
 #include "loader.h"
-#include "vk_ext_khr_swapchain.h"
+#include "vulkan/vk_ext_khr_swapchain.h"
 
 bool wsi_swapchain_instance_gpa(struct loader_instance *ptr_instance,
                                  const char* name, void **addr);