WSI Validation: Move some things between .h and .cpp files.

This will more-closely mirror what's being done in the generic layer, which was
the original source of this layer.

2 files changed, 27 insertions, 27 deletions

diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index a36854b0..b45007fc 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -25,6 +25,15 @@
  *   Ian Elliott <ian@lunarg.com>
  */
 
+#include <stdio.h>
+#include <string.h>
+#include <unordered_map>
+#include "vk_loader_platform.h"
+#include "vk_layer.h"
+#include "vk_layer_config.h"
+#include "vk_layer_logging.h"
+#include "vk_layer_extension_utils.h"
+
 #include "swapchain.h"
 
 // FIXME/TODO: Make sure this layer is thread-safe!
@@ -33,25 +42,6 @@
 static layer_data mydata;
 
 
-static const VkLayerProperties globalLayerProps[] = {
-    {
-        "Swapchain",
-        VK_API_VERSION,                 // specVersion
-        VK_MAKE_VERSION(0, 1, 0),       // implVersion
-        "layer: Swapchain",
-    }
-};
-
-static const VkLayerProperties deviceLayerProps[] = {
-    {
-        "Swapchain",
-        VK_API_VERSION,                 // specVersion
-        VK_MAKE_VERSION(0, 1, 0),       // implVersion
-        "layer: Swapchain",
-    }
-};
-
-
 static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(initOnce);
 
 // NOTE: The following are for keeping track of info that is used for
diff --git a/layers/swapchain.h b/layers/swapchain.h
index 9a336283..24774c1c 100644
--- a/layers/swapchain.h
+++ b/layers/swapchain.h
@@ -28,14 +28,24 @@
 #ifndef SWAPCHAIN_H
 #define SWAPCHAIN_H
 
-#include <stdio.h>
-#include <string.h>
-#include <unordered_map>
-#include "vk_loader_platform.h"
-#include "vk_layer.h"
-#include "vk_layer_config.h"
-#include "vk_layer_logging.h"
-#include "vk_layer_extension_utils.h"
+static const VkLayerProperties globalLayerProps[] = {
+    {
+        "Swapchain",
+        VK_API_VERSION,                 // specVersion
+        VK_MAKE_VERSION(0, 1, 0),       // implVersion
+        "layer: Swapchain",
+    }
+};
+
+static const VkLayerProperties deviceLayerProps[] = {
+    {
+        "Swapchain",
+        VK_API_VERSION,                 // specVersion
+        VK_MAKE_VERSION(0, 1, 0),       // implVersion
+        "layer: Swapchain",
+    }
+};
+
 
 using namespace std;