diff options
| author | Gabríel Arthúr Pétursson <gabriel@system.is> | 2017-06-03 23:27:59 +0000 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-06-07 14:57:20 -0700 |
| commit | 900135556fce1ecf6793267d4db4b423d7f009c1 (patch) | |
| tree | 5e3402d98fc1214ecd9765ccc9c17ba3313dd652 /layers/parameter_validation.cpp | |
| parent | 6be9526304e7b7ea4f9bbbe91c84c03b842b457f (diff) | |
| download | usermoji-900135556fce1ecf6793267d4db4b423d7f009c1.tar.xz | |
layers: Free per-device and -instance data on destroy
Instance and device data are allocated by the first call to
GetLayerDataPtr in the corresponding vkCreate call. We need to delete
them when we're done with them. Introduce a FreeLayerDataPtr helper
function that assists with this task.
Deletes for dispatch tables were missing in a few places too. Add them.
Diffstat (limited to 'layers/parameter_validation.cpp')
| -rw-r--r-- | layers/parameter_validation.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp index 4359b499..87c40bad 100644 --- a/layers/parameter_validation.cpp +++ b/layers/parameter_validation.cpp @@ -318,8 +318,9 @@ VKAPI_ATTR void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocati } layer_debug_report_destroy_instance(my_data->report_data); - instance_layer_data_map.erase(key); } + + FreeLayerDataPtr(key, instance_layer_data_map); } VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, @@ -626,8 +627,9 @@ VKAPI_ATTR void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCall #endif my_data->dispatch_table.DestroyDevice(device, pAllocator); - layer_data_map.erase(key); } + + FreeLayerDataPtr(key, layer_data_map); } static bool PreGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex) { |