aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobin Ehlis <tobin@lunarg.com>2015-07-03 10:34:49 -0600
committerTobin Ehlis <tobin@lunarg.com>2015-07-07 08:47:50 -0600
commit494aca00b6068297cee442347a2e3bdbbfffcd37 (patch)
treea64fc08abd6a4249a6434f6b650cbf484f891a47
parent9f2bb1de5e410ee25cd86afd052f9e8e9c2c87ee (diff)
downloadusermoji-494aca00b6068297cee442347a2e3bdbbfffcd37.tar.xz
loader: Rename loader_platform.h -> vk_loader_platform.h
-rw-r--r--layers/basic.cpp4
-rw-r--r--layers/draw_state.cpp4
-rw-r--r--layers/image.cpp4
-rw-r--r--layers/mem_tracker.cpp4
-rw-r--r--layers/multi.cpp4
-rw-r--r--layers/param_checker.cpp4
-rw-r--r--layers/screenshot.cpp4
-rw-r--r--layers/shader_checker.cpp4
-rw-r--r--layers/vk_layer_config.cpp4
-rw-r--r--loader/CMakeLists.txt2
-rw-r--r--loader/debug_report.h2
-rw-r--r--loader/loader.c2
-rw-r--r--loader/table_ops.h2
-rw-r--r--loader/trampoline.c2
-rw-r--r--loader/vk_loader_platform.h (renamed from loader/loader_platform.h)0
-rw-r--r--loader/wsi_lunarg.c2
-rwxr-xr-xvk-layer-generate.py16
17 files changed, 32 insertions, 32 deletions
diff --git a/layers/basic.cpp b/layers/basic.cpp
index c2ef53d1..835a8005 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -24,13 +24,13 @@
#include <string.h>
#include <stdlib.h>
#include <assert.h>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_layer.h"
#include "vk_layer_table.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
VK_LAYER_EXPORT VkResult VKAPI vkLayerExtension1(VkDevice device)
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index da47329e..b11877c8 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -27,7 +27,7 @@
#include <string.h>
#include <unordered_map>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_struct_string_helper_cpp.h"
#if defined(__GNUC__)
@@ -43,7 +43,7 @@
#include "vk_debug_marker_layer.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_layer_msg.h"
#include "vk_layer_table.h"
#include "vk_layer_debug_marker_table.h"
diff --git a/layers/image.cpp b/layers/image.cpp
index d42cf2a6..1a19180c 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -31,13 +31,13 @@
#include <sstream>
#include <unordered_map>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_layer.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 "vk_loader_platform.h"
#include "vk_layer_table.h"
#include "vk_layer_data.h"
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index ab36022f..83192587 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -32,14 +32,14 @@
#include <vector>
using namespace std;
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_struct_string_helper_cpp.h"
#include "mem_tracker.h"
#include "vk_layer_config.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_layer_table.h"
#include "vk_layer_data.h"
#include "vk_layer_logging.h"
diff --git a/layers/multi.cpp b/layers/multi.cpp
index 4705b0ce..5172057b 100644
--- a/layers/multi.cpp
+++ b/layers/multi.cpp
@@ -27,12 +27,12 @@
#include <stdlib.h>
#include <assert.h>
#include <unordered_map>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_layer.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
static void initLayerTable(const VkBaseLayerObject *devw, VkLayerDispatchTable *pTable, const unsigned int layerNum);
static void initLayerInstanceTable(const VkBaseLayerObject *instw, VkLayerInstanceDispatchTable *pTable, const unsigned int layerNum);
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index e9befd24..f894fdda 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -32,13 +32,13 @@
#include <unordered_map>
#include <vector>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_layer.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 "vk_loader_platform.h"
#include "vk_layer_table.h"
#include "vk_layer_data.h"
diff --git a/layers/screenshot.cpp b/layers/screenshot.cpp
index 89725cd1..d76f4814 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -37,13 +37,13 @@
using namespace std;
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_struct_string_helper_cpp.h"
#include "vk_layer_config.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_layer_table.h"
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index 3bfcfe00..6fcdf5f1 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -29,7 +29,7 @@
#include <map>
#include <vector>
#include <string>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_dispatch_table_helper.h"
#include "vk_layer.h"
#include "vk_layer_config.h"
@@ -39,7 +39,7 @@
#include "shader_checker.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "spirv/spirv.h"
diff --git a/layers/vk_layer_config.cpp b/layers/vk_layer_config.cpp
index 99044694..a9cf5d75 100644
--- a/layers/vk_layer_config.cpp
+++ b/layers/vk_layer_config.cpp
@@ -27,11 +27,11 @@
#include <map>
#include <string.h>
#include <vk_layer.h>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "vk_layer_config.h"
// The following is #included again to catch certain OS-specific functions
// being used:
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#define MAX_CHARS_PER_LINE 4096
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index c48f29b0..4b7ebc29 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -14,7 +14,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
set(LOADER_SRCS
loader.c
loader.h
- loader_platform.h
+ vk_loader_platform.h
trampoline.c
wsi_lunarg.c
wsi_lunarg.h
diff --git a/loader/debug_report.h b/loader/debug_report.h
index 4c8551cc..5d6fd92a 100644
--- a/loader/debug_report.h
+++ b/loader/debug_report.h
@@ -26,7 +26,7 @@
* Courtney Goeltzenleuchter <courtney@lunarg.com>
*/
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "loader.h"
#include "vk_debug_report_lunarg.h"
diff --git a/loader/loader.c b/loader/loader.c
index d59df6c3..a82b1c4d 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -40,7 +40,7 @@
#else // WIN32
#include <dirent.h>
#endif // WIN32
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "loader.h"
#include "wsi_lunarg.h"
#include "gpa_helper.h"
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 84f03396..d65fd30c 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -26,7 +26,7 @@
#include <vk_layer.h>
#include <string.h>
#include "loader.h"
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table,
PFN_vkGetDeviceProcAddr gpa,
diff --git a/loader/trampoline.c b/loader/trampoline.c
index f2239ff0..80c43c06 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "loader.h"
#include "debug_report.h"
diff --git a/loader/loader_platform.h b/loader/vk_loader_platform.h
index 693a3dcf..693a3dcf 100644
--- a/loader/loader_platform.h
+++ b/loader/vk_loader_platform.h
diff --git a/loader/wsi_lunarg.c b/loader/wsi_lunarg.c
index 77d0788e..ad7aa22c 100644
--- a/loader/wsi_lunarg.c
+++ b/loader/wsi_lunarg.c
@@ -27,7 +27,7 @@
*/
#include <string.h>
-#include "loader_platform.h"
+#include "vk_loader_platform.h"
#include "loader.h"
#include "wsi_lunarg.h"
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 97f4767e..5d9fa186 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -594,11 +594,11 @@ class GenericLayerSubcommand(Subcommand):
gen_header.append('#include <stdlib.h>')
gen_header.append('#include <string.h>')
gen_header.append('#include <unordered_map>')
- gen_header.append('#include "loader_platform.h"')
+ gen_header.append('#include "vk_loader_platform.h"')
gen_header.append('#include "vk_layer.h"')
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 "vk_loader_platform.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"')
@@ -741,14 +741,14 @@ class APIDumpSubcommand(Subcommand):
header_txt.append('}')
header_txt.append('')
header_txt.append('%s' % self.lineinfo.get())
- header_txt.append('#include "loader_platform.h"')
+ header_txt.append('#include "vk_loader_platform.h"')
header_txt.append('#include "vk_layer.h"')
header_txt.append('#include "vk_struct_string_helper_cpp.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:')
- header_txt.append('#include "loader_platform.h"')
+ header_txt.append('#include "vk_loader_platform.h"')
header_txt.append('')
header_txt.append('static VkBaseLayerObject *pCurObj;')
header_txt.append('static bool g_APIDumpDetailed = true;')
@@ -1070,12 +1070,12 @@ class ObjectTrackerSubcommand(Subcommand):
header_txt.append('#include <inttypes.h>')
header_txt.append('')
header_txt.append('#include "vulkan.h"')
- header_txt.append('#include "loader_platform.h"')
+ header_txt.append('#include "vk_loader_platform.h"')
header_txt.append('')
header_txt.append('#include <unordered_map>')
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 "vk_loader_platform.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"')
@@ -1225,14 +1225,14 @@ class ThreadingSubcommand(Subcommand):
header_txt.append('#include <stdlib.h>')
header_txt.append('#include <string.h>')
header_txt.append('#include <unordered_map>')
- header_txt.append('#include "loader_platform.h"')
+ header_txt.append('#include "vk_loader_platform.h"')
header_txt.append('#include "vk_layer.h"')
header_txt.append('#include "threading.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 "vk_loader_platform.h"\n')
header_txt.append('#include "vk_layer_msg.h"\n')
header_txt.append('#include "vk_layer_table.h"\n')
header_txt.append('')