layers: Move image struct into cv_types header

To allow external access to image_state structs.

Change-Id: I3af02068c81b32df68b56c4e210cb2a5b2000efa

2 files changed, 5 insertions, 5 deletions

diff --git a/layers/core_validation.h b/layers/core_validation.h
index f1185f3c..fe850ec3 100644
--- a/layers/core_validation.h
+++ b/layers/core_validation.h
@@ -139,11 +139,6 @@ struct GENERIC_HEADER {
     const void *pNext;
 };
 
-struct IMAGE_LAYOUT_NODE {
-    VkImageLayout layout;
-    VkFormat format;
-};
-
 class PHYS_DEV_PROPERTIES_NODE {
   public:
     VkPhysicalDeviceProperties properties;
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index d0c05c7f..2523be3a 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -640,6 +640,11 @@ struct CB_SUBMISSION {
     VkFence fence;
 };
 
+struct IMAGE_LAYOUT_NODE {
+    VkImageLayout layout;
+    VkFormat format;
+};
+
 // Fwd declarations of layer_data and helpers to look-up/validate state from layer_data maps
 namespace core_validation {
 struct layer_data;