1 files changed, 7 insertions, 2 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 915b9407..5a6d1211 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -50,11 +50,16 @@
 #include "vk_layer_logging.h"
 #include "vk_layer_extension_utils.h"
 
-typedef struct _layer_data {
+struct layer_data {
     debug_report_data *report_data;
     // TODO: put instance data here
     VkDbgMsgCallback logging_callback;
-} layer_data;
+
+    layer_data() :
+        report_data(nullptr),
+        logging_callback(nullptr)
+    {};
+};
 
 static std::unordered_map<void *, layer_data *> layer_data_map;
 static device_table_map draw_state_device_table_map;