commit 92f12cd165abf3e93f335994b077f1569eacaffa
author Tobin Ehlis <tobin@lunarg.com> Wed Jul 08 17:08:02 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:19 2015 -0600
tree b635279a34917d35b7786a509d05c32a4128529a
parent 65d94ad79eca295acd27c2de5552bafc6684dd5d

layers: Get MemTracker compiling with type safety header change

Still need to test functionality.

layers/draw_state.h

diff --git a/layers/draw_state.h b/layers/draw_state.h
index 75eaed1..8b4f6c1 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -23,6 +23,7 @@
  */
 #include "vk_layer.h"
 #include <vector>
+#include "layer_common.h"
 
 using namespace std;
 
@@ -74,49 +75,6 @@
     NUM_DRAW_TYPES        = (DRAW_END_RANGE - DRAW_BEGIN_RANGE + 1),
 } DRAW_TYPE;
 
-typedef enum _DYNAMIC_STATE_BIND_POINT
-{
-    VK_STATE_BIND_POINT_VIEWPORT,
-    VK_STATE_BIND_POINT_RASTER,
-    VK_STATE_BIND_POINT_COLOR_BLEND,
-    VK_STATE_BIND_POINT_DEPTH_STENCIL,
-    VK_NUM_STATE_BIND_POINT // Used for array sizing
-} DYNAMIC_STATE_BIND_POINT;
-
-static string string_DYNAMIC_STATE_BIND_POINT(DYNAMIC_STATE_BIND_POINT sbp)
-{
-    switch (sbp)
-    {
-        case VK_STATE_BIND_POINT_VIEWPORT:
-            return "VIEWPORT";
-        case VK_STATE_BIND_POINT_RASTER:
-            return "RASTER";
-        case VK_STATE_BIND_POINT_COLOR_BLEND:
-            return "COLOR_BLEND";
-        case VK_STATE_BIND_POINT_DEPTH_STENCIL:
-            return "DEPTH_STENCIL";
-        default:
-            return "UNKNOWN_DYNAMIC_STATE_BIND_POINT";
-    }
-}
-
-static VkDbgObjectType dynamicStateBindPointToObjType(DYNAMIC_STATE_BIND_POINT sbp)
-{
-    switch (sbp)
-    {
-        case VK_STATE_BIND_POINT_VIEWPORT:
-            return VK_OBJECT_TYPE_DYNAMIC_VIEWPORT_STATE;
-        case VK_STATE_BIND_POINT_RASTER:
-            return VK_OBJECT_TYPE_DYNAMIC_RASTER_STATE;
-        case VK_STATE_BIND_POINT_COLOR_BLEND:
-            return VK_OBJECT_TYPE_DYNAMIC_COLOR_BLEND_STATE;
-        case VK_STATE_BIND_POINT_DEPTH_STENCIL:
-            return VK_OBJECT_TYPE_DYNAMIC_DEPTH_STENCIL_STATE;
-        default:
-            return VK_OBJECT_TYPE_MAX_ENUM;
-    }
-}
-
 typedef struct _SHADER_DS_MAPPING {
     uint32_t slotCount;
     VkDescriptorSetLayoutCreateInfo* pShaderMappingSlot;