From e974568a65f7243dbc1eeb69d94174d0563c9d65 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Fri, 15 Jan 2016 11:58:33 -0700 Subject: [PATCH] layers: fix threading destroy instance The threading layer was using the generic destroy_instance utility when it should be using the utility that takes a map. --- layers/vk_layer_table.h | 2 ++ vk-layer-generate.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h index 816b6a6..04ea266 100644 --- a/layers/vk_layer_table.h +++ b/layers/vk_layer_table.h @@ -54,3 +54,5 @@ VkLayerDeviceCreateInfo *get_chain_info(const VkDeviceCreateInfo *pCreateInfo); void destroy_device_dispatch_table(dispatch_key key); void destroy_instance_dispatch_table(dispatch_key key); +void destroy_dispatch_table(device_table_map &map, dispatch_key key); +void destroy_dispatch_table(instance_table_map &map, dispatch_key key); diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 6c8a2c8..f8518ee 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -2456,7 +2456,7 @@ class ThreadingSubcommand(Subcommand): ' dispatch_key key = get_dispatch_key(instance);\n' ' VkLayerInstanceDispatchTable *pInstanceTable = get_dispatch_table(threading_instance_table_map, %s);\n' % proto.params[0].name + ' %spInstanceTable->%s;\n' % (ret_val, proto.c_call()) + - ' destroy_instance_dispatch_table(key);\n' + ' destroy_dispatch_table(threading_instance_table_map, key);\n' '\n' ' // Clean up logging callback, if any\n' ' layer_data *my_data = get_my_data_ptr(key, layer_data_map);\n' -- 2.7.4