layers: Updated DrawState to work with type safety changes

DrawState now working with cube demo, but lots of cleanup and TODO items that need to be addressed.
diff --git a/include/vk_debug_marker_lunarg.h b/include/vk_debug_marker_lunarg.h
index bce7aa3..526778f 100644
--- a/include/vk_debug_marker_lunarg.h
+++ b/include/vk_debug_marker_lunarg.h
@@ -32,6 +32,7 @@
 #define __VK_DEBUG_MARKER_H__
 
 #include "vulkan.h"
+#include "vk_debug_report_lunarg.h"
 
 #define VK_DEBUG_MARKER_EXTENSION_NUMBER 3
 #define VK_DEBUG_MARKER_EXTENSION_VERSION VK_MAKE_VERSION(0, 1, 0)
diff --git a/include/vulkan.h b/include/vulkan.h
index 072ebb4..d9bc859 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -2029,7 +2029,7 @@
 
 typedef struct VkDynamicViewportStateCreateInfo_
 {
-    VkStructureType                             sType;      // Must be VK_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO
+    VkStructureType                             sType;      // Must be VK_STRUCTURE_TYPE_DYNAMIC_VIEWPORT_STATE_CREATE_INFO
     const void*                                 pNext;      // Pointer to next structure
     uint32_t                                    viewportAndScissorCount;  // number of entries in pViewports and pScissors
     const VkViewport*                           pViewports;
@@ -2038,7 +2038,7 @@
 
 typedef struct VkDynamicRasterStateCreateInfo_
 {
-    VkStructureType                             sType;      // Must be VK_STRUCTURE_TYPE_DYNAMIC_RS_STATE_CREATE_INFO
+    VkStructureType                             sType;      // Must be VK_STRUCTURE_TYPE_DYNAMIC_RASTER_STATE_CREATE_INFO
     const void*                                 pNext;      // Pointer to next structure
     float                                       depthBias;
     float                                       depthBiasClamp;
@@ -2048,14 +2048,14 @@
 
 typedef struct VkDynamicColorBlendStateCreateInfo_
 {
-    VkStructureType                             sType;      // Must be VK_STRUCTURE_TYPE_DYNAMIC_CB_STATE_CREATE_INFO
+    VkStructureType                             sType;      // Must be VK_STRUCTURE_TYPE_DYNAMIC_COLOR_BLEND_STATE_CREATE_INFO
     const void*                                 pNext;      // Pointer to next structure
     float                                       blendConst[4];
 } VkDynamicColorBlendStateCreateInfo;
 
 typedef struct VkDynamicDepthStencilStateCreateInfo_
 {
-    VkStructureType                             sType;              // Must be VK_STRUCTURE_TYPE_DYNAMIC_DS_STATE_CREATE_INFO
+    VkStructureType                             sType;              // Must be VK_STRUCTURE_TYPE_DYNAMIC_DEPTH_STENCIL_STATE_CREATE_INFO
     const void*                                 pNext;              // Pointer to next structure
     float                                       minDepthBounds;     // optional (depth_bounds_test)
     float                                       maxDepthBounds;     // optional (depth_bounds_test)