aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtneygo@google.com>2016-01-15 11:58:33 -0700
committerJon Ashburn <jon@lunarg.com>2016-01-20 18:04:49 -0700
commite974568a65f7243dbc1eeb69d94174d0563c9d65 (patch)
tree42ef6808919cec105bd950bcc459ab67ecb92cb6
parenta40e0a9ffd47da0bbb3aaff74dced667e6dd5fe9 (diff)
downloadusermoji-e974568a65f7243dbc1eeb69d94174d0563c9d65.tar.xz
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.
-rw-r--r--layers/vk_layer_table.h2
-rwxr-xr-xvk-layer-generate.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h
index 816b6a69..04ea2661 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 6c8a2c89..f8518ee0 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'