layers: Rename all layer headers to begin with "vk_layer_" prefix
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index a71931d..8f521d6 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -88,23 +88,23 @@
run_vk_layer_generate(ObjectTracker object_track.cpp)
run_vk_layer_generate(Threading threading.cpp)
-add_library(layer_utils SHARED layers_config.cpp)
+add_library(layer_utils SHARED vk_layer_config.cpp)
if (WIN32)
- add_library(layer_utils_static STATIC layers_config.cpp)
+ add_library(layer_utils_static STATIC vk_layer_config.cpp)
set_target_properties(layer_utils_static PROPERTIES OUTPUT_NAME layer_utils)
target_link_libraries(layer_utils)
endif()
-add_vk_layer(Basic basic.cpp layers_table.cpp)
+add_vk_layer(Basic basic.cpp vk_layer_table.cpp)
add_vk_layer(Multi multi.cpp)
-add_vk_layer(DrawState draw_state.cpp layers_debug_marker_table.cpp layers_table.cpp)
-add_vk_layer(MemTracker mem_tracker.cpp layers_table.cpp)
-add_vk_layer(ShaderChecker shader_checker.cpp layers_table.cpp)
-add_vk_layer(Image image.cpp layers_table.cpp)
+add_vk_layer(DrawState draw_state.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
+add_vk_layer(MemTracker mem_tracker.cpp vk_layer_table.cpp)
+add_vk_layer(ShaderChecker shader_checker.cpp vk_layer_table.cpp)
+add_vk_layer(Image image.cpp vk_layer_table.cpp)
# generated
-add_vk_layer(Generic generic_layer.cpp layers_table.cpp)
-add_vk_layer(APIDump api_dump.cpp layers_table.cpp)
-add_vk_layer(ObjectTracker object_track.cpp layers_table.cpp)
-add_vk_layer(ParamChecker param_checker.cpp layers_debug_marker_table.cpp layers_table.cpp)
-add_vk_layer(Threading threading.cpp layers_table.cpp)
-add_vk_layer(ScreenShot screenshot.cpp layers_table.cpp)
+add_vk_layer(Generic generic_layer.cpp vk_layer_table.cpp)
+add_vk_layer(APIDump api_dump.cpp vk_layer_table.cpp)
+add_vk_layer(ObjectTracker object_track.cpp vk_layer_table.cpp)
+add_vk_layer(ParamChecker param_checker.cpp vk_layer_debug_marker_table.cpp vk_layer_table.cpp)
+add_vk_layer(Threading threading.cpp vk_layer_table.cpp)
+add_vk_layer(ScreenShot screenshot.cpp vk_layer_table.cpp)
diff --git a/layers/basic.cpp b/layers/basic.cpp
index b9bf17d..c2ef53d 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -27,7 +27,7 @@
#include "loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_layer.h"
-#include "layers_table.h"
+#include "vk_layer_table.h"
// The following is #included again to catch certain OS-specific functions
// being used:
#include "loader_platform.h"
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index fa3b36a..da47329 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -39,16 +39,16 @@
#endif
#include "vk_struct_size_helper.h"
#include "draw_state.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
#include "vk_debug_marker_layer.h"
// The following is #included again to catch certain OS-specific functions
// being used:
#include "loader_platform.h"
-#include "layers_msg.h"
-#include "layers_table.h"
-#include "layers_debug_marker_table.h"
-#include "layer_data.h"
-#include "layer_logging.h"
+#include "vk_layer_msg.h"
+#include "vk_layer_table.h"
+#include "vk_layer_debug_marker_table.h"
+#include "vk_layer_data.h"
+#include "vk_layer_logging.h"
typedef struct _layer_data {
debug_report_data *report_data;
diff --git a/layers/image.cpp b/layers/image.cpp
index 8012e9b..d42cf2a 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -33,15 +33,15 @@
#include "loader_platform.h"
#include "vk_layer.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
#include "vk_enum_validate_helper.h"
#include "vk_struct_validate_helper.h"
//The following is #included again to catch certain OS-specific functions being used:
#include "loader_platform.h"
-#include "layers_table.h"
-#include "layer_data.h"
-#include "layer_logging.h"
+#include "vk_layer_table.h"
+#include "vk_layer_data.h"
+#include "vk_layer_logging.h"
typedef struct _layer_data {
debug_report_data *report_data;
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index e4db292..ab36022 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -36,13 +36,13 @@
#include "vk_dispatch_table_helper.h"
#include "vk_struct_string_helper_cpp.h"
#include "mem_tracker.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
// The following is #included again to catch certain OS-specific functions
// being used:
#include "loader_platform.h"
-#include "layers_table.h"
-#include "layer_data.h"
-#include "layer_logging.h"
+#include "vk_layer_table.h"
+#include "vk_layer_data.h"
+#include "vk_layer_logging.h"
static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce);
typedef struct _layer_data {
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 2fb0757..e9befd2 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -34,15 +34,15 @@
#include "loader_platform.h"
#include "vk_layer.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
#include "vk_enum_validate_helper.h"
#include "vk_struct_validate_helper.h"
//The following is #included again to catch certain OS-specific functions being used:
#include "loader_platform.h"
-#include "layers_table.h"
-#include "layer_data.h"
-#include "layer_logging.h"
+#include "vk_layer_table.h"
+#include "vk_layer_data.h"
+#include "vk_layer_logging.h"
typedef struct _layer_data {
debug_report_data *report_data;
diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp
index 8a968e6..89725cd 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -40,11 +40,11 @@
#include "loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_struct_string_helper_cpp.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
// The following is #included again to catch certain OS-specific functions
// being used:
#include "loader_platform.h"
-#include "layers_table.h"
+#include "vk_layer_table.h"
struct devExts {
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index 854ccc6..3bfcfe0 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -32,9 +32,9 @@
#include "loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_layer.h"
-#include "layers_config.h"
-#include "layers_msg.h"
-#include "layers_table.h"
+#include "vk_layer_config.h"
+#include "vk_layer_msg.h"
+#include "vk_layer_table.h"
#include "vk_enum_string_helper.h"
#include "shader_checker.h"
// The following is #included again to catch certain OS-specific functions
diff --git a/layers/layers_config.cpp b/layers/vk_layer_config.cpp
similarity index 99%
rename from layers/layers_config.cpp
rename to layers/vk_layer_config.cpp
index ad49e4d..9904469 100644
--- a/layers/layers_config.cpp
+++ b/layers/vk_layer_config.cpp
@@ -28,7 +28,7 @@
#include <string.h>
#include <vk_layer.h>
#include "loader_platform.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
// The following is #included again to catch certain OS-specific functions
// being used:
#include "loader_platform.h"
diff --git a/layers/layers_config.h b/layers/vk_layer_config.h
similarity index 100%
rename from layers/layers_config.h
rename to layers/vk_layer_config.h
diff --git a/layers/layer_data.h b/layers/vk_layer_data.h
similarity index 98%
rename from layers/layer_data.h
rename to layers/vk_layer_data.h
index 4cfe056..5028ca0 100644
--- a/layers/layer_data.h
+++ b/layers/vk_layer_data.h
@@ -29,7 +29,7 @@
#define LAYER_DATA_H
#include <unordered_map>
-#include "layers_table.h"
+#include "vk_layer_table.h"
template<typename DATA_T>
DATA_T *get_my_data_ptr(void *data_key,
diff --git a/layers/layers_debug_marker_table.cpp b/layers/vk_layer_debug_marker_table.cpp
similarity index 100%
rename from layers/layers_debug_marker_table.cpp
rename to layers/vk_layer_debug_marker_table.cpp
diff --git a/layers/layers_debug_marker_table.h b/layers/vk_layer_debug_marker_table.h
similarity index 100%
rename from layers/layers_debug_marker_table.h
rename to layers/vk_layer_debug_marker_table.h
diff --git a/layers/layer_logging.h b/layers/vk_layer_logging.h
similarity index 99%
rename from layers/layer_logging.h
rename to layers/vk_layer_logging.h
index 8a7e292..617c3b2 100644
--- a/layers/layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -33,8 +33,8 @@
#include <stdbool.h>
#include <unordered_map>
#include "vk_layer.h"
-#include "layer_data.h"
-#include "layers_table.h"
+#include "vk_layer_data.h"
+#include "vk_layer_table.h"
typedef struct _debug_report_data {
VkLayerDbgFunctionNode *g_pDbgFunctionHead;
diff --git a/layers/layers_msg.h b/layers/vk_layer_msg.h
similarity index 100%
rename from layers/layers_msg.h
rename to layers/vk_layer_msg.h
diff --git a/layers/layers_table.cpp b/layers/vk_layer_table.cpp
similarity index 99%
rename from layers/layers_table.cpp
rename to layers/vk_layer_table.cpp
index 363cd01..5fbec8a 100644
--- a/layers/layers_table.cpp
+++ b/layers/vk_layer_table.cpp
@@ -25,7 +25,7 @@
#include <unordered_map>
#include "vk_dispatch_table_helper.h"
#include "vk_layer.h"
-#include "layers_table.h"
+#include "vk_layer_table.h"
static device_table_map tableMap;
static instance_table_map tableInstanceMap;
diff --git a/layers/layers_table.h b/layers/vk_layer_table.h
similarity index 100%
rename from layers/layers_table.h
rename to layers/vk_layer_table.h
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 4b8addb..e02467a 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2,7 +2,7 @@
#include "vk_debug_report_lunarg.h"
#include "gtest-1.7.0/include/gtest/gtest.h"
#include "vkrenderframework.h"
-#include "layers_config.h"
+#include "vk_layer_config.h"
#define GLM_FORCE_RADIANS
#include "glm/glm.hpp"
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 276f0fe..97f4767 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -599,9 +599,9 @@
gen_header.append('//The following is #included again to catch certain OS-specific functions being used:')
gen_header.append('')
gen_header.append('#include "loader_platform.h"')
- gen_header.append('#include "layers_config.h"')
- gen_header.append('#include "layers_msg.h"')
- gen_header.append('#include "layers_table.h"')
+ gen_header.append('#include "vk_layer_config.h"')
+ gen_header.append('#include "vk_layer_msg.h"')
+ gen_header.append('#include "vk_layer_table.h"')
gen_header.append('')
gen_header.append('static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(initOnce);')
gen_header.append('struct devExts {')
@@ -744,7 +744,7 @@
header_txt.append('#include "loader_platform.h"')
header_txt.append('#include "vk_layer.h"')
header_txt.append('#include "vk_struct_string_helper_cpp.h"')
- header_txt.append('#include "layers_table.h"')
+ header_txt.append('#include "vk_layer_table.h"')
header_txt.append('#include <unordered_map>')
header_txt.append('')
header_txt.append('// The following is #included again to catch certain OS-specific functions being used:')
@@ -800,7 +800,7 @@
func_body = []
func_body.append('%s' % self.lineinfo.get())
func_body.append('#include "vk_dispatch_table_helper.h"')
- func_body.append('#include "layers_config.h"')
+ func_body.append('#include "vk_layer_config.h"')
func_body.append('')
func_body.append('static void init%s(void)' % self.layer_name)
func_body.append('{')
@@ -1076,12 +1076,12 @@
header_txt.append('using namespace std;')
header_txt.append('// The following is #included again to catch certain OS-specific functions being used:')
header_txt.append('#include "loader_platform.h"')
- header_txt.append('#include "layers_config.h"')
- header_txt.append('#include "layers_msg.h"')
+ header_txt.append('#include "vk_layer_config.h"')
+ header_txt.append('#include "vk_layer_msg.h"')
header_txt.append('#include "vk_debug_report_lunarg.h"')
- header_txt.append('#include "layers_table.h"')
- header_txt.append('#include "layer_data.h"')
- header_txt.append('#include "layer_logging.h"')
+ header_txt.append('#include "vk_layer_table.h"')
+ header_txt.append('#include "vk_layer_data.h"')
+ header_txt.append('#include "vk_layer_logging.h"')
header_txt.append('')
# NOTE: The non-autoGenerated code is in the object_track.h header file
header_txt.append('#include "object_track.h"')
@@ -1228,13 +1228,13 @@
header_txt.append('#include "loader_platform.h"')
header_txt.append('#include "vk_layer.h"')
header_txt.append('#include "threading.h"')
- header_txt.append('#include "layers_config.h"')
+ header_txt.append('#include "vk_layer_config.h"')
header_txt.append('#include "vk_enum_validate_helper.h"')
header_txt.append('#include "vk_struct_validate_helper.h"')
header_txt.append('//The following is #included again to catch certain OS-specific functions being used:')
header_txt.append('#include "loader_platform.h"\n')
- header_txt.append('#include "layers_msg.h"\n')
- header_txt.append('#include "layers_table.h"\n')
+ header_txt.append('#include "vk_layer_msg.h"\n')
+ header_txt.append('#include "vk_layer_table.h"\n')
header_txt.append('')
header_txt.append('')
header_txt.append('static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(initOnce);')