layers: Erase proper key in draw state.
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index c4bbd6b..b3c7974 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1644,10 +1644,11 @@
deleteLayouts();
loader_platform_thread_unlock_mutex(&globalLock);
+ dispatch_key key = get_dispatch_key(device);
VkLayerDispatchTable *pDisp = get_dispatch_table(draw_state_device_table_map, device);
VkResult result = pDisp->DestroyDevice(device);
deviceExtMap.erase(pDisp);
- draw_state_device_table_map.erase(pDisp);
+ draw_state_device_table_map.erase(key);
tableDebugMarkerMap.erase(pDisp);
return result;
}