Moved header files from include to include/vulkan
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 77177b0..d00f834 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -2,15 +2,15 @@
macro(run_vk_helper subcmd)
add_custom_command(OUTPUT ${ARGN}
- COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${PROJECT_SOURCE_DIR}/vk_helper.py ${PROJECT_SOURCE_DIR}/include/vulkan.h
+ COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS ${PROJECT_SOURCE_DIR}/vk_helper.py ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h
)
endmacro()
macro(run_vk_layer_generate subcmd output)
add_custom_command(OUTPUT ${output}
- COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan.h > ${output}
- DEPENDS ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${PROJECT_SOURCE_DIR}/include/vulkan.h ${PROJECT_SOURCE_DIR}/vulkan.py
+ COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h > ${output}
+ DEPENDS ${PROJECT_SOURCE_DIR}/vk-layer-generate.py ${PROJECT_SOURCE_DIR}/include/vulkan/vulkan.h ${PROJECT_SOURCE_DIR}/vulkan.py
)
endmacro()
@@ -82,6 +82,7 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../loader
+ ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
${CMAKE_CURRENT_BINARY_DIR}
)
diff --git a/layers/apidump.h b/layers/apidump.h
index 41a10c1..e5f4ff8 100644
--- a/layers/apidump.h
+++ b/layers/apidump.h
@@ -26,7 +26,7 @@
*/
#pragma once
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
/*
* This file contains static functions for the generated layer Generic
diff --git a/layers/basic.cpp b/layers/basic.cpp
index 21f93a1..9b58f92 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <assert.h>
#include "vk_dispatch_table_helper.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_table.h"
#include "vk_layer_extension_utils.h"
diff --git a/layers/device_limits.h b/layers/device_limits.h
index a426c5d..77de294 100644
--- a/layers/device_limits.h
+++ b/layers/device_limits.h
@@ -22,9 +22,9 @@
*
* Author: Tobin Ehlis <tobin@lunarg.com>
*/
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include <vector>
-#include "vk_debug_report_lunarg.h"
+#include "vulkan/vk_debug_report_lunarg.h"
using namespace std;
diff --git a/layers/draw_state.h b/layers/draw_state.h
index 2dc8df5..db05bac 100755
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -23,10 +23,10 @@
* Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
* Author: Tobin Ehlis <tobin@lunarg.com>
*/
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include <vector>
#include <memory>
-#include "vk_debug_report_lunarg.h"
+#include "vulkan/vk_debug_report_lunarg.h"
using namespace std;
diff --git a/layers/generic.h b/layers/generic.h
index 636bfc1..9f73eaa 100644
--- a/layers/generic.h
+++ b/layers/generic.h
@@ -27,7 +27,7 @@
#ifndef GENERIC_H
#define GENERIC_H
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
/*
* This file contains static functions for the generated layer Generic
diff --git a/layers/image.h b/layers/image.h
index 57fb85c..2ddd4eb 100644
--- a/layers/image.h
+++ b/layers/image.h
@@ -26,7 +26,7 @@
*/
#ifndef IMAGE_H
#define IMAGE_H
-#include "vulkan.h"
+#include "vulkan/vulkan.h"
#include "vk_layer_config.h"
#include "vk_layer_logging.h"
diff --git a/layers/mem_tracker.h b/layers/mem_tracker.h
index 8cfcb0c..1963b38 100644
--- a/layers/mem_tracker.h
+++ b/layers/mem_tracker.h
@@ -25,8 +25,8 @@
*/
#pragma once
#include <vector>
-#include "vk_layer.h"
-#include "vk_debug_report_lunarg.h"
+#include "vulkan/vk_layer.h"
+#include "vulkan/vk_debug_report_lunarg.h"
#ifdef __cplusplus
extern "C" {
diff --git a/layers/multi.cpp b/layers/multi.cpp
index 256fbfe..a43a842 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -29,7 +29,7 @@
#include <assert.h>
#include <unordered_map>
#include "vk_loader_platform.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_table.h"
#ifdef __cplusplus
diff --git a/layers/object_track.h b/layers/object_track.h
index f166a04..51f406c 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -25,7 +25,7 @@
* Author: Tobin Ehlis <tobin@lunarg.com>
*/
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_extension_utils.h"
#include "vk_enum_string_helper.h"
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 528a73d..1f96ca8 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -36,7 +36,7 @@
#include <vector>
#include "vk_loader_platform.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_config.h"
#include "vk_enum_validate_helper.h"
#include "vk_struct_validate_helper.h"
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index c930b85..a92854f 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -35,7 +35,7 @@
#include <iostream>
#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_utils.h"
#include "vk_layer_config.h"
#include "vk_layer_table.h"
diff --git a/layers/shader_checker.h b/layers/shader_checker.h
index 32739ba..6a1ef65 100644
--- a/layers/shader_checker.h
+++ b/layers/shader_checker.h
@@ -22,8 +22,8 @@
*
* Author: Chris Forbes <chrisf@ijw.co.nz>
*/
-#include "vk_layer.h"
-#include "vk_debug_report_lunarg.h"
+#include "vulkan/vk_layer.h"
+#include "vulkan/vk_debug_report_lunarg.h"
#include "vk_layer_logging.h"
/* Shader checker error codes */
diff --git a/layers/swapchain.h b/layers/swapchain.h
index cc2337d..3820f92 100644
--- a/layers/swapchain.h
+++ b/layers/swapchain.h
@@ -27,8 +27,8 @@
#ifndef SWAPCHAIN_H
#define SWAPCHAIN_H
-#include "vk_layer.h"
-#include "vk_debug_report_lunarg.h"
+#include "vulkan/vk_layer.h"
+#include "vulkan/vk_debug_report_lunarg.h"
#include "vk_layer_config.h"
#include "vk_layer_logging.h"
#include <vector>
diff --git a/layers/vk_layer_config.cpp b/layers/vk_layer_config.cpp
index a03d399..5374835 100755
--- a/layers/vk_layer_config.cpp
+++ b/layers/vk_layer_config.cpp
@@ -30,10 +30,10 @@
#include <string>
#include <map>
#include <string.h>
-#include <vk_layer.h>
+#include <vulkan/vk_layer.h>
#include <iostream>
#include "vk_layer_config.h"
-#include "vk_sdk_platform.h"
+#include "vulkan/vk_sdk_platform.h"
#define MAX_CHARS_PER_LINE 4096
diff --git a/layers/vk_layer_extension_utils.h b/layers/vk_layer_extension_utils.h
index 15880a4..6e6252f 100644
--- a/layers/vk_layer_extension_utils.h
+++ b/layers/vk_layer_extension_utils.h
@@ -24,7 +24,7 @@
*
*/
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#ifndef LAYER_EXTENSION_UTILS_H
#define LAYER_EXTENSION_UTILS_H
diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index 6eb1fe1..28a5201 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -34,7 +34,7 @@
#include <unordered_map>
#include <inttypes.h>
#include "vk_loader_platform.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_data.h"
#include "vk_layer_table.h"
diff --git a/layers/vk_layer_table.cpp b/layers/vk_layer_table.cpp
index 7429a1d..1c4fa13 100644
--- a/layers/vk_layer_table.cpp
+++ b/layers/vk_layer_table.cpp
@@ -25,7 +25,7 @@
#include <assert.h>
#include <unordered_map>
#include "vk_dispatch_table_helper.h"
-#include "vk_layer.h"
+#include "vulkan/vk_layer.h"
#include "vk_layer_table.h"
static device_table_map tableMap;
static instance_table_map tableInstanceMap;
diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp
index 11a7739..66d8323 100644
--- a/layers/vk_layer_utils.cpp
+++ b/layers/vk_layer_utils.cpp
@@ -25,7 +25,7 @@
*/
#include <string.h>
-#include "vulkan.h"
+#include "vulkan/vulkan.h"
#include "vk_layer_utils.h"
typedef struct _VULKAN_FORMAT_INFO {