layers: clean up includes

8 files changed, 13 insertions, 38 deletions

diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp
index 3843f378..32327b23 100644
--- a/layers/device_limits.cpp
+++ b/layers/device_limits.cpp
@@ -41,9 +41,6 @@
 #include "device_limits.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 "vk_loader_platform.h"
 #include "vk_layer_table.h"
 #include "vk_layer_debug_marker_table.h"
 #include "vk_layer_data.h"
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 398393d4..ebbb010d 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -40,9 +40,6 @@
 #include "draw_state.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 "vk_loader_platform.h"
 #include "vk_layer_table.h"
 #include "vk_layer_debug_marker_table.h"
 #include "vk_layer_data.h"
diff --git a/layers/image.cpp b/layers/image.cpp
index 283e4319..0b8b242b 100644
--- a/layers/image.cpp
+++ b/layers/image.cpp
@@ -22,29 +22,28 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include <iostream>
-#include <string>
-#include <sstream>
+#include <assert.h>
+#include <vector>
 #include <unordered_map>
 #include <memory>
-#include <vector>
+using namespace std;
 
-#include "image.h"
 #include "vk_loader_platform.h"
-#include "vk_layer.h"
+#include "vk_dispatch_table_helper.h"
+#include "vk_struct_string_helper_cpp.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 "vk_loader_platform.h"
-
+#include "image.h"
+#include "vk_layer_config.h"
+#include "vk_layer_extension_utils.h"
 #include "vk_layer_table.h"
 #include "vk_layer_data.h"
 #include "vk_layer_extension_utils.h"
 #include "vk_layer_utils.h"
+#include "vk_layer_logging.h"
 
 using namespace std;
 
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 47d4c017..3b322bc9 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -39,9 +39,6 @@ using namespace std;
 #include "mem_tracker.h"
 #include "vk_layer_config.h"
 #include "vk_layer_extension_utils.h"
-// The following is #included again to catch certain OS-specific functions
-// being used:
-#include "vk_loader_platform.h"
 #include "vk_layer_table.h"
 #include "vk_layer_data.h"
 #include "vk_layer_logging.h"
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index d6e95696..b78c19ec 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -38,8 +38,6 @@
 #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 "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 70b10c19..deba9bb6 100644
--- a/layers/screenshot.cpp
+++ b/layers/screenshot.cpp
@@ -41,9 +41,6 @@ using namespace std;
 #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 "vk_loader_platform.h"
 #include "vk_layer_table.h"
 #include "vk_layer_extension_utils.h"
 
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index 94c5fd63..2b39c529 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -38,9 +38,6 @@
 #include "vk_layer_logging.h"
 #include "vk_enum_string_helper.h"
 #include "shader_checker.h"
-// The following is #included again to catch certain OS-specific functions
-// being used:
-#include "vk_loader_platform.h"
 #include "vk_layer_extension_utils.h"
 
 #include "spirv/spirv.hpp"
@@ -91,7 +88,7 @@ static int globalLockInitialized = 0;
 static loader_platform_thread_mutex globalLock;
 
 
-std::unordered_map<uint32_t, std::vector<VkDescriptorSetLayoutBinding>*> descriptor_set_layout_map;
+std::unordered_map<uint64_t, std::vector<VkDescriptorSetLayoutBinding>*> descriptor_set_layout_map;
 
 VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(
     VkDevice device,
@@ -114,7 +111,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(
 }
 
 
-std::unordered_map<uint32_t, std::vector<std::vector<VkDescriptorSetLayoutBinding>*>*> pipeline_layout_map;
+std::unordered_map<uint64_t, std::vector<std::vector<VkDescriptorSetLayoutBinding>*>*> pipeline_layout_map;
 
 VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineLayout(
     VkDevice                                    device,
@@ -188,7 +185,7 @@ bool
 shader_is_spirv(VkShaderModuleCreateInfo const *pCreateInfo)
 {
     uint32_t *words = (uint32_t *)pCreateInfo->pCode;
-    uint32_t sizeInWords = pCreateInfo->codeSize / sizeof(uint32_t);
+    size_t sizeInWords = pCreateInfo->codeSize / sizeof(uint32_t);
 
     /* Just validate that the header makes sense. */
     return sizeInWords >= 5 && words[0] == spv::MagicNumber && words[1] == spv::Version;
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 0e2aba06..b2a03a8b 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -817,9 +817,6 @@ class APIDumpSubcommand(Subcommand):
         header_txt.append('}')
         header_txt.append('')
         header_txt.append('%s' % self.lineinfo.get())
-        header_txt.append('// The following is #included again to catch certain OS-specific functions being used:')
-        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;')
         header_txt.append('')
@@ -1191,8 +1188,6 @@ class ObjectTrackerSubcommand(Subcommand):
         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 "vk_loader_platform.h"')
         header_txt.append('#include "vk_layer.h"')
         header_txt.append('#include "vk_layer_config.h"')
         header_txt.append('#include "vk_debug_report_lunarg.h"')
@@ -1819,8 +1814,6 @@ class ThreadingSubcommand(Subcommand):
         header_txt.append('#include "vk_layer_extension_utils.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 "vk_loader_platform.h"')
         header_txt.append('#include "vk_layer_table.h"')
         header_txt.append('#include "vk_layer_logging.h"')
         header_txt.append('')