Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1 | /* |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2 | * |
Courtney Goeltzenleuchter | 8a17da5 | 2015-10-29 13:50:34 -0600 | [diff] [blame] | 3 | * Copyright (C) 2015 Valve Corporation |
Michael Lentine | bfb5fd6 | 2015-09-23 17:43:16 -0700 | [diff] [blame] | 4 | * Copyright (C) 2015 Google, Inc. |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 5 | * |
| 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
| 7 | * copy of this software and associated documentation files (the "Software"), |
| 8 | * to deal in the Software without restriction, including without limitation |
| 9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| 10 | * and/or sell copies of the Software, and to permit persons to whom the |
| 11 | * Software is furnished to do so, subject to the following conditions: |
| 12 | * |
| 13 | * The above copyright notice and this permission notice shall be included |
| 14 | * in all copies or substantial portions of the Software. |
| 15 | * |
| 16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| 19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 22 | * DEALINGS IN THE SOFTWARE. |
Courtney Goeltzenleuchter | 96cd795 | 2015-10-30 11:14:30 -0600 | [diff] [blame] | 23 | * |
| 24 | * Author: Cody Northrop <cody@lunarg.com> |
| 25 | * Author: Jon Ashburn <jon@lunarg.com> |
| 26 | * Author: Mark Lobodzinski <mark@lunarg.com> |
| 27 | * Author: Tobin Ehlis <tobin@lunarg.com> |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 28 | */ |
| 29 | |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 30 | #include <inttypes.h> |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 31 | #include <stdio.h> |
| 32 | #include <stdlib.h> |
| 33 | #include <string.h> |
| 34 | #include <assert.h> |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 35 | #include <list> |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 36 | #include <map> |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 37 | #include <vector> |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 38 | using namespace std; |
| 39 | |
Tobin Ehlis | 7a51d90 | 2015-07-03 10:34:49 -0600 | [diff] [blame] | 40 | #include "vk_loader_platform.h" |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 41 | #include "vk_dispatch_table_helper.h" |
| 42 | #include "vk_struct_string_helper_cpp.h" |
Tobin Ehlis | 6208641 | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 43 | #include "mem_tracker.h" |
Tobin Ehlis | 56d204a | 2015-07-03 10:15:26 -0600 | [diff] [blame] | 44 | #include "vk_layer_config.h" |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 45 | #include "vk_layer_extension_utils.h" |
Tobin Ehlis | 56d204a | 2015-07-03 10:15:26 -0600 | [diff] [blame] | 46 | #include "vk_layer_table.h" |
| 47 | #include "vk_layer_data.h" |
| 48 | #include "vk_layer_logging.h" |
Courtney Goeltzenleuchter | 9419f32 | 2015-07-05 11:17:01 -0600 | [diff] [blame] | 49 | static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce); |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 50 | |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 51 | // WSI Image Objects bypass usual Image Object creation methods. A special Memory |
| 52 | // Object value will be used to identify them internally. |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 53 | static const VkDeviceMemory MEMTRACKER_SWAP_CHAIN_IMAGE_KEY = (VkDeviceMemory)(-1); |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 54 | |
Cody Northrop | 73bb657 | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 55 | struct layer_data { |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 56 | debug_report_data *report_data; |
| 57 | std::vector<VkDbgMsgCallback> logging_callback; |
| 58 | VkLayerDispatchTable *device_dispatch_table; |
| 59 | VkLayerInstanceDispatchTable *instance_dispatch_table; |
| 60 | VkBool32 wsi_enabled; |
| 61 | uint64_t currentFenceId; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 62 | // Maps for tracking key structs related to MemTracker state |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 63 | unordered_map<VkCommandBuffer, MT_CB_INFO> cbMap; |
| 64 | unordered_map<VkCommandPool, MT_CMD_POOL_INFO> commandPoolMap; |
| 65 | unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO> memObjMap; |
| 66 | unordered_map<VkFence, MT_FENCE_INFO> fenceMap; |
| 67 | unordered_map<VkQueue, MT_QUEUE_INFO> queueMap; |
| 68 | unordered_map<VkSwapchainKHR, MT_SWAP_CHAIN_INFO*> swapchainMap; |
| 69 | unordered_map<VkSemaphore, MtSemaphoreState> semaphoreMap; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 70 | // Images and Buffers are 2 objects that can have memory bound to them so they get special treatment |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 71 | unordered_map<uint64_t, MT_OBJ_BINDING_INFO> imageMap; |
| 72 | unordered_map<uint64_t, MT_OBJ_BINDING_INFO> bufferMap; |
Cody Northrop | 73bb657 | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 73 | |
| 74 | layer_data() : |
| 75 | report_data(nullptr), |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 76 | device_dispatch_table(nullptr), |
| 77 | instance_dispatch_table(nullptr), |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 78 | wsi_enabled(VK_FALSE), |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 79 | currentFenceId(1) |
Cody Northrop | 73bb657 | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 80 | {}; |
| 81 | }; |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 82 | |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 83 | static unordered_map<void *, layer_data *> layer_data_map; |
| 84 | |
Mark Lobodzinski | 7234629 | 2015-07-02 16:49:40 -0600 | [diff] [blame] | 85 | static VkPhysicalDeviceMemoryProperties memProps; |
Jon Ashburn | d956400 | 2015-05-07 10:27:37 -0600 | [diff] [blame] | 86 | |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 87 | static VkBool32 clear_cmd_buf_and_mem_references(layer_data* my_data, const VkCommandBuffer cb); |
| 88 | |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 89 | // TODO : This can be much smarter, using separate locks for separate global data |
| 90 | static int globalLockInitialized = 0; |
| 91 | static loader_platform_thread_mutex globalLock; |
Jon Ashburn | f57ea37 | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 92 | |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 93 | #define MAX_BINDING 0xFFFFFFFF |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 94 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 95 | static MT_OBJ_BINDING_INFO* |
| 96 | get_object_binding_info( |
| 97 | layer_data *my_data, |
| 98 | uint64_t handle, |
| 99 | VkDbgObjectType type) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 100 | { |
| 101 | MT_OBJ_BINDING_INFO* retValue = NULL; |
| 102 | switch (type) |
| 103 | { |
| 104 | case VK_OBJECT_TYPE_IMAGE: |
| 105 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 106 | auto it = my_data->imageMap.find(handle); |
| 107 | if (it != my_data->imageMap.end()) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 108 | return &(*it).second; |
| 109 | break; |
| 110 | } |
| 111 | case VK_OBJECT_TYPE_BUFFER: |
| 112 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 113 | auto it = my_data->bufferMap.find(handle); |
| 114 | if (it != my_data->bufferMap.end()) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 115 | return &(*it).second; |
| 116 | break; |
| 117 | } |
| 118 | } |
| 119 | return retValue; |
| 120 | } |
Mark Lobodzinski | 1542710 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 121 | |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 122 | template layer_data *get_my_data_ptr<layer_data>( |
| 123 | void *data_key, |
| 124 | std::unordered_map<void *, layer_data *> &data_map); |
| 125 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 126 | // Add new queue for this device to map container |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 127 | static void |
| 128 | add_queue_info( |
| 129 | layer_data *my_data, |
| 130 | const VkQueue queue) |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 131 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 132 | MT_QUEUE_INFO* pInfo = &my_data->queueMap[queue]; |
Mark Lobodzinski | 8ee9634 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 133 | pInfo->lastRetiredId = 0; |
| 134 | pInfo->lastSubmittedId = 0; |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 135 | } |
| 136 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 137 | static void |
| 138 | delete_queue_info_list( |
| 139 | layer_data* my_data) |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 140 | { |
| 141 | // Process queue list, cleaning up each entry before deleting |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 142 | my_data->queueMap.clear(); |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 143 | } |
| 144 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 145 | static void |
| 146 | add_swap_chain_info( |
| 147 | layer_data *my_data, |
| 148 | const VkSwapchainKHR swapchain, |
| 149 | const VkSwapchainCreateInfoKHR *pCI) |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 150 | { |
| 151 | MT_SWAP_CHAIN_INFO* pInfo = new MT_SWAP_CHAIN_INFO; |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 152 | memcpy(&pInfo->createInfo, pCI, sizeof(VkSwapchainCreateInfoKHR)); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 153 | my_data->swapchainMap[swapchain] = pInfo; |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 154 | } |
| 155 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 156 | // Add new CBInfo for this cb to map container |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 157 | static void |
| 158 | add_cmd_buf_info( |
| 159 | layer_data *my_data, |
| 160 | VkCommandPool commandPool, |
| 161 | const VkCommandBuffer cb) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 162 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 163 | my_data->cbMap[cb].commandBuffer = cb; |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 164 | my_data->commandPoolMap[commandPool].pCommandBuffers.push_front(cb); |
| 165 | } |
| 166 | |
| 167 | // Delete CBInfo from container and clear mem references to CB |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 168 | static VkBool32 |
| 169 | delete_cmd_buf_info( |
| 170 | layer_data *my_data, |
| 171 | VkCommandPool commandPool, |
| 172 | const VkCommandBuffer cb) |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 173 | { |
| 174 | VkBool32 result = VK_TRUE; |
| 175 | result = clear_cmd_buf_and_mem_references(my_data, cb); |
| 176 | // Delete the CBInfo info |
| 177 | if (result == VK_TRUE) { |
| 178 | my_data->commandPoolMap[commandPool].pCommandBuffers.remove(cb); |
| 179 | my_data->cbMap.erase(cb); |
| 180 | } |
| 181 | return result; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 182 | } |
| 183 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 184 | // Return ptr to Info in CB map, or NULL if not found |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 185 | static MT_CB_INFO* |
| 186 | get_cmd_buf_info( |
| 187 | layer_data *my_data, |
| 188 | const VkCommandBuffer cb) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 189 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 190 | auto item = my_data->cbMap.find(cb); |
| 191 | if (item != my_data->cbMap.end()) { |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 192 | return &(*item).second; |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 193 | } else { |
| 194 | return NULL; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 195 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 196 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 197 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 198 | static void |
| 199 | add_object_binding_info( |
| 200 | layer_data *my_data, |
| 201 | const uint64_t handle, |
| 202 | const VkDbgObjectType type, |
| 203 | const VkDeviceMemory mem) |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 204 | { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 205 | switch (type) |
| 206 | { |
| 207 | // Buffers and images are unique as their CreateInfo is in container struct |
| 208 | case VK_OBJECT_TYPE_BUFFER: |
| 209 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 210 | auto pCI = &my_data->bufferMap[handle]; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 211 | pCI->mem = mem; |
| 212 | break; |
| 213 | } |
| 214 | case VK_OBJECT_TYPE_IMAGE: |
| 215 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 216 | auto pCI = &my_data->imageMap[handle]; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 217 | pCI->mem = mem; |
| 218 | break; |
| 219 | } |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 220 | } |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 221 | } |
| 222 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 223 | static void |
| 224 | add_object_create_info( |
| 225 | layer_data *my_data, |
| 226 | const uint64_t handle, |
| 227 | const VkDbgObjectType type, |
| 228 | const void *pCreateInfo) |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 229 | { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 230 | // TODO : For any CreateInfo struct that has ptrs, need to deep copy them and appropriately clean up on Destroy |
| 231 | switch (type) |
| 232 | { |
| 233 | // Buffers and images are unique as their CreateInfo is in container struct |
| 234 | case VK_OBJECT_TYPE_BUFFER: |
| 235 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 236 | auto pCI = &my_data->bufferMap[handle]; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 237 | memset(pCI, 0, sizeof(MT_OBJ_BINDING_INFO)); |
| 238 | memcpy(&pCI->create_info.buffer, pCreateInfo, sizeof(VkBufferCreateInfo)); |
| 239 | break; |
| 240 | } |
| 241 | case VK_OBJECT_TYPE_IMAGE: |
| 242 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 243 | auto pCI = &my_data->imageMap[handle]; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 244 | memset(pCI, 0, sizeof(MT_OBJ_BINDING_INFO)); |
| 245 | memcpy(&pCI->create_info.image, pCreateInfo, sizeof(VkImageCreateInfo)); |
| 246 | break; |
| 247 | } |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 248 | // Swap Chain is very unique, use my_data->imageMap, but copy in |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 249 | // SwapChainCreatInfo's usage flags and set the mem value to a unique key. These is used by |
| 250 | // vkCreateImageView and internal MemTracker routines to distinguish swap chain images |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 251 | case VK_OBJECT_TYPE_SWAPCHAIN_KHR: |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 252 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 253 | auto pCI = &my_data->imageMap[handle]; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 254 | memset(pCI, 0, sizeof(MT_OBJ_BINDING_INFO)); |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 255 | pCI->mem = MEMTRACKER_SWAP_CHAIN_IMAGE_KEY; |
Mark Lobodzinski | 6aa1abd | 2015-09-01 11:19:08 -0600 | [diff] [blame] | 256 | pCI->create_info.image.usage = |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 257 | const_cast<VkSwapchainCreateInfoKHR*>(static_cast<const VkSwapchainCreateInfoKHR *>(pCreateInfo))->imageUsage; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 258 | break; |
| 259 | } |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 260 | } |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 261 | } |
| 262 | |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 263 | // Add a fence, creating one if necessary to our list of fences/fenceIds |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 264 | static VkBool32 |
| 265 | add_fence_info( |
| 266 | layer_data *my_data, |
| 267 | VkFence fence, |
| 268 | VkQueue queue, |
| 269 | uint64_t *fenceId) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 270 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 271 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 272 | *fenceId = my_data->currentFenceId++; |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 273 | |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 274 | // If no fence, create an internal fence to track the submissions |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 275 | if (fence != VK_NULL_HANDLE) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 276 | my_data->fenceMap[fence].fenceId = *fenceId; |
| 277 | my_data->fenceMap[fence].queue = queue; |
Mark Lobodzinski | 5694518 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 278 | // Validate that fence is in UNSIGNALED state |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 279 | VkFenceCreateInfo* pFenceCI = &(my_data->fenceMap[fence].createInfo); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 280 | if (pFenceCI->flags & VK_FENCE_CREATE_SIGNALED_BIT) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 281 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_FENCE, (uint64_t) fence, 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 282 | "Fence %#" PRIxLEAST64 " submitted in SIGNALED state. Fences must be reset before being submitted", (uint64_t) fence); |
Mark Lobodzinski | 5694518 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 283 | } |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 284 | } else { |
| 285 | // TODO : Do we need to create an internal fence here for tracking purposes? |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 286 | } |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 287 | // Update most recently submitted fence and fenceId for Queue |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 288 | my_data->queueMap[queue].lastSubmittedId = *fenceId; |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 289 | return skipCall; |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 290 | } |
| 291 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 292 | // Remove a fenceInfo from our list of fences/fenceIds |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 293 | static void |
| 294 | delete_fence_info( |
| 295 | layer_data *my_data, |
| 296 | VkFence fence) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 297 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 298 | my_data->fenceMap.erase(fence); |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 299 | } |
| 300 | |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 301 | // Record information when a fence is known to be signalled |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 302 | static void |
| 303 | update_fence_tracking( |
| 304 | layer_data *my_data, |
| 305 | VkFence fence) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 306 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 307 | auto fence_item = my_data->fenceMap.find(fence); |
| 308 | if (fence_item != my_data->fenceMap.end()) { |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 309 | MT_FENCE_INFO *pCurFenceInfo = &(*fence_item).second; |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 310 | VkQueue queue = pCurFenceInfo->queue; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 311 | auto queue_item = my_data->queueMap.find(queue); |
| 312 | if (queue_item != my_data->queueMap.end()) { |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 313 | MT_QUEUE_INFO *pQueueInfo = &(*queue_item).second; |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 314 | if (pQueueInfo->lastRetiredId < pCurFenceInfo->fenceId) { |
| 315 | pQueueInfo->lastRetiredId = pCurFenceInfo->fenceId; |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 316 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 317 | } |
| 318 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 319 | |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 320 | // Update fence state in fenceCreateInfo structure |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 321 | auto pFCI = &(my_data->fenceMap[fence].createInfo); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 322 | pFCI->flags = static_cast<VkFenceCreateFlags>(pFCI->flags | VK_FENCE_CREATE_SIGNALED_BIT); |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 323 | } |
| 324 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 325 | // Helper routine that updates the fence list for a specific queue to all-retired |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 326 | static void |
| 327 | retire_queue_fences( |
| 328 | layer_data *my_data, |
| 329 | VkQueue queue) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 330 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 331 | MT_QUEUE_INFO *pQueueInfo = &my_data->queueMap[queue]; |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 332 | // Set queue's lastRetired to lastSubmitted indicating all fences completed |
Courtney Goeltzenleuchter | c6b048f | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 333 | pQueueInfo->lastRetiredId = pQueueInfo->lastSubmittedId; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 334 | } |
| 335 | |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 336 | // Helper routine that updates all queues to all-retired |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 337 | static void |
| 338 | retire_device_fences( |
| 339 | layer_data *my_data, |
| 340 | VkDevice device) |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 341 | { |
| 342 | // Process each queue for device |
Courtney Goeltzenleuchter | c6b048f | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 343 | // TODO: Add multiple device support |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 344 | for (auto ii=my_data->queueMap.begin(); ii!=my_data->queueMap.end(); ++ii) { |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 345 | // Set queue's lastRetired to lastSubmitted indicating all fences completed |
| 346 | MT_QUEUE_INFO *pQueueInfo = &(*ii).second; |
| 347 | pQueueInfo->lastRetiredId = pQueueInfo->lastSubmittedId; |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 348 | } |
| 349 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 350 | |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 351 | // Helper function to validate correct usage bits set for buffers or images |
| 352 | // Verify that (actual & desired) flags != 0 or, |
| 353 | // if strict is true, verify that (actual & desired) flags == desired |
| 354 | // In case of error, report it via dbg callbacks |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 355 | static VkBool32 |
| 356 | validate_usage_flags( |
| 357 | layer_data *my_data, |
| 358 | void *disp_obj, |
| 359 | VkFlags actual, |
| 360 | VkFlags desired, |
| 361 | VkBool32 strict, |
| 362 | uint64_t obj_handle, |
| 363 | VkDbgObjectType obj_type, |
| 364 | char const *ty_str, |
| 365 | char const *func_name, |
| 366 | char const *usage_str) |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 367 | { |
Courtney Goeltzenleuchter | 1f41f54 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 368 | VkBool32 correct_usage = VK_FALSE; |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 369 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 370 | if (strict) |
| 371 | correct_usage = ((actual & desired) == desired); |
| 372 | else |
| 373 | correct_usage = ((actual & desired) != 0); |
| 374 | if (!correct_usage) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 375 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, obj_type, obj_handle, 0, MEMTRACK_INVALID_USAGE_FLAG, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 376 | "Invalid usage flag for %s %#" PRIxLEAST64 " used by %s. In this case, %s should have %s set during creation.", |
| 377 | ty_str, obj_handle, func_name, ty_str, usage_str); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 378 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 379 | return skipCall; |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 380 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 381 | |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 382 | // Helper function to validate usage flags for images |
| 383 | // Pulls image info and then sends actual vs. desired usage off to helper above where |
| 384 | // an error will be flagged if usage is not correct |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 385 | static VkBool32 |
| 386 | validate_image_usage_flags( |
| 387 | layer_data *my_data, |
| 388 | void *disp_obj, |
| 389 | VkImage image, |
| 390 | VkFlags desired, |
| 391 | VkBool32 strict, |
| 392 | char const *func_name, |
| 393 | char const *usage_string) |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 394 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 395 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 396 | MT_OBJ_BINDING_INFO* pBindInfo = get_object_binding_info(my_data, (uint64_t)image, VK_OBJECT_TYPE_IMAGE); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 397 | if (pBindInfo) { |
Tobin Ehlis | 1c49d78 | 2015-10-29 09:55:19 -0600 | [diff] [blame] | 398 | skipCall = validate_usage_flags(my_data, disp_obj, pBindInfo->create_info.image.usage, desired, strict, |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 399 | (uint64_t) image, VK_OBJECT_TYPE_IMAGE, "image", func_name, usage_string); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 400 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 401 | return skipCall; |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 402 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 403 | |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 404 | // Helper function to validate usage flags for buffers |
| 405 | // Pulls buffer info and then sends actual vs. desired usage off to helper above where |
| 406 | // an error will be flagged if usage is not correct |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 407 | static VkBool32 |
| 408 | validate_buffer_usage_flags( |
| 409 | layer_data *my_data, |
| 410 | void *disp_obj, |
| 411 | VkBuffer buffer, |
| 412 | VkFlags desired, |
| 413 | VkBool32 strict, |
| 414 | char const *func_name, |
| 415 | char const *usage_string) |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 416 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 417 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 418 | MT_OBJ_BINDING_INFO* pBindInfo = get_object_binding_info(my_data, (uint64_t) buffer, VK_OBJECT_TYPE_BUFFER); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 419 | if (pBindInfo) { |
Tobin Ehlis | 1c49d78 | 2015-10-29 09:55:19 -0600 | [diff] [blame] | 420 | skipCall = validate_usage_flags(my_data, disp_obj, pBindInfo->create_info.buffer.usage, desired, strict, |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 421 | (uint64_t) buffer, VK_OBJECT_TYPE_BUFFER, "buffer", func_name, usage_string); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 422 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 423 | return skipCall; |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 424 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 425 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 426 | // Return ptr to info in map container containing mem, or NULL if not found |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 427 | // Calls to this function should be wrapped in mutex |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 428 | static MT_MEM_OBJ_INFO* |
| 429 | get_mem_obj_info( |
| 430 | layer_data *my_data, |
| 431 | const VkDeviceMemory mem) |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 432 | { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 433 | auto item = my_data->memObjMap.find(mem); |
| 434 | if (item != my_data->memObjMap.end()) { |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 435 | return &(*item).second; |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 436 | } else { |
| 437 | return NULL; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 438 | } |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 439 | } |
| 440 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 441 | static void |
| 442 | add_mem_obj_info( |
| 443 | layer_data *my_data, |
| 444 | void *object, |
| 445 | const VkDeviceMemory mem, |
| 446 | const VkMemoryAllocateInfo *pAllocateInfo) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 447 | { |
Courtney Goeltzenleuchter | 0749c66 | 2015-06-13 21:29:26 -0600 | [diff] [blame] | 448 | assert(object != NULL); |
Courtney Goeltzenleuchter | f1eb249 | 2015-06-11 16:01:11 -0600 | [diff] [blame] | 449 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 450 | memcpy(&my_data->memObjMap[mem].allocInfo, pAllocateInfo, sizeof(VkMemoryAllocateInfo)); |
Ian Elliott | b134e84 | 2015-07-06 14:31:32 -0600 | [diff] [blame] | 451 | // TODO: Update for real hardware, actually process allocation info structures |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 452 | my_data->memObjMap[mem].allocInfo.pNext = NULL; |
Mark Lobodzinski | c3fc95c | 2015-12-11 11:17:49 -0700 | [diff] [blame] | 453 | my_data->memObjMap[mem].object = object; |
| 454 | my_data->memObjMap[mem].refCount = 0; |
| 455 | my_data->memObjMap[mem].mem = mem; |
| 456 | my_data->memObjMap[mem].memRange.offset = 0; |
| 457 | my_data->memObjMap[mem].memRange.size = 0; |
| 458 | my_data->memObjMap[mem].pData = 0; |
| 459 | my_data->memObjMap[mem].pDriverData = 0; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 460 | } |
| 461 | |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 462 | // Find CB Info and add mem reference to list container |
| 463 | // Find Mem Obj Info and add CB reference to list container |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 464 | static VkBool32 |
| 465 | update_cmd_buf_and_mem_references( |
| 466 | layer_data *my_data, |
| 467 | const VkCommandBuffer cb, |
| 468 | const VkDeviceMemory mem, |
| 469 | const char *apiName) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 470 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 471 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 472 | |
| 473 | // Skip validation if this image was created through WSI |
| 474 | if (mem != MEMTRACKER_SWAP_CHAIN_IMAGE_KEY) { |
| 475 | |
| 476 | // First update CB binding in MemObj mini CB list |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 477 | MT_MEM_OBJ_INFO* pMemInfo = get_mem_obj_info(my_data, mem); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 478 | if (pMemInfo) { |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 479 | // Search for cmd buffer object in memory object's binding list |
Courtney Goeltzenleuchter | 1f41f54 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 480 | VkBool32 found = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 481 | if (pMemInfo->pCommandBufferBindings.size() > 0) { |
| 482 | for (list<VkCommandBuffer>::iterator it = pMemInfo->pCommandBufferBindings.begin(); it != pMemInfo->pCommandBufferBindings.end(); ++it) { |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 483 | if ((*it) == cb) { |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 484 | found = VK_TRUE; |
| 485 | break; |
| 486 | } |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 487 | } |
| 488 | } |
| 489 | // If not present, add to list |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 490 | if (found == VK_FALSE) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 491 | pMemInfo->pCommandBufferBindings.push_front(cb); |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 492 | pMemInfo->refCount++; |
| 493 | } |
| 494 | // Now update CBInfo's Mem reference list |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 495 | MT_CB_INFO* pCBInfo = get_cmd_buf_info(my_data, cb); |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 496 | // TODO: keep track of all destroyed CBs so we know if this is a stale or simply invalid object |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 497 | if (pCBInfo) { |
Mark Lobodzinski | be0eb4e | 2015-09-11 15:56:51 -0600 | [diff] [blame] | 498 | // Search for memory object in cmd buffer's reference list |
| 499 | VkBool32 found = VK_FALSE; |
| 500 | if (pCBInfo->pMemObjList.size() > 0) { |
| 501 | for (auto it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { |
| 502 | if ((*it) == mem) { |
| 503 | found = VK_TRUE; |
| 504 | break; |
| 505 | } |
| 506 | } |
| 507 | } |
| 508 | // If not present, add to list |
| 509 | if (found == VK_FALSE) { |
| 510 | pCBInfo->pMemObjList.push_front(mem); |
| 511 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 512 | } |
| 513 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 514 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 515 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 516 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 517 | |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 518 | // Free bindings related to CB |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 519 | static VkBool32 |
| 520 | clear_cmd_buf_and_mem_references( |
| 521 | layer_data *my_data, |
| 522 | const VkCommandBuffer cb) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 523 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 524 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 525 | MT_CB_INFO* pCBInfo = get_cmd_buf_info(my_data, cb); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 526 | |
| 527 | if (pCBInfo && (pCBInfo->pMemObjList.size() > 0)) { |
| 528 | list<VkDeviceMemory> mem_obj_list = pCBInfo->pMemObjList; |
| 529 | for (list<VkDeviceMemory>::iterator it=mem_obj_list.begin(); it!=mem_obj_list.end(); ++it) { |
| 530 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(my_data, *it); |
| 531 | if (pInfo) { |
| 532 | pInfo->pCommandBufferBindings.remove(cb); |
| 533 | pInfo->refCount--; |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 534 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 535 | } |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 536 | pCBInfo->pMemObjList.clear(); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 537 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 538 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 539 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 540 | |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 541 | // Delete the entire CB list |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 542 | static VkBool32 |
| 543 | delete_cmd_buf_info_list( |
| 544 | layer_data* my_data) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 545 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 546 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 547 | for (unordered_map<VkCommandBuffer, MT_CB_INFO>::iterator ii=my_data->cbMap.begin(); ii!=my_data->cbMap.end(); ++ii) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 548 | skipCall |= clear_cmd_buf_and_mem_references(my_data, (*ii).first); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 549 | } |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 550 | my_data->cbMap.clear(); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 551 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 552 | } |
| 553 | |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 554 | // For given MemObjInfo, report Obj & CB bindings |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 555 | static VkBool32 |
| 556 | reportMemReferencesAndCleanUp( |
| 557 | layer_data *my_data, |
| 558 | MT_MEM_OBJ_INFO *pMemObjInfo) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 559 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 560 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 561 | size_t cmdBufRefCount = pMemObjInfo->pCommandBufferBindings.size(); |
Tony Barbour | a938abb | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 562 | size_t objRefCount = pMemObjInfo->pObjBindings.size(); |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 563 | |
Michael Lentine | dcae1f9 | 2015-11-23 17:52:53 -0600 | [diff] [blame] | 564 | if ((pMemObjInfo->pCommandBufferBindings.size()) != 0) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 565 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) pMemObjInfo->mem, 0, MEMTRACK_FREED_MEM_REF, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 566 | "Attempting to free memory object %#" PRIxLEAST64 " which still contains " PRINTF_SIZE_T_SPECIFIER " references", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 567 | (uint64_t) pMemObjInfo->mem, (cmdBufRefCount + objRefCount)); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 568 | } |
Mark Lobodzinski | cf26e07 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 569 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 570 | if (cmdBufRefCount > 0 && pMemObjInfo->pCommandBufferBindings.size() > 0) { |
| 571 | for (list<VkCommandBuffer>::const_iterator it = pMemObjInfo->pCommandBufferBindings.begin(); it != pMemObjInfo->pCommandBufferBindings.end(); ++it) { |
| 572 | // TODO : CommandBuffer should be source Obj here |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 573 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)(*it), 0, MEMTRACK_FREED_MEM_REF, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 574 | "Command Buffer %p still has a reference to mem obj %#" PRIxLEAST64, (*it), (uint64_t) pMemObjInfo->mem); |
Mark Lobodzinski | cf26e07 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 575 | } |
| 576 | // Clear the list of hanging references |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 577 | pMemObjInfo->pCommandBufferBindings.clear(); |
Mark Lobodzinski | cf26e07 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 578 | } |
| 579 | |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 580 | if (objRefCount > 0 && pMemObjInfo->pObjBindings.size() > 0) { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 581 | for (auto it = pMemObjInfo->pObjBindings.begin(); it != pMemObjInfo->pObjBindings.end(); ++it) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 582 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, it->type, it->handle, 0, MEMTRACK_FREED_MEM_REF, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 583 | "VK Object %#" PRIxLEAST64 " still has a reference to mem obj %#" PRIxLEAST64, it->handle, (uint64_t) pMemObjInfo->mem); |
Mark Lobodzinski | cf26e07 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 584 | } |
| 585 | // Clear the list of hanging references |
| 586 | pMemObjInfo->pObjBindings.clear(); |
| 587 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 588 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 589 | } |
| 590 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 591 | static VkBool32 |
| 592 | deleteMemObjInfo( |
| 593 | layer_data *my_data, |
| 594 | void *object, |
| 595 | VkDeviceMemory mem) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 596 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 597 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 598 | auto item = my_data->memObjMap.find(mem); |
| 599 | if (item != my_data->memObjMap.end()) { |
| 600 | my_data->memObjMap.erase(item); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 601 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 602 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 603 | "Request to delete memory object %#" PRIxLEAST64 " not present in memory Object Map", (uint64_t) mem); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 604 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 605 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 606 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 607 | |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 608 | // Check if fence for given CB is completed |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 609 | static VkBool32 |
| 610 | checkCBCompleted( |
| 611 | layer_data *my_data, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 612 | const VkCommandBuffer cb, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 613 | VkBool32 *complete) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 614 | { |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 615 | MT_CB_INFO *pCBInfo = get_cmd_buf_info(my_data, cb); |
| 616 | VkBool32 skipCall = VK_FALSE; |
| 617 | *complete = VK_TRUE; |
| 618 | |
| 619 | if (pCBInfo) { |
| 620 | if (pCBInfo->lastSubmittedQueue != NULL) { |
| 621 | VkQueue queue = pCBInfo->lastSubmittedQueue; |
| 622 | MT_QUEUE_INFO *pQueueInfo = &my_data->queueMap[queue]; |
| 623 | if (pCBInfo->fenceId > pQueueInfo->lastRetiredId) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 624 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cb, 0, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 625 | MEMTRACK_NONE, "MEM", "fence %#" PRIxLEAST64 " for CB %p has not been checked for completion", |
| 626 | (uint64_t) pCBInfo->lastSubmittedFence, cb); |
| 627 | *complete = VK_FALSE; |
| 628 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 629 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 630 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 631 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 632 | } |
| 633 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 634 | static VkBool32 |
| 635 | freeMemObjInfo( |
| 636 | layer_data *my_data, |
| 637 | void* object, |
| 638 | VkDeviceMemory mem, |
| 639 | VkBool32 internal) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 640 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 641 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 642 | // Parse global list to find info w/ mem |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 643 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(my_data, mem); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 644 | if (pInfo) { |
Courtney Goeltzenleuchter | c480486 | 2015-03-26 16:15:39 -0600 | [diff] [blame] | 645 | if (pInfo->allocInfo.allocationSize == 0 && !internal) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 646 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 647 | "Attempting to free memory associated with a Persistent Image, %#" PRIxLEAST64 ", " |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 648 | "this should not be explicitly freed\n", (uint64_t) mem); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 649 | } else { |
| 650 | // Clear any CB bindings for completed CBs |
| 651 | // TODO : Is there a better place to do this? |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 652 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 653 | VkBool32 commandBufferComplete = VK_FALSE; |
Courtney Goeltzenleuchter | 38eca26 | 2015-06-13 21:36:49 -0600 | [diff] [blame] | 654 | assert(pInfo->object != VK_NULL_HANDLE); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 655 | list<VkCommandBuffer>::iterator it = pInfo->pCommandBufferBindings.begin(); |
| 656 | list<VkCommandBuffer>::iterator temp; |
| 657 | while (pInfo->pCommandBufferBindings.size() > 0 && it != pInfo->pCommandBufferBindings.end()) { |
| 658 | skipCall |= checkCBCompleted(my_data, *it, &commandBufferComplete); |
| 659 | if (VK_TRUE == commandBufferComplete) { |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 660 | temp = it; |
| 661 | ++temp; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 662 | skipCall |= clear_cmd_buf_and_mem_references(my_data, *it); |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 663 | it = temp; |
| 664 | } else { |
| 665 | ++it; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 666 | } |
| 667 | } |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 668 | |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 669 | // Now verify that no references to this mem obj remain and remove bindings |
Mark Lobodzinski | d3d0016 | 2015-09-10 08:15:23 -0600 | [diff] [blame] | 670 | if (0 != pInfo->refCount) { |
Tobin Ehlis | 1c49d78 | 2015-10-29 09:55:19 -0600 | [diff] [blame] | 671 | skipCall |= reportMemReferencesAndCleanUp(my_data, pInfo); |
Mark Lobodzinski | d3d0016 | 2015-09-10 08:15:23 -0600 | [diff] [blame] | 672 | } |
Courtney Goeltzenleuchter | c6b048f | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 673 | // Delete mem obj info |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 674 | skipCall |= deleteMemObjInfo(my_data, object, mem); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 675 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 676 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 677 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 678 | } |
| 679 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 680 | static const char* |
| 681 | object_type_to_string( |
| 682 | VkDbgObjectType type) |
| 683 | { |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 684 | switch (type) |
| 685 | { |
| 686 | case VK_OBJECT_TYPE_IMAGE: |
| 687 | return "image"; |
| 688 | break; |
| 689 | case VK_OBJECT_TYPE_BUFFER: |
| 690 | return "image"; |
| 691 | break; |
| 692 | case VK_OBJECT_TYPE_SWAPCHAIN_KHR: |
| 693 | return "swapchain"; |
| 694 | break; |
| 695 | default: |
| 696 | return "unknown"; |
| 697 | } |
| 698 | } |
| 699 | |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 700 | // Remove object binding performs 3 tasks: |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 701 | // 1. Remove ObjectInfo from MemObjInfo list container of obj bindings & free it |
| 702 | // 2. Decrement refCount for MemObjInfo |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 703 | // 3. Clear mem binding for image/buffer by setting its handle to 0 |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 704 | // TODO : This only applied to Buffer, Image, and Swapchain objects now, how should it be updated/customized? |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 705 | static VkBool32 |
| 706 | clear_object_binding( |
| 707 | layer_data *my_data, |
| 708 | void *dispObj, |
| 709 | uint64_t handle, |
| 710 | VkDbgObjectType type) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 711 | { |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 712 | // TODO : Need to customize images/buffers/swapchains to track mem binding and clear it here appropriately |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 713 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 714 | MT_OBJ_BINDING_INFO* pObjBindInfo = get_object_binding_info(my_data, handle, type); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 715 | if (pObjBindInfo) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 716 | MT_MEM_OBJ_INFO* pMemObjInfo = get_mem_obj_info(my_data, pObjBindInfo->mem); |
Michael Lentine | dcae1f9 | 2015-11-23 17:52:53 -0600 | [diff] [blame] | 717 | // TODO : Make sure this is a reasonable way to reset mem binding |
| 718 | pObjBindInfo->mem = VK_NULL_HANDLE; |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 719 | if (pMemObjInfo) { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 720 | // This obj is bound to a memory object. Remove the reference to this object in that memory object's list, decrement the memObj's refcount |
| 721 | // and set the objects memory binding pointer to NULL. |
| 722 | VkBool32 clearSucceeded = VK_FALSE; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 723 | for (auto it = pMemObjInfo->pObjBindings.begin(); it != pMemObjInfo->pObjBindings.end(); ++it) { |
| 724 | if ((it->handle == handle) && (it->type == type)) { |
| 725 | pMemObjInfo->refCount--; |
| 726 | pMemObjInfo->pObjBindings.erase(it); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 727 | clearSucceeded = VK_TRUE; |
Mark Lobodzinski | cf26e07 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 728 | break; |
| 729 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 730 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 731 | if (VK_FALSE == clearSucceeded ) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 732 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, type, handle, 0, MEMTRACK_INVALID_OBJECT, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 733 | "While trying to clear mem binding for %s obj %#" PRIxLEAST64 ", unable to find that object referenced by mem obj %#" PRIxLEAST64, |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 734 | object_type_to_string(type), handle, (uint64_t) pMemObjInfo->mem); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 735 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 736 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 737 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 738 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 739 | } |
| 740 | |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 741 | // For NULL mem case, output warning |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 742 | // Make sure given object is in global object map |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 743 | // IF a previous binding existed, output validation error |
| 744 | // Otherwise, add reference from objectInfo to memoryInfo |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 745 | // Add reference off of objInfo |
Courtney Goeltzenleuchter | d280456 | 2015-06-13 21:37:34 -0600 | [diff] [blame] | 746 | // device is required for error logging, need a dispatchable |
| 747 | // object for that. |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 748 | static VkBool32 |
| 749 | set_mem_binding( |
| 750 | layer_data *my_data, |
| 751 | void *dispatch_object, |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 752 | VkDeviceMemory mem, |
| 753 | uint64_t handle, |
| 754 | VkDbgObjectType type, |
| 755 | const char *apiName) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 756 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 757 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 758 | // Handle NULL case separately, just clear previous binding & decrement reference |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 759 | if (mem == VK_NULL_HANDLE) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 760 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, type, handle, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 761 | "In %s, attempting to Bind Obj(%#" PRIxLEAST64 ") to NULL", apiName, handle); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 762 | } else { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 763 | MT_OBJ_BINDING_INFO* pObjBindInfo = get_object_binding_info(my_data, handle, type); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 764 | if (!pObjBindInfo) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 765 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, type, handle, 0, MEMTRACK_MISSING_MEM_BINDINGS, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 766 | "In %s, attempting to update Binding of %s Obj(%#" PRIxLEAST64 ") that's not in global list()", |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 767 | object_type_to_string(type), apiName, handle); |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 768 | } else { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 769 | // non-null case so should have real mem obj |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 770 | MT_MEM_OBJ_INFO* pMemInfo = get_mem_obj_info(my_data, mem); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 771 | if (pMemInfo) { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 772 | // TODO : Need to track mem binding for obj and report conflict here |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 773 | MT_MEM_OBJ_INFO* pPrevBinding = get_mem_obj_info(my_data, pObjBindInfo->mem); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 774 | if (pPrevBinding != NULL) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 775 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) mem, 0, MEMTRACK_REBIND_OBJECT, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 776 | "In %s, attempting to bind memory (%#" PRIxLEAST64 ") to object (%#" PRIxLEAST64 ") which has already been bound to mem object %#" PRIxLEAST64, |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 777 | apiName, (uint64_t) mem, handle, (uint64_t) pPrevBinding->mem); |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 778 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 779 | else { |
| 780 | MT_OBJ_HANDLE_TYPE oht; |
| 781 | oht.handle = handle; |
| 782 | oht.type = type; |
| 783 | pMemInfo->pObjBindings.push_front(oht); |
| 784 | pMemInfo->refCount++; |
| 785 | // For image objects, make sure default memory state is correctly set |
| 786 | // TODO : What's the best/correct way to handle this? |
| 787 | if (VK_OBJECT_TYPE_IMAGE == type) { |
| 788 | VkImageCreateInfo ici = pObjBindInfo->create_info.image; |
| 789 | if (ici.usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | |
| 790 | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) { |
| 791 | // TODO:: More memory state transition stuff. |
| 792 | } |
| 793 | } |
| 794 | pObjBindInfo->mem = mem; |
| 795 | } |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 796 | } |
| 797 | } |
| 798 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 799 | return skipCall; |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 800 | } |
| 801 | |
| 802 | // For NULL mem case, clear any previous binding Else... |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 803 | // Make sure given object is in its object map |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 804 | // IF a previous binding existed, update binding |
| 805 | // Add reference from objectInfo to memoryInfo |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 806 | // Add reference off of object's binding info |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 807 | // Return VK_TRUE if addition is successful, VK_FALSE otherwise |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 808 | static VkBool32 |
| 809 | set_sparse_mem_binding( |
| 810 | layer_data *my_data, |
| 811 | void *dispObject, |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 812 | VkDeviceMemory mem, |
| 813 | uint64_t handle, |
| 814 | VkDbgObjectType type, |
| 815 | const char *apiName) |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 816 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 817 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 818 | // Handle NULL case separately, just clear previous binding & decrement reference |
| 819 | if (mem == VK_NULL_HANDLE) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 820 | skipCall = clear_object_binding(my_data, dispObject, handle, type); |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 821 | } else { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 822 | MT_OBJ_BINDING_INFO* pObjBindInfo = get_object_binding_info(my_data, handle, type); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 823 | if (!pObjBindInfo) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 824 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, type, handle, 0, MEMTRACK_MISSING_MEM_BINDINGS, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 825 | "In %s, attempting to update Binding of Obj(%#" PRIxLEAST64 ") that's not in global list()", apiName, handle); |
Mark Lobodzinski | c66c671 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 826 | } |
| 827 | // non-null case so should have real mem obj |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 828 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(my_data, mem); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 829 | if (pInfo) { |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 830 | // Search for object in memory object's binding list |
Courtney Goeltzenleuchter | 1f41f54 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 831 | VkBool32 found = VK_FALSE; |
Courtney Goeltzenleuchter | a43cbbf | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 832 | if (pInfo->pObjBindings.size() > 0) { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 833 | for (auto it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { |
| 834 | if (((*it).handle == handle) && ((*it).type == type)) { |
Courtney Goeltzenleuchter | a43cbbf | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 835 | found = VK_TRUE; |
| 836 | break; |
| 837 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 838 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 839 | } |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 840 | // If not present, add to list |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 841 | if (found == VK_FALSE) { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 842 | MT_OBJ_HANDLE_TYPE oht; |
| 843 | oht.handle = handle; |
| 844 | oht.type = type; |
| 845 | pInfo->pObjBindings.push_front(oht); |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 846 | pInfo->refCount++; |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 847 | } |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 848 | // Need to set mem binding for this object |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 849 | MT_MEM_OBJ_INFO* pPrevBinding = get_mem_obj_info(my_data, pObjBindInfo->mem); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 850 | pObjBindInfo->mem = mem; |
Tobin Ehlis | 6aa7742 | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 851 | } |
| 852 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 853 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 854 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 855 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 856 | template <typename T> void |
| 857 | print_object_map_members( |
| 858 | layer_data *my_data, |
| 859 | void *dispObj, |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 860 | T const& objectName, |
| 861 | VkDbgObjectType objectType, |
| 862 | const char *objectStr) |
| 863 | { |
| 864 | for (auto const& element : objectName) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 865 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, objectType, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 866 | " %s Object list contains %s Object %#" PRIxLEAST64 " ", objectStr, objectStr, element.first); |
| 867 | } |
| 868 | } |
| 869 | |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 870 | // For given Object, get 'mem' obj that it's bound to or NULL if no binding |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 871 | static VkBool32 |
| 872 | get_mem_binding_from_object( |
| 873 | layer_data *my_data, |
| 874 | void *dispObj, |
| 875 | const uint64_t handle, |
| 876 | const VkDbgObjectType type, |
| 877 | VkDeviceMemory *mem) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 878 | { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 879 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 880 | *mem = VK_NULL_HANDLE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 881 | MT_OBJ_BINDING_INFO* pObjBindInfo = get_object_binding_info(my_data, handle, type); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 882 | if (pObjBindInfo) { |
| 883 | if (pObjBindInfo->mem) { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 884 | *mem = pObjBindInfo->mem; |
Courtney Goeltzenleuchter | a43cbbf | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 885 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 886 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, type, handle, 0, MEMTRACK_MISSING_MEM_BINDINGS, "MEM", |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 887 | "Trying to get mem binding for object %#" PRIxLEAST64 " but object has no mem binding", handle); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 888 | } |
Courtney Goeltzenleuchter | a43cbbf | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 889 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 890 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, type, handle, 0, MEMTRACK_INVALID_OBJECT, "MEM", |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 891 | "Trying to get mem binding for object %#" PRIxLEAST64 " but no such object in %s list", |
| 892 | handle, object_type_to_string(type)); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 893 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 894 | return skipCall; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 895 | } |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 896 | |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 897 | // Print details of MemObjInfo list |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 898 | static void |
| 899 | print_mem_list( |
| 900 | layer_data *my_data, |
| 901 | void *dispObj) |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 902 | { |
| 903 | MT_MEM_OBJ_INFO* pInfo = NULL; |
Mark Lobodzinski | 283a4c2 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 904 | |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 905 | // Early out if info is not requested |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 906 | if (!(my_data->report_data->active_flags & VK_DEBUG_REPORT_INFO_BIT)) { |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 907 | return; |
| 908 | } |
| 909 | |
| 910 | // Just printing each msg individually for now, may want to package these into single large print |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 911 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 912 | "Details of Memory Object list (of size " PRINTF_SIZE_T_SPECIFIER " elements)", my_data->memObjMap.size()); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 913 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 914 | "============================="); |
| 915 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 916 | if (my_data->memObjMap.size() <= 0) |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 917 | return; |
| 918 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 919 | for (auto ii=my_data->memObjMap.begin(); ii!=my_data->memObjMap.end(); ++ii) { |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 920 | pInfo = &(*ii).second; |
| 921 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 922 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 923 | " ===MemObjInfo at %p===", (void*)pInfo); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 924 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 925 | " Mem object: %#" PRIxLEAST64, reinterpret_cast<uint64_t>(pInfo->mem)); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 926 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 927 | " Ref Count: %u", pInfo->refCount); |
| 928 | if (0 != pInfo->allocInfo.allocationSize) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 929 | string pAllocInfoMsg = vk_print_vkmemoryallocateinfo(&pInfo->allocInfo, "MEM(INFO): "); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 930 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 931 | " Mem Alloc info:\n%s", pAllocInfoMsg.c_str()); |
| 932 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 933 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 934 | " Mem Alloc info is NULL (alloc done by vkCreateSwapchainKHR())"); |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 935 | } |
| 936 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 937 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 938 | " VK OBJECT Binding list of size " PRINTF_SIZE_T_SPECIFIER " elements:", pInfo->pObjBindings.size()); |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 939 | if (pInfo->pObjBindings.size() > 0) { |
| 940 | for (list<MT_OBJ_HANDLE_TYPE>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 941 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 942 | " VK OBJECT %" PRIu64, it->handle); |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 943 | } |
| 944 | } |
| 945 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 946 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 947 | " VK Command Buffer (CB) binding list of size " PRINTF_SIZE_T_SPECIFIER " elements", pInfo->pCommandBufferBindings.size()); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 948 | if (pInfo->pCommandBufferBindings.size() > 0) |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 949 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 950 | for (list<VkCommandBuffer>::iterator it = pInfo->pCommandBufferBindings.begin(); it != pInfo->pCommandBufferBindings.end(); ++it) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 951 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 952 | " VK CB %p", (*it)); |
| 953 | } |
| 954 | } |
| 955 | } |
| 956 | } |
| 957 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 958 | static void |
| 959 | printCBList( |
| 960 | layer_data *my_data, |
| 961 | void *dispObj) |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 962 | { |
| 963 | MT_CB_INFO* pCBInfo = NULL; |
| 964 | |
| 965 | // Early out if info is not requested |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 966 | if (!(my_data->report_data->active_flags & VK_DEBUG_REPORT_INFO_BIT)) { |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 967 | return; |
| 968 | } |
| 969 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 970 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 971 | "Details of CB list (of size " PRINTF_SIZE_T_SPECIFIER " elements)", my_data->cbMap.size()); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 972 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 973 | "=================="); |
| 974 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 975 | if (my_data->cbMap.size() <= 0) |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 976 | return; |
| 977 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 978 | for (auto ii=my_data->cbMap.begin(); ii!=my_data->cbMap.end(); ++ii) { |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 979 | pCBInfo = &(*ii).second; |
| 980 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 981 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 982 | " CB Info (%p) has CB %p, fenceId %" PRIx64", and fence %#" PRIxLEAST64, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 983 | (void*)pCBInfo, (void*)pCBInfo->commandBuffer, pCBInfo->fenceId, |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 984 | (uint64_t) pCBInfo->lastSubmittedFence); |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 985 | |
| 986 | if (pCBInfo->pMemObjList.size() <= 0) |
| 987 | continue; |
| 988 | for (list<VkDeviceMemory>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 989 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, 0, 0, MEMTRACK_NONE, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 990 | " Mem obj %" PRIu64, reinterpret_cast<uint64_t>(*it)); |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 991 | } |
| 992 | } |
| 993 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 994 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 995 | static void |
| 996 | init_mem_tracker( |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 997 | layer_data *my_data) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 998 | { |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 999 | uint32_t report_flags = 0; |
| 1000 | uint32_t debug_action = 0; |
| 1001 | FILE *log_output = NULL; |
| 1002 | const char *option_str; |
Courtney Goeltzenleuchter | 26f2b23 | 2015-10-05 15:59:26 -0600 | [diff] [blame] | 1003 | VkDbgMsgCallback callback; |
Jon Ashburn | f57ea37 | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 1004 | // initialize MemTracker options |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 1005 | report_flags = getLayerOptionFlags("MemTrackerReportFlags", 0); |
| 1006 | getLayerOptionEnum("MemTrackerDebugAction", (uint32_t *) &debug_action); |
Tobin Ehlis | 5b7acaa | 2015-01-08 14:26:53 -0700 | [diff] [blame] | 1007 | |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 1008 | if (debug_action & VK_DBG_LAYER_ACTION_LOG_MSG) |
Jon Ashburn | f57ea37 | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 1009 | { |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 1010 | option_str = getLayerOption("MemTrackerLogFilename"); |
Tobin Ehlis | b4b6e7c | 2015-09-15 09:55:54 -0600 | [diff] [blame] | 1011 | log_output = getLayerLogOutput(option_str, "MemTracker"); |
Courtney Goeltzenleuchter | 26f2b23 | 2015-10-05 15:59:26 -0600 | [diff] [blame] | 1012 | layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &callback); |
| 1013 | my_data->logging_callback.push_back(callback); |
| 1014 | } |
| 1015 | |
| 1016 | if (debug_action & VK_DBG_LAYER_ACTION_DEBUG_OUTPUT) { |
| 1017 | layer_create_msg_callback(my_data->report_data, report_flags, win32_debug_output_msg, NULL, &callback); |
| 1018 | my_data->logging_callback.push_back(callback); |
Jon Ashburn | f57ea37 | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 1019 | } |
| 1020 | |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1021 | if (!globalLockInitialized) |
| 1022 | { |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1023 | loader_platform_thread_create_mutex(&globalLock); |
| 1024 | globalLockInitialized = 1; |
| 1025 | } |
Mark Lobodzinski | 7234629 | 2015-07-02 16:49:40 -0600 | [diff] [blame] | 1026 | |
| 1027 | // Zero out memory property data |
| 1028 | memset(&memProps, 0, sizeof(VkPhysicalDeviceMemoryProperties)); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1029 | } |
| 1030 | |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1031 | // hook DestroyInstance to remove tableInstanceMap entry |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1032 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyInstance( |
| 1033 | VkInstance instance, |
| 1034 | const VkAllocationCallbacks *pAllocator) |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1035 | { |
Jeremy Hayes | c8dff5f | 2015-06-18 10:25:55 -0600 | [diff] [blame] | 1036 | // Grab the key before the instance is destroyed. |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 1037 | dispatch_key key = get_dispatch_key(instance); |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1038 | layer_data *my_data = get_my_data_ptr(key, layer_data_map); |
| 1039 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1040 | pTable->DestroyInstance(instance, pAllocator); |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 1041 | |
| 1042 | // Clean up logging callback, if any |
Courtney Goeltzenleuchter | 26f2b23 | 2015-10-05 15:59:26 -0600 | [diff] [blame] | 1043 | while (my_data->logging_callback.size() > 0) { |
| 1044 | VkDbgMsgCallback callback = my_data->logging_callback.back(); |
| 1045 | layer_destroy_msg_callback(my_data->report_data, callback); |
| 1046 | my_data->logging_callback.pop_back(); |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 1047 | } |
| 1048 | |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1049 | layer_debug_report_destroy_instance(my_data->report_data); |
| 1050 | delete my_data->instance_dispatch_table; |
| 1051 | layer_data_map.erase(key); |
| 1052 | if (layer_data_map.empty()) { |
| 1053 | // Release mutex when destroying last instance |
| 1054 | loader_platform_thread_delete_mutex(&globalLock); |
| 1055 | globalLockInitialized = 0; |
| 1056 | } |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1057 | } |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1058 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1059 | VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1060 | const VkInstanceCreateInfo *pCreateInfo, |
| 1061 | const VkAllocationCallbacks *pAllocator, |
| 1062 | VkInstance *pInstance) |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1063 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1064 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); |
| 1065 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1066 | VkResult result = pTable->CreateInstance(pCreateInfo, pAllocator, pInstance); |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1067 | |
| 1068 | if (result == VK_SUCCESS) { |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 1069 | my_data->report_data = debug_report_create_instance( |
| 1070 | pTable, |
| 1071 | *pInstance, |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1072 | pCreateInfo->enabledExtensionNameCount, |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1073 | pCreateInfo->ppEnabledExtensionNames); |
Courtney Goeltzenleuchter | c3c29bd | 2015-06-14 11:37:01 -0600 | [diff] [blame] | 1074 | |
| 1075 | init_mem_tracker(my_data); |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1076 | } |
| 1077 | return result; |
| 1078 | } |
| 1079 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1080 | static void |
| 1081 | createDeviceRegisterExtensions( |
| 1082 | const VkDeviceCreateInfo *pCreateInfo, |
| 1083 | VkDevice device) |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 1084 | { |
Courtney Goeltzenleuchter | 9419f32 | 2015-07-05 11:17:01 -0600 | [diff] [blame] | 1085 | layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1086 | VkLayerDispatchTable *pDisp = my_device_data->device_dispatch_table; |
Jon Ashburn | 83334db | 2015-09-16 18:08:32 -0600 | [diff] [blame] | 1087 | PFN_vkGetDeviceProcAddr gpa = pDisp->GetDeviceProcAddr; |
Jon Ashburn | 83334db | 2015-09-16 18:08:32 -0600 | [diff] [blame] | 1088 | pDisp->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(device, "vkCreateSwapchainKHR"); |
| 1089 | pDisp->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(device, "vkDestroySwapchainKHR"); |
| 1090 | pDisp->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(device, "vkGetSwapchainImagesKHR"); |
| 1091 | pDisp->AcquireNextImageKHR = (PFN_vkAcquireNextImageKHR) gpa(device, "vkAcquireNextImageKHR"); |
| 1092 | pDisp->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(device, "vkQueuePresentKHR"); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1093 | my_device_data->wsi_enabled = VK_FALSE; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1094 | for (uint32_t i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { |
Ian Elliott | 64070a8 | 2015-11-17 17:29:40 -0700 | [diff] [blame] | 1095 | if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) |
Ian Elliott | b134e84 | 2015-07-06 14:31:32 -0600 | [diff] [blame] | 1096 | my_device_data->wsi_enabled = true; |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 1097 | } |
| 1098 | } |
| 1099 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1100 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1101 | VkPhysicalDevice gpu, |
| 1102 | const VkDeviceCreateInfo *pCreateInfo, |
| 1103 | const VkAllocationCallbacks *pAllocator, |
| 1104 | VkDevice *pDevice) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1105 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1106 | layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); |
| 1107 | VkLayerDispatchTable *pDeviceTable = my_device_data->device_dispatch_table; |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1108 | VkResult result = pDeviceTable->CreateDevice(gpu, pCreateInfo, pAllocator, pDevice); |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1109 | if (result == VK_SUCCESS) { |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 1110 | layer_data *my_instance_data = get_my_data_ptr(get_dispatch_key(gpu), layer_data_map); |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 1111 | my_device_data->report_data = layer_debug_report_create_device(my_instance_data->report_data, *pDevice); |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 1112 | createDeviceRegisterExtensions(pCreateInfo, *pDevice); |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1113 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1114 | return result; |
| 1115 | } |
| 1116 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1117 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1118 | VkDevice device, |
| 1119 | const VkAllocationCallbacks *pAllocator) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1120 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1121 | dispatch_key key = get_dispatch_key(device); |
| 1122 | layer_data *my_device_data = get_my_data_ptr(key, layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1123 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1124 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1125 | log_msg(my_device_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE, (uint64_t)device, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 1126 | "Printing List details prior to vkDestroyDevice()"); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1127 | log_msg(my_device_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE, (uint64_t)device, 0, MEMTRACK_NONE, "MEM", |
Mark Lobodzinski | d027366 | 2015-08-10 14:37:52 -0600 | [diff] [blame] | 1128 | "================================================"); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1129 | print_mem_list(my_device_data, device); |
| 1130 | printCBList(my_device_data, device); |
| 1131 | skipCall = delete_cmd_buf_info_list(my_device_data); |
Tobin Ehlis | 22d0323 | 2014-11-25 18:01:12 -0700 | [diff] [blame] | 1132 | // Report any memory leaks |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1133 | MT_MEM_OBJ_INFO* pInfo = NULL; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1134 | if (my_device_data->memObjMap.size() > 0) { |
| 1135 | for (auto ii=my_device_data->memObjMap.begin(); ii!=my_device_data->memObjMap.end(); ++ii) { |
Mike Stroyan | 988caa4 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 1136 | pInfo = &(*ii).second; |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1137 | if (pInfo->allocInfo.allocationSize != 0) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1138 | skipCall |= log_msg(my_device_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) pInfo->mem, 0, MEMTRACK_MEMORY_LEAK, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 1139 | "Mem Object %" PRIu64 " has not been freed. You should clean up this memory by calling " |
| 1140 | "vkFreeMemory(%" PRIu64 ") prior to vkDestroyDevice().", reinterpret_cast<uint64_t>(pInfo->mem), reinterpret_cast<uint64_t>(pInfo->mem)); |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1141 | } |
Mark Lobodzinski | daa1d43 | 2015-02-18 18:06:24 -0600 | [diff] [blame] | 1142 | } |
Tobin Ehlis | 22d0323 | 2014-11-25 18:01:12 -0700 | [diff] [blame] | 1143 | } |
Mark Lobodzinski | 85a8398 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 1144 | // Queues persist until device is destroyed |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1145 | delete_queue_info_list(my_device_data); |
Courtney Goeltzenleuchter | f1eb249 | 2015-06-11 16:01:11 -0600 | [diff] [blame] | 1146 | layer_debug_report_destroy_device(device); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1147 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1148 | |
Courtney Goeltzenleuchter | ab75b61 | 2015-06-13 21:40:22 -0600 | [diff] [blame] | 1149 | #if DISPATCH_MAP_DEBUG |
| 1150 | fprintf(stderr, "Device: %p, key: %p\n", device, key); |
| 1151 | #endif |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1152 | VkLayerDispatchTable *pDisp = my_device_data->device_dispatch_table; |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1153 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1154 | pDisp->DestroyDevice(device, pAllocator); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1155 | } |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1156 | delete my_device_data->device_dispatch_table; |
| 1157 | layer_data_map.erase(key); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1158 | } |
| 1159 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1160 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceMemoryProperties( |
Mark Lobodzinski | 7234629 | 2015-07-02 16:49:40 -0600 | [diff] [blame] | 1161 | VkPhysicalDevice physicalDevice, |
| 1162 | VkPhysicalDeviceMemoryProperties *pMemoryProperties) |
| 1163 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1164 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map); |
| 1165 | VkLayerInstanceDispatchTable *pInstanceTable = my_data->instance_dispatch_table; |
Courtney Goeltzenleuchter | 01d2ae1 | 2015-10-20 16:40:38 -0600 | [diff] [blame] | 1166 | pInstanceTable->GetPhysicalDeviceMemoryProperties(physicalDevice, pMemoryProperties); |
| 1167 | memcpy(&memProps, pMemoryProperties, sizeof(VkPhysicalDeviceMemoryProperties)); |
Mark Lobodzinski | 7234629 | 2015-07-02 16:49:40 -0600 | [diff] [blame] | 1168 | } |
| 1169 | |
Courtney Goeltzenleuchter | 63466a5 | 2015-07-07 10:04:16 -0600 | [diff] [blame] | 1170 | static const VkLayerProperties mtGlobalLayers[] = { |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1171 | { |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1172 | "MemTracker", |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1173 | VK_API_VERSION, |
| 1174 | VK_MAKE_VERSION(0, 1, 0), |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1175 | "Validation layer: MemTracker", |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1176 | } |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1177 | }; |
| 1178 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1179 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1180 | const char *pLayerName, |
| 1181 | uint32_t *pCount, |
| 1182 | VkExtensionProperties *pProperties) |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1183 | { |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1184 | /* Mem tracker does not have any global extensions */ |
Courtney Goeltzenleuchter | 63466a5 | 2015-07-07 10:04:16 -0600 | [diff] [blame] | 1185 | return util_GetExtensionProperties(0, NULL, pCount, pProperties); |
Tony Barbour | 426b905 | 2015-06-24 16:06:58 -0600 | [diff] [blame] | 1186 | } |
| 1187 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1188 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1189 | uint32_t *pCount, |
| 1190 | VkLayerProperties *pProperties) |
Tony Barbour | 426b905 | 2015-06-24 16:06:58 -0600 | [diff] [blame] | 1191 | { |
Courtney Goeltzenleuchter | 63466a5 | 2015-07-07 10:04:16 -0600 | [diff] [blame] | 1192 | return util_GetLayerProperties(ARRAY_SIZE(mtGlobalLayers), |
| 1193 | mtGlobalLayers, |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1194 | pCount, pProperties); |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1195 | } |
| 1196 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1197 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties( |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1198 | VkPhysicalDevice physicalDevice, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1199 | const char *pLayerName, |
| 1200 | uint32_t *pCount, |
| 1201 | VkExtensionProperties *pProperties) |
Tony Barbour | 426b905 | 2015-06-24 16:06:58 -0600 | [diff] [blame] | 1202 | { |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1203 | /* Mem tracker does not have any physical device extensions */ |
Jon Ashburn | aff81ff | 2015-11-02 17:37:20 -0700 | [diff] [blame] | 1204 | if (pLayerName == NULL) { |
| 1205 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(physicalDevice), layer_data_map); |
| 1206 | VkLayerInstanceDispatchTable *pInstanceTable = my_data->instance_dispatch_table; |
| 1207 | return pInstanceTable->EnumerateDeviceExtensionProperties( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1208 | physicalDevice, NULL, pCount, pProperties); |
Jon Ashburn | aff81ff | 2015-11-02 17:37:20 -0700 | [diff] [blame] | 1209 | } else { |
| 1210 | return util_GetExtensionProperties(0, NULL, pCount, pProperties); |
| 1211 | } |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1212 | } |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1213 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1214 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties( |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1215 | VkPhysicalDevice physicalDevice, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1216 | uint32_t *pCount, |
| 1217 | VkLayerProperties *pProperties) |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1218 | { |
| 1219 | /* Mem tracker's physical device layers are the same as global */ |
Courtney Goeltzenleuchter | 63466a5 | 2015-07-07 10:04:16 -0600 | [diff] [blame] | 1220 | return util_GetLayerProperties(ARRAY_SIZE(mtGlobalLayers), mtGlobalLayers, |
Courtney Goeltzenleuchter | 18061cd | 2015-06-29 15:39:26 -0600 | [diff] [blame] | 1221 | pCount, pProperties); |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1222 | } |
| 1223 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1224 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1225 | VkDevice device, |
| 1226 | uint32_t queueNodeIndex, |
| 1227 | uint32_t queueIndex, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1228 | VkQueue *pQueue) |
Mark Lobodzinski | 55e53d9 | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1229 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1230 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1231 | my_data->device_dispatch_table->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue); |
Courtney Goeltzenleuchter | 01d2ae1 | 2015-10-20 16:40:38 -0600 | [diff] [blame] | 1232 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1233 | add_queue_info(my_data, *pQueue); |
Courtney Goeltzenleuchter | 01d2ae1 | 2015-10-20 16:40:38 -0600 | [diff] [blame] | 1234 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 55e53d9 | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1235 | } |
| 1236 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1237 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit( |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1238 | VkQueue queue, |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1239 | uint32_t submitCount, |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 1240 | const VkSubmitInfo *pSubmits, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1241 | VkFence fence) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1242 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1243 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1244 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 1245 | |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1246 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1247 | // TODO : Need to track fence and clear mem references when fence clears |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1248 | MT_CB_INFO* pCBInfo = NULL; |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1249 | uint64_t fenceId = 0; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1250 | VkBool32 skipCall = add_fence_info(my_data, fence, queue, &fenceId); |
Mark Lobodzinski | be783fe | 2015-04-07 13:38:21 -0500 | [diff] [blame] | 1251 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1252 | print_mem_list(my_data, queue); |
| 1253 | printCBList(my_data, queue); |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1254 | for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 1255 | const VkSubmitInfo *submit = &pSubmits[submit_idx]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1256 | for (uint32_t i = 0; i < submit->commandBufferCount; i++) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1257 | pCBInfo = get_cmd_buf_info(my_data, submit->pCommandBuffers[i]); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1258 | if (pCBInfo) { |
| 1259 | pCBInfo->fenceId = fenceId; |
| 1260 | pCBInfo->lastSubmittedFence = fence; |
| 1261 | pCBInfo->lastSubmittedQueue = queue; |
| 1262 | } |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1263 | } |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1264 | |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1265 | for (uint32_t i = 0; i < submit->waitSemaphoreCount; i++) { |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1266 | VkSemaphore sem = submit->pWaitSemaphores[i]; |
| 1267 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1268 | if (my_data->semaphoreMap.find(sem) != my_data->semaphoreMap.end()) { |
| 1269 | if (my_data->semaphoreMap[sem] != MEMTRACK_SEMAPHORE_STATE_SIGNALLED) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1270 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t) sem, |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1271 | 0, MEMTRACK_NONE, "SEMAPHORE", |
| 1272 | "vkQueueSubmit: Semaphore must be in signaled state before passing to pWaitSemaphores"); |
| 1273 | } |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1274 | my_data->semaphoreMap[sem] = MEMTRACK_SEMAPHORE_STATE_WAIT; |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1275 | } |
| 1276 | } |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1277 | for (uint32_t i = 0; i < submit->signalSemaphoreCount; i++) { |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1278 | VkSemaphore sem = submit->pWaitSemaphores[i]; |
| 1279 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1280 | if (my_data->semaphoreMap.find(sem) != my_data->semaphoreMap.end()) { |
| 1281 | if (my_data->semaphoreMap[sem] != MEMTRACK_SEMAPHORE_STATE_UNSET) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1282 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t) sem, |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1283 | 0, MEMTRACK_NONE, "SEMAPHORE", |
| 1284 | "vkQueueSubmit: Semaphore must not be currently signaled or in a wait state"); |
| 1285 | } |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1286 | my_data->semaphoreMap[sem] = MEMTRACK_SEMAPHORE_STATE_SIGNALLED; |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1287 | } |
| 1288 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1289 | } |
Mark Lobodzinski | be783fe | 2015-04-07 13:38:21 -0500 | [diff] [blame] | 1290 | |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1291 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1292 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1293 | result = my_data->device_dispatch_table->QueueSubmit( |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 1294 | queue, submitCount, pSubmits, fence); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1295 | } |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1296 | |
| 1297 | loader_platform_thread_lock_mutex(&globalLock); |
| 1298 | for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 1299 | const VkSubmitInfo *submit = &pSubmits[submit_idx]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1300 | for (uint32_t i = 0; i < submit->waitSemaphoreCount; i++) { |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1301 | VkSemaphore sem = submit->pWaitSemaphores[i]; |
| 1302 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1303 | if (my_data->semaphoreMap.find(sem) != my_data->semaphoreMap.end()) { |
| 1304 | my_data->semaphoreMap[sem] = MEMTRACK_SEMAPHORE_STATE_UNSET; |
Chia-I Wu | de841af | 2015-10-29 22:01:53 +0800 | [diff] [blame] | 1305 | } |
| 1306 | } |
| 1307 | } |
| 1308 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1309 | |
Courtney Goeltzenleuchter | cfedf36 | 2015-04-02 13:39:07 -0600 | [diff] [blame] | 1310 | return result; |
| 1311 | } |
| 1312 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1313 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAllocateMemory( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1314 | VkDevice device, |
| 1315 | const VkMemoryAllocateInfo *pAllocateInfo, |
| 1316 | const VkAllocationCallbacks *pAllocator, |
| 1317 | VkDeviceMemory *pMemory) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1318 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1319 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1320 | VkResult result = my_data->device_dispatch_table->AllocateMemory(device, pAllocateInfo, pAllocator, pMemory); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1321 | // TODO : Track allocations and overall size here |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1322 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1323 | add_mem_obj_info(my_data, device, *pMemory, pAllocateInfo); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1324 | print_mem_list(my_data, device); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1325 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1326 | return result; |
| 1327 | } |
| 1328 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1329 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkFreeMemory( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1330 | VkDevice device, |
| 1331 | VkDeviceMemory mem, |
| 1332 | const VkAllocationCallbacks *pAllocator) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1333 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1334 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Michael Lentine | dcae1f9 | 2015-11-23 17:52:53 -0600 | [diff] [blame] | 1335 | |
| 1336 | // From spec : A memory object is freed by calling vkFreeMemory() when it is no longer needed. |
| 1337 | // Before freeing a memory object, an application must ensure the memory object is no longer |
| 1338 | // in use by the device—for example by command buffers queued for execution. The memory need |
| 1339 | // not yet be unbound from all images and buffers, but any further use of those images or |
| 1340 | // buffers (on host or device) for anything other than destroying those objects will result in |
| 1341 | // undefined behavior. |
| 1342 | |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1343 | loader_platform_thread_lock_mutex(&globalLock); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1344 | freeMemObjInfo(my_data, device, mem, VK_FALSE); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1345 | print_mem_list(my_data, device); |
| 1346 | printCBList(my_data, device); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1347 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1348 | my_data->device_dispatch_table->FreeMemory(device, mem, pAllocator); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1349 | } |
| 1350 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1351 | VkBool32 |
| 1352 | validateMemRange( |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1353 | layer_data *my_data, |
Michael Lentine | 4fbbaa3 | 2015-10-28 16:26:14 -0700 | [diff] [blame] | 1354 | VkDeviceMemory mem, |
| 1355 | VkDeviceSize offset, |
| 1356 | VkDeviceSize size) |
| 1357 | { |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1358 | VkBool32 skipCall = VK_FALSE; |
Michael Lentine | 4fbbaa3 | 2015-10-28 16:26:14 -0700 | [diff] [blame] | 1359 | |
Mark Lobodzinski | 6c3c680 | 2015-11-19 14:13:44 -0700 | [diff] [blame] | 1360 | if (size == 0) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1361 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)mem, 0, |
Mark Lobodzinski | 6c3c680 | 2015-11-19 14:13:44 -0700 | [diff] [blame] | 1362 | MEMTRACK_INVALID_MAP, "MEM", "VkMapMemory: Attempting to map memory range of size zero"); |
| 1363 | } |
| 1364 | |
Michael Lentine | 4fbbaa3 | 2015-10-28 16:26:14 -0700 | [diff] [blame] | 1365 | auto mem_element = my_data->memObjMap.find(mem); |
| 1366 | if (mem_element != my_data->memObjMap.end()) { |
Mark Lobodzinski | 6c3c680 | 2015-11-19 14:13:44 -0700 | [diff] [blame] | 1367 | // It is an application error to call VkMapMemory on an object that is already mapped |
| 1368 | if (mem_element->second.memRange.size != 0) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1369 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)mem, 0, |
Mark Lobodzinski | 6c3c680 | 2015-11-19 14:13:44 -0700 | [diff] [blame] | 1370 | MEMTRACK_INVALID_MAP, "MEM", "VkMapMemory: Attempting to map memory on an already-mapped object %#" PRIxLEAST64, (uint64_t)mem); |
| 1371 | } |
| 1372 | |
| 1373 | // Validate that offset + size is within object's allocationSize |
Mark Lobodzinski | 87229c4 | 2015-12-11 14:55:11 -0700 | [diff] [blame] | 1374 | if (size == VK_WHOLE_SIZE) { |
| 1375 | if (offset >= mem_element->second.allocInfo.allocationSize) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1376 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)mem, 0, |
Mark Lobodzinski | 87229c4 | 2015-12-11 14:55:11 -0700 | [diff] [blame] | 1377 | MEMTRACK_INVALID_MAP, "MEM", "Mapping Memory from %" PRIu64 " to %" PRIu64 " with total array size %" PRIu64, |
| 1378 | offset, mem_element->second.allocInfo.allocationSize, mem_element->second.allocInfo.allocationSize); |
| 1379 | } |
| 1380 | } else { |
| 1381 | if ((offset + size) > mem_element->second.allocInfo.allocationSize) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1382 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)mem, 0, |
Mark Lobodzinski | 87229c4 | 2015-12-11 14:55:11 -0700 | [diff] [blame] | 1383 | MEMTRACK_INVALID_MAP, "MEM", "Mapping Memory from %" PRIu64 " to %" PRIu64 " with total array size %" PRIu64, |
| 1384 | offset, size + offset, mem_element->second.allocInfo.allocationSize); |
| 1385 | } |
Michael Lentine | 4fbbaa3 | 2015-10-28 16:26:14 -0700 | [diff] [blame] | 1386 | } |
| 1387 | } |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1388 | return skipCall; |
| 1389 | } |
| 1390 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1391 | void |
| 1392 | storeMemRanges( |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1393 | layer_data *my_data, |
| 1394 | VkDeviceMemory mem, |
| 1395 | VkDeviceSize offset, |
| 1396 | VkDeviceSize size) |
| 1397 | { |
| 1398 | auto mem_element = my_data->memObjMap.find(mem); |
| 1399 | if (mem_element != my_data->memObjMap.end()) { |
| 1400 | MemRange new_range; |
| 1401 | new_range.offset = offset; |
| 1402 | new_range.size = size; |
| 1403 | mem_element->second.memRange = new_range; |
| 1404 | } |
| 1405 | } |
| 1406 | |
| 1407 | VkBool32 deleteMemRanges( |
| 1408 | layer_data *my_data, |
| 1409 | VkDeviceMemory mem) |
| 1410 | { |
| 1411 | VkBool32 skipCall = VK_FALSE; |
| 1412 | auto mem_element = my_data->memObjMap.find(mem); |
| 1413 | if (mem_element != my_data->memObjMap.end()) { |
| 1414 | if (!mem_element->second.memRange.size) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1415 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)mem, 0, MEMTRACK_INVALID_MAP, "MEM", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 1416 | "Unmapping Memory without memory being mapped: mem obj %#" PRIxLEAST64, (uint64_t)mem); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1417 | } |
| 1418 | mem_element->second.memRange.size = 0; |
| 1419 | if (mem_element->second.pData) { |
| 1420 | free(mem_element->second.pData); |
| 1421 | mem_element->second.pData = 0; |
| 1422 | } |
| 1423 | } |
| 1424 | return skipCall; |
| 1425 | } |
| 1426 | |
| 1427 | static char NoncoherentMemoryFillValue = 0xb; |
| 1428 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1429 | void |
| 1430 | initializeAndTrackMemory( |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1431 | layer_data *my_data, |
| 1432 | VkDeviceMemory mem, |
| 1433 | VkDeviceSize size, |
| 1434 | void **ppData) |
| 1435 | { |
| 1436 | auto mem_element = my_data->memObjMap.find(mem); |
| 1437 | if (mem_element != my_data->memObjMap.end()) { |
| 1438 | mem_element->second.pDriverData = *ppData; |
| 1439 | uint32_t index = mem_element->second.allocInfo.memoryTypeIndex; |
| 1440 | if (memProps.memoryTypes[index].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) { |
| 1441 | mem_element->second.pData = 0; |
| 1442 | } else { |
| 1443 | mem_element->second.pData = malloc(2 * size); |
| 1444 | memset(mem_element->second.pData, NoncoherentMemoryFillValue, 2 * size); |
| 1445 | *ppData = static_cast<char*>(mem_element->second.pData) + (size / 2); |
| 1446 | } |
| 1447 | } |
Michael Lentine | 4fbbaa3 | 2015-10-28 16:26:14 -0700 | [diff] [blame] | 1448 | } |
| 1449 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1450 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1451 | VkDevice device, |
| 1452 | VkDeviceMemory mem, |
| 1453 | VkDeviceSize offset, |
| 1454 | VkDeviceSize size, |
| 1455 | VkFlags flags, |
| 1456 | void **ppData) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1457 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1458 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1459 | VkBool32 skipCall = VK_FALSE; |
| 1460 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1461 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 6c3c680 | 2015-11-19 14:13:44 -0700 | [diff] [blame] | 1462 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1463 | MT_MEM_OBJ_INFO *pMemObj = get_mem_obj_info(my_data, mem); |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1464 | if (pMemObj && ((memProps.memoryTypes[pMemObj->allocInfo.memoryTypeIndex].propertyFlags & |
| 1465 | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1466 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t) mem, 0, MEMTRACK_INVALID_STATE, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1467 | "Mapping Memory without VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT set: mem obj %#" PRIxLEAST64, (uint64_t) mem); |
Mark Lobodzinski | 06f60b8 | 2015-02-25 12:16:04 -0600 | [diff] [blame] | 1468 | } |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1469 | skipCall |= validateMemRange(my_data, mem, offset, size); |
| 1470 | storeMemRanges(my_data, mem, offset, size); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1471 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1472 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1473 | result = my_data->device_dispatch_table->MapMemory(device, mem, offset, size, flags, ppData); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1474 | initializeAndTrackMemory(my_data, mem, size, ppData); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1475 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1476 | return result; |
| 1477 | } |
| 1478 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1479 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkUnmapMemory( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1480 | VkDevice device, |
| 1481 | VkDeviceMemory mem) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1482 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1483 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1484 | VkBool32 skipCall = VK_FALSE; |
| 1485 | |
| 1486 | loader_platform_thread_lock_mutex(&globalLock); |
| 1487 | skipCall |= deleteMemRanges(my_data, mem); |
| 1488 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1489 | if (VK_FALSE == skipCall) { |
| 1490 | my_data->device_dispatch_table->UnmapMemory(device, mem); |
| 1491 | } |
| 1492 | } |
| 1493 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1494 | VkBool32 |
| 1495 | validateMemoryIsMapped( |
| 1496 | layer_data *my_data, |
| 1497 | uint32_t memRangeCount, |
| 1498 | const VkMappedMemoryRange *pMemRanges) |
| 1499 | { |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1500 | VkBool32 skipCall = VK_FALSE; |
| 1501 | for (uint32_t i = 0; i < memRangeCount; ++i) { |
| 1502 | auto mem_element = my_data->memObjMap.find(pMemRanges[i].memory); |
| 1503 | if (mem_element != my_data->memObjMap.end()) { |
| 1504 | if (mem_element->second.memRange.offset > pMemRanges[i].offset || |
| 1505 | (mem_element->second.memRange.offset + mem_element->second.memRange.size) < (pMemRanges[i].offset + pMemRanges[i].size)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1506 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)pMemRanges[i].memory, |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1507 | 0, MEMTRACK_INVALID_MAP, "MEM", "Memory must be mapped before it can be flushed or invalidated."); |
| 1508 | } |
| 1509 | } |
| 1510 | } |
| 1511 | return skipCall; |
| 1512 | } |
| 1513 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1514 | VkBool32 |
| 1515 | validateAndCopyNoncoherentMemoryToDriver( |
| 1516 | layer_data *my_data, |
| 1517 | uint32_t memRangeCount, |
| 1518 | const VkMappedMemoryRange *pMemRanges) |
| 1519 | { |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1520 | VkBool32 skipCall = VK_FALSE; |
| 1521 | for (uint32_t i = 0; i < memRangeCount; ++i) { |
| 1522 | auto mem_element = my_data->memObjMap.find(pMemRanges[i].memory); |
| 1523 | if (mem_element != my_data->memObjMap.end()) { |
| 1524 | if (mem_element->second.pData) { |
| 1525 | VkDeviceSize size = mem_element->second.memRange.size; |
| 1526 | VkDeviceSize half_size = (size / 2); |
| 1527 | char* data = static_cast<char*>(mem_element->second.pData); |
| 1528 | for (auto j = 0; j < half_size; ++j) { |
| 1529 | if (data[j] != NoncoherentMemoryFillValue) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1530 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)pMemRanges[i].memory, |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 1531 | 0, MEMTRACK_INVALID_MAP, "MEM", "Memory overflow was detected on mem obj %" PRIxLEAST64, (uint64_t)pMemRanges[i].memory); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1532 | } |
| 1533 | } |
| 1534 | for (auto j = size + half_size; j < 2 * size; ++j) { |
| 1535 | if (data[j] != NoncoherentMemoryFillValue) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1536 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, (uint64_t)pMemRanges[i].memory, |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 1537 | 0, MEMTRACK_INVALID_MAP, "MEM", "Memory overflow was detected on mem obj %" PRIxLEAST64, (uint64_t)pMemRanges[i].memory); |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1538 | } |
| 1539 | } |
| 1540 | memcpy(mem_element->second.pDriverData, static_cast<void*>(data + half_size), size); |
| 1541 | } |
| 1542 | } |
| 1543 | } |
| 1544 | return skipCall; |
| 1545 | } |
| 1546 | |
| 1547 | VK_LAYER_EXPORT VkResult vkFlushMappedMemoryRanges( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1548 | VkDevice device, |
| 1549 | uint32_t memRangeCount, |
| 1550 | const VkMappedMemoryRange *pMemRanges) |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1551 | { |
| 1552 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 1553 | VkBool32 skipCall = VK_FALSE; |
| 1554 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1555 | |
| 1556 | skipCall |= validateAndCopyNoncoherentMemoryToDriver(my_data, memRangeCount, pMemRanges); |
| 1557 | skipCall |= validateMemoryIsMapped(my_data, memRangeCount, pMemRanges); |
| 1558 | if (VK_FALSE == skipCall ) { |
| 1559 | result = my_data->device_dispatch_table->FlushMappedMemoryRanges(device, memRangeCount, pMemRanges); |
| 1560 | } |
| 1561 | return result; |
| 1562 | } |
| 1563 | |
| 1564 | VK_LAYER_EXPORT VkResult vkInvalidateMappedMemoryRanges( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1565 | VkDevice device, |
| 1566 | uint32_t memRangeCount, |
| 1567 | const VkMappedMemoryRange *pMemRanges) |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1568 | { |
| 1569 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 1570 | VkBool32 skipCall = VK_FALSE; |
| 1571 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1572 | |
| 1573 | skipCall |= validateMemoryIsMapped(my_data, memRangeCount, pMemRanges); |
| 1574 | if (VK_FALSE == skipCall) { |
| 1575 | result = my_data->device_dispatch_table->InvalidateMappedMemoryRanges(device, memRangeCount, pMemRanges); |
| 1576 | } |
| 1577 | return result; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1578 | } |
| 1579 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1580 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyFence( |
| 1581 | VkDevice device, |
| 1582 | VkFence fence, |
| 1583 | const VkAllocationCallbacks *pAllocator) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1584 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1585 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1586 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1587 | delete_fence_info(my_data, fence); |
| 1588 | auto item = my_data->fenceMap.find(fence); |
| 1589 | if (item != my_data->fenceMap.end()) { |
| 1590 | my_data->fenceMap.erase(item); |
Tobin Ehlis | e6884ef | 2014-11-27 07:52:04 -0700 | [diff] [blame] | 1591 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1592 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1593 | my_data->device_dispatch_table->DestroyFence(device, fence, pAllocator); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1594 | } |
| 1595 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1596 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyBuffer( |
| 1597 | VkDevice device, |
| 1598 | VkBuffer buffer, |
| 1599 | const VkAllocationCallbacks *pAllocator) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1600 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1601 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1602 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1603 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1604 | auto item = my_data->bufferMap.find((uint64_t)buffer); |
| 1605 | if (item != my_data->bufferMap.end()) { |
| 1606 | skipCall = clear_object_binding(my_data, device, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER); |
| 1607 | my_data->bufferMap.erase(item); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1608 | } |
| 1609 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1610 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1611 | my_data->device_dispatch_table->DestroyBuffer(device, buffer, pAllocator); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1612 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1613 | } |
| 1614 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1615 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyImage( |
| 1616 | VkDevice device, |
| 1617 | VkImage image, |
| 1618 | const VkAllocationCallbacks *pAllocator) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1619 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1620 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1621 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1622 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1623 | auto item = my_data->imageMap.find((uint64_t)image); |
| 1624 | if (item != my_data->imageMap.end()) { |
| 1625 | skipCall = clear_object_binding(my_data, device, (uint64_t)image, VK_OBJECT_TYPE_IMAGE); |
| 1626 | my_data->imageMap.erase(item); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1627 | } |
| 1628 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1629 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1630 | my_data->device_dispatch_table->DestroyImage(device, image, pAllocator); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1631 | } |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1632 | } |
| 1633 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1634 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBindBufferMemory( |
| 1635 | VkDevice device, |
| 1636 | VkBuffer buffer, |
| 1637 | VkDeviceMemory mem, |
| 1638 | VkDeviceSize memoryOffset) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1639 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1640 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1641 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
Mike Stroyan | 230e625 | 2015-04-17 12:36:38 -0600 | [diff] [blame] | 1642 | loader_platform_thread_lock_mutex(&globalLock); |
| 1643 | // Track objects tied to memory |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1644 | VkBool32 skipCall = set_mem_binding(my_data, device, mem, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, "vkBindBufferMemory"); |
| 1645 | add_object_binding_info(my_data, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, mem); |
| 1646 | print_mem_list(my_data, device); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1647 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1648 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1649 | result = my_data->device_dispatch_table->BindBufferMemory(device, buffer, mem, memoryOffset); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1650 | } |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1651 | return result; |
| 1652 | } |
| 1653 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1654 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory( |
| 1655 | VkDevice device, |
| 1656 | VkImage image, |
| 1657 | VkDeviceMemory mem, |
| 1658 | VkDeviceSize memoryOffset) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1659 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1660 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1661 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1662 | loader_platform_thread_lock_mutex(&globalLock); |
| 1663 | // Track objects tied to memory |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1664 | VkBool32 skipCall = set_mem_binding(my_data, device, mem, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, "vkBindImageMemory"); |
| 1665 | add_object_binding_info(my_data, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, mem); |
| 1666 | print_mem_list(my_data, device); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1667 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1668 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1669 | result = my_data->device_dispatch_table->BindImageMemory(device, image, mem, memoryOffset); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1670 | } |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1671 | return result; |
| 1672 | } |
| 1673 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1674 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetBufferMemoryRequirements( |
| 1675 | VkDevice device, |
| 1676 | VkBuffer buffer, |
| 1677 | VkMemoryRequirements *pMemoryRequirements) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1678 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1679 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1680 | // TODO : What to track here? |
| 1681 | // Could potentially save returned mem requirements and validate values passed into BindBufferMemory |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1682 | my_data->device_dispatch_table->GetBufferMemoryRequirements(device, buffer, pMemoryRequirements); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1683 | } |
| 1684 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1685 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkGetImageMemoryRequirements( |
| 1686 | VkDevice device, |
| 1687 | VkImage image, |
| 1688 | VkMemoryRequirements *pMemoryRequirements) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1689 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1690 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1691 | // TODO : What to track here? |
| 1692 | // Could potentially save returned mem requirements and validate values passed into BindImageMemory |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1693 | my_data->device_dispatch_table->GetImageMemoryRequirements(device, image, pMemoryRequirements); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1694 | } |
| 1695 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1696 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueueBindSparse( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1697 | VkQueue queue, |
| 1698 | uint32_t bindInfoCount, |
| 1699 | const VkBindSparseInfo *pBindInfo, |
| 1700 | VkFence fence) |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1701 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1702 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1703 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 1704 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1705 | |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1706 | loader_platform_thread_lock_mutex(&globalLock); |
Mike Stroyan | 230e625 | 2015-04-17 12:36:38 -0600 | [diff] [blame] | 1707 | |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 1708 | for (uint32_t i = 0; i < bindInfoCount; i++) { |
| 1709 | // Track objects tied to memory |
| 1710 | for (uint32_t j = 0; j < pBindInfo[i].bufferBindCount; j++) { |
| 1711 | for (uint32_t k = 0; k < pBindInfo[i].pBufferBinds[j].bindCount; k++) { |
| 1712 | if (set_sparse_mem_binding(my_data, queue, |
Chia-I Wu | c04519c | 2015-10-27 17:53:18 +0800 | [diff] [blame] | 1713 | pBindInfo[i].pBufferBinds[j].pBinds[k].memory, |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 1714 | (uint64_t) pBindInfo[i].pBufferBinds[j].buffer, |
| 1715 | VK_OBJECT_TYPE_BUFFER, "vkQueueBindSparse")) |
| 1716 | skipCall = VK_TRUE; |
| 1717 | } |
| 1718 | } |
| 1719 | for (uint32_t j = 0; j < pBindInfo[i].imageOpaqueBindCount; j++) { |
| 1720 | for (uint32_t k = 0; k < pBindInfo[i].pImageOpaqueBinds[j].bindCount; k++) { |
| 1721 | if (set_sparse_mem_binding(my_data, queue, |
Chia-I Wu | c04519c | 2015-10-27 17:53:18 +0800 | [diff] [blame] | 1722 | pBindInfo[i].pImageOpaqueBinds[j].pBinds[k].memory, |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 1723 | (uint64_t) pBindInfo[i].pImageOpaqueBinds[j].image, |
| 1724 | VK_OBJECT_TYPE_IMAGE, "vkQueueBindSparse")) |
| 1725 | skipCall = VK_TRUE; |
| 1726 | } |
| 1727 | } |
| 1728 | for (uint32_t j = 0; j < pBindInfo[i].imageBindCount; j++) { |
| 1729 | for (uint32_t k = 0; k < pBindInfo[i].pImageBinds[j].bindCount; k++) { |
| 1730 | if (set_sparse_mem_binding(my_data, queue, |
Chia-I Wu | c04519c | 2015-10-27 17:53:18 +0800 | [diff] [blame] | 1731 | pBindInfo[i].pImageBinds[j].pBinds[k].memory, |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 1732 | (uint64_t) pBindInfo[i].pImageBinds[j].image, |
| 1733 | VK_OBJECT_TYPE_IMAGE, "vkQueueBindSparse")) |
| 1734 | skipCall = VK_TRUE; |
| 1735 | } |
| 1736 | } |
| 1737 | } |
| 1738 | |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1739 | print_mem_list(my_data, queue); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1740 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1741 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 1742 | result = my_data->device_dispatch_table->QueueBindSparse(queue, bindInfoCount, pBindInfo, fence); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1743 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1744 | return result; |
| 1745 | } |
| 1746 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1747 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateFence( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1748 | VkDevice device, |
| 1749 | const VkFenceCreateInfo *pCreateInfo, |
| 1750 | const VkAllocationCallbacks *pAllocator, |
| 1751 | VkFence *pFence) |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1752 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1753 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1754 | VkResult result = my_data->device_dispatch_table->CreateFence(device, pCreateInfo, pAllocator, pFence); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1755 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1756 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1757 | MT_FENCE_INFO* pFI = &my_data->fenceMap[*pFence]; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 1758 | memset(pFI, 0, sizeof(MT_FENCE_INFO)); |
| 1759 | memcpy(&(pFI->createInfo), pCreateInfo, sizeof(VkFenceCreateInfo)); |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1760 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1761 | } |
| 1762 | return result; |
| 1763 | } |
| 1764 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1765 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkResetFences( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1766 | VkDevice device, |
| 1767 | uint32_t fenceCount, |
| 1768 | const VkFence *pFences) |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1769 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1770 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1771 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 1772 | VkBool32 skipCall = VK_FALSE; |
| 1773 | |
| 1774 | loader_platform_thread_lock_mutex(&globalLock); |
| 1775 | // Reset fence state in fenceCreateInfo structure |
| 1776 | for (uint32_t i = 0; i < fenceCount; i++) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1777 | auto fence_item = my_data->fenceMap.find(pFences[i]); |
| 1778 | if (fence_item != my_data->fenceMap.end()) { |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1779 | // Validate fences in SIGNALED state |
| 1780 | if (!(fence_item->second.createInfo.flags & VK_FENCE_CREATE_SIGNALED_BIT)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1781 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_FENCE, (uint64_t) pFences[i], 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1782 | "Fence %#" PRIxLEAST64 " submitted to VkResetFences in UNSIGNALED STATE", (uint64_t) pFences[i]); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1783 | } |
| 1784 | else { |
| 1785 | fence_item->second.createInfo.flags = |
| 1786 | static_cast<VkFenceCreateFlags>(fence_item->second.createInfo.flags & ~VK_FENCE_CREATE_SIGNALED_BIT); |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1787 | } |
| 1788 | } |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 1789 | } |
| 1790 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1791 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1792 | result = my_data->device_dispatch_table->ResetFences(device, fenceCount, pFences); |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1793 | } |
| 1794 | return result; |
| 1795 | } |
| 1796 | |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1797 | static inline VkBool32 |
| 1798 | verifyFenceStatus( |
| 1799 | VkDevice device, |
| 1800 | VkFence fence, |
| 1801 | const char *apiCall) |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1802 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1803 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1804 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1805 | auto pFenceInfo = my_data->fenceMap.find(fence); |
| 1806 | if (pFenceInfo != my_data->fenceMap.end()) { |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1807 | if (pFenceInfo->second.createInfo.flags & VK_FENCE_CREATE_SIGNALED_BIT) { |
Mark Lobodzinski | 7c0617e | 2015-11-12 10:11:21 -0700 | [diff] [blame] | 1808 | // TODO: Possibly move this to a lower-level warning if we ever add, say, a VERBOSE warning option. There are too many |
| 1809 | // cases where ISVs want to be able to do this to make it a normal warning or perf-warning. |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1810 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_FENCE, (uint64_t) fence, 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1811 | "%s specified fence %#" PRIxLEAST64 " already in SIGNALED state.", apiCall, (uint64_t) fence); |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1812 | } |
| 1813 | if (!pFenceInfo->second.queue) { // Checking status of unsubmitted fence |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 1814 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_FENCE, (uint64_t) fence, 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1815 | "%s called for fence %#" PRIxLEAST64 " which has not been submitted on a Queue.", apiCall, (uint64_t) fence); |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1816 | } |
| 1817 | } |
| 1818 | return skipCall; |
| 1819 | } |
| 1820 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1821 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetFenceStatus( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1822 | VkDevice device, |
| 1823 | VkFence fence) |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1824 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1825 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1826 | VkBool32 skipCall = verifyFenceStatus(device, fence, "vkGetFenceStatus"); |
| 1827 | if (skipCall) |
| 1828 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1829 | VkResult result = my_data->device_dispatch_table->GetFenceStatus(device, fence); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1830 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1831 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1832 | update_fence_tracking(my_data, fence); |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1833 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1834 | } |
| 1835 | return result; |
| 1836 | } |
| 1837 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1838 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkWaitForFences( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1839 | VkDevice device, |
| 1840 | uint32_t fenceCount, |
| 1841 | const VkFence *pFences, |
Courtney Goeltzenleuchter | 1f41f54 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 1842 | VkBool32 waitAll, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1843 | uint64_t timeout) |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1844 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1845 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1846 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1847 | // Verify fence status of submitted fences |
| 1848 | for(uint32_t i = 0; i < fenceCount; i++) { |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1849 | skipCall |= verifyFenceStatus(device, pFences[i], "vkWaitForFences"); |
Mark Lobodzinski | ebe814d | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1850 | } |
Tobin Ehlis | 21d6a74 | 2015-09-14 13:25:57 -0600 | [diff] [blame] | 1851 | if (skipCall) |
| 1852 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1853 | VkResult result = my_data->device_dispatch_table->WaitForFences(device, fenceCount, pFences, waitAll, timeout); |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1854 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 8ee9634 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 1855 | |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1856 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 8ee9634 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 1857 | if (waitAll || fenceCount == 1) { // Clear all the fences |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1858 | for(uint32_t i = 0; i < fenceCount; i++) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1859 | update_fence_tracking(my_data, pFences[i]); |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1860 | } |
| 1861 | } |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1862 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1863 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1864 | return result; |
| 1865 | } |
| 1866 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1867 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueueWaitIdle( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1868 | VkQueue queue) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1869 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1870 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); |
| 1871 | VkResult result = my_data->device_dispatch_table->QueueWaitIdle(queue); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1872 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1873 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1874 | retire_queue_fences(my_data, queue); |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1875 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1876 | } |
| 1877 | return result; |
| 1878 | } |
| 1879 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1880 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDeviceWaitIdle( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1881 | VkDevice device) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1882 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1883 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1884 | VkResult result = my_data->device_dispatch_table->DeviceWaitIdle(device); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1885 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1886 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1887 | retire_device_fences(my_data, device); |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1888 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1889 | } |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1890 | return result; |
| 1891 | } |
| 1892 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1893 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateBuffer( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1894 | VkDevice device, |
| 1895 | const VkBufferCreateInfo *pCreateInfo, |
| 1896 | const VkAllocationCallbacks *pAllocator, |
| 1897 | VkBuffer *pBuffer) |
Tobin Ehlis | 84c521c | 2015-01-19 08:42:29 -0700 | [diff] [blame] | 1898 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1899 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1900 | VkResult result = my_data->device_dispatch_table->CreateBuffer(device, pCreateInfo, pAllocator, pBuffer); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1901 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1902 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1903 | add_object_create_info(my_data, (uint64_t)*pBuffer, VK_OBJECT_TYPE_BUFFER, pCreateInfo); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1904 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 1542710 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 1905 | } |
Tobin Ehlis | 84c521c | 2015-01-19 08:42:29 -0700 | [diff] [blame] | 1906 | return result; |
| 1907 | } |
| 1908 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1909 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1910 | VkDevice device, |
| 1911 | const VkImageCreateInfo *pCreateInfo, |
| 1912 | const VkAllocationCallbacks *pAllocator, |
| 1913 | VkImage *pImage) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1914 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1915 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1916 | VkResult result = my_data->device_dispatch_table->CreateImage(device, pCreateInfo, pAllocator, pImage); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1917 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1918 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1919 | add_object_create_info(my_data, (uint64_t)*pImage, VK_OBJECT_TYPE_IMAGE, pCreateInfo); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1920 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6aa7742 | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1921 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1922 | return result; |
| 1923 | } |
| 1924 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1925 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateImageView( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1926 | VkDevice device, |
| 1927 | const VkImageViewCreateInfo *pCreateInfo, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1928 | const VkAllocationCallbacks *pAllocator, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1929 | VkImageView *pView) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1930 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1931 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1932 | VkResult result = my_data->device_dispatch_table->CreateImageView(device, pCreateInfo, pAllocator, pView); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1933 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1934 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 1935 | // Validate that img has correct usage flags set |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1936 | validate_image_usage_flags(my_data, device, pCreateInfo->image, |
Courtney Goeltzenleuchter | c3b8eea | 2015-09-10 14:14:11 -0600 | [diff] [blame] | 1937 | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1938 | VK_FALSE, "vkCreateImageView()", "VK_IMAGE_USAGE_[SAMPLED|STORAGE|COLOR_ATTACHMENT]_BIT"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1939 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6aa7742 | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1940 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1941 | return result; |
| 1942 | } |
| 1943 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1944 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateBufferView( |
Mark Lobodzinski | ab5c3d5 | 2015-10-27 09:53:00 -0600 | [diff] [blame] | 1945 | VkDevice device, |
| 1946 | const VkBufferViewCreateInfo *pCreateInfo, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 1947 | const VkAllocationCallbacks *pAllocator, |
Mark Lobodzinski | ab5c3d5 | 2015-10-27 09:53:00 -0600 | [diff] [blame] | 1948 | VkBufferView *pView) |
| 1949 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1950 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 1951 | VkResult result = my_data->device_dispatch_table->CreateBufferView(device, pCreateInfo, pAllocator, pView); |
Mark Lobodzinski | ab5c3d5 | 2015-10-27 09:53:00 -0600 | [diff] [blame] | 1952 | if (result == VK_SUCCESS) { |
| 1953 | loader_platform_thread_lock_mutex(&globalLock); |
| 1954 | // In order to create a valid buffer view, the buffer must have been created with at least one of the |
| 1955 | // following flags: UNIFORM_TEXEL_BUFFER_BIT or STORAGE_TEXEL_BUFFER_BIT |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 1956 | validate_buffer_usage_flags(my_data, device, pCreateInfo->buffer, |
Mark Lobodzinski | ab5c3d5 | 2015-10-27 09:53:00 -0600 | [diff] [blame] | 1957 | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT, |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 1958 | VK_FALSE, "vkCreateBufferView()", "VK_BUFFER_USAGE_[STORAGE|UNIFORM]_TEXEL_BUFFER_BIT"); |
Mark Lobodzinski | ab5c3d5 | 2015-10-27 09:53:00 -0600 | [diff] [blame] | 1959 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1960 | } |
| 1961 | return result; |
| 1962 | } |
| 1963 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1964 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAllocateCommandBuffers( |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 1965 | VkDevice device, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1966 | const VkCommandBufferAllocateInfo *pCreateInfo, |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 1967 | VkCommandBuffer *pCommandBuffer) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1968 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 1969 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 1970 | VkResult result = my_data->device_dispatch_table->AllocateCommandBuffers(device, pCreateInfo, pCommandBuffer); |
| 1971 | |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1972 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 1973 | if (VK_SUCCESS == result) { |
| 1974 | for (uint32_t i = 0; i < pCreateInfo->bufferCount; i++) { |
| 1975 | add_cmd_buf_info(my_data, pCreateInfo->commandPool, pCommandBuffer[i]); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 1976 | } |
| 1977 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1978 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 1979 | printCBList(my_data, device); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1980 | return result; |
| 1981 | } |
| 1982 | |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 1983 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkFreeCommandBuffers( |
| 1984 | VkDevice device, |
| 1985 | VkCommandPool commandPool, |
| 1986 | uint32_t commandBufferCount, |
| 1987 | const VkCommandBuffer *pCommandBuffers) |
| 1988 | { |
| 1989 | VkBool32 skipCall = VK_FALSE; |
| 1990 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1991 | |
| 1992 | loader_platform_thread_lock_mutex(&globalLock); |
| 1993 | for (uint32_t i = 0; i < commandBufferCount; i++) { |
| 1994 | skipCall |= delete_cmd_buf_info(my_data, commandPool, pCommandBuffers[i]); |
| 1995 | } |
| 1996 | printCBList(my_data, device); |
| 1997 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1998 | |
| 1999 | if (VK_FALSE == skipCall) { |
| 2000 | my_data->device_dispatch_table->FreeCommandBuffers(device, commandPool, commandBufferCount, pCommandBuffers); |
| 2001 | } |
| 2002 | } |
| 2003 | |
| 2004 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateCommandPool( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2005 | VkDevice device, |
| 2006 | const VkCommandPoolCreateInfo *pCreateInfo, |
| 2007 | const VkAllocationCallbacks *pAllocator, |
| 2008 | VkCommandPool *pCommandPool) |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2009 | { |
| 2010 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | f2aff49 | 2015-11-19 08:31:31 -0700 | [diff] [blame] | 2011 | VkResult result = my_data->device_dispatch_table->CreateCommandPool(device, pCreateInfo, pAllocator, pCommandPool); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2012 | |
| 2013 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | f2aff49 | 2015-11-19 08:31:31 -0700 | [diff] [blame] | 2014 | |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2015 | // Add cmd pool to map |
| 2016 | my_data->commandPoolMap[*pCommandPool].createFlags = pCreateInfo->flags; |
| 2017 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | f2aff49 | 2015-11-19 08:31:31 -0700 | [diff] [blame] | 2018 | |
| 2019 | return result; |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2020 | } |
| 2021 | |
| 2022 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyCommandPool( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2023 | VkDevice device, |
| 2024 | VkCommandPool commandPool, |
| 2025 | const VkAllocationCallbacks *pAllocator) |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2026 | { |
| 2027 | VkBool32 commandBufferComplete = VK_FALSE; |
| 2028 | VkBool32 skipCall = VK_FALSE; |
| 2029 | // Verify that command buffers in pool are complete (not in-flight) |
| 2030 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2031 | for (auto it = my_data->commandPoolMap[commandPool].pCommandBuffers.begin(); |
| 2032 | it != my_data->commandPoolMap[commandPool].pCommandBuffers.end(); it++) { |
| 2033 | commandBufferComplete = VK_FALSE; |
| 2034 | skipCall = checkCBCompleted(my_data, *it, &commandBufferComplete); |
| 2035 | if (VK_FALSE == commandBufferComplete) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2036 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)(*it), 0, |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2037 | MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", "Destroying Command Pool 0x%" PRIxLEAST64 " before " |
| 2038 | "its command buffer (0x%" PRIxLEAST64 ") has completed.", reinterpret_cast<uint64_t>(commandPool), |
| 2039 | reinterpret_cast<uint64_t>(*it)); |
| 2040 | } |
| 2041 | } |
| 2042 | |
| 2043 | if (VK_FALSE == skipCall) { |
| 2044 | my_data->device_dispatch_table->DestroyCommandPool(device, commandPool, pAllocator); |
| 2045 | } |
| 2046 | |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2047 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2048 | auto item = my_data->commandPoolMap[commandPool].pCommandBuffers.begin(); |
| 2049 | // Remove command buffers from command buffer map |
| 2050 | while (item != my_data->commandPoolMap[commandPool].pCommandBuffers.end()) { |
| 2051 | auto del_item = item++; |
| 2052 | delete_cmd_buf_info(my_data, commandPool, *del_item); |
| 2053 | } |
| 2054 | my_data->commandPoolMap.erase(commandPool); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2055 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2056 | } |
| 2057 | |
| 2058 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandPool( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2059 | VkDevice device, |
| 2060 | VkCommandPool commandPool, |
| 2061 | VkCommandPoolResetFlags flags) |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2062 | { |
| 2063 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2064 | VkBool32 commandBufferComplete = VK_FALSE; |
| 2065 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | f2aff49 | 2015-11-19 08:31:31 -0700 | [diff] [blame] | 2066 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2067 | |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2068 | auto it = my_data->commandPoolMap[commandPool].pCommandBuffers.begin(); |
| 2069 | // Verify that CB's in pool are complete (not in-flight) |
| 2070 | while (it != my_data->commandPoolMap[commandPool].pCommandBuffers.end()) { |
| 2071 | skipCall = checkCBCompleted(my_data, (*it), &commandBufferComplete); |
| 2072 | if (VK_FALSE == commandBufferComplete) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2073 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)(*it), 0, |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2074 | MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", "Resetting CB %p before it has completed. You must check CB " |
| 2075 | "flag before calling vkResetCommandBuffer().", (*it)); |
| 2076 | } else { |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2077 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2078 | // Clear memory references at this point. |
| 2079 | skipCall |= clear_cmd_buf_and_mem_references(my_data, (*it)); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2080 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2081 | } |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2082 | ++it; |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2083 | } |
Mark Lobodzinski | f2aff49 | 2015-11-19 08:31:31 -0700 | [diff] [blame] | 2084 | |
| 2085 | if (VK_FALSE == skipCall) { |
| 2086 | result = my_data->device_dispatch_table->ResetCommandPool(device, commandPool, flags); |
| 2087 | } |
| 2088 | |
| 2089 | return result; |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2090 | } |
| 2091 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2092 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2093 | VkCommandBuffer commandBuffer, |
| 2094 | const VkCommandBufferBeginInfo *pBeginInfo) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2095 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2096 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2097 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 2098 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2099 | VkBool32 commandBufferComplete = VK_FALSE; |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 2100 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2101 | |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 2102 | // This implicitly resets the Cmd Buffer so make sure any fence is done and then clear memory references |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2103 | skipCall = checkCBCompleted(my_data, commandBuffer, &commandBufferComplete); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2104 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2105 | if (VK_FALSE == commandBufferComplete) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2106 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 2107 | MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", "Calling vkBeginCommandBuffer() on active CB %p before it has completed. " |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2108 | "You must check CB flag before this call.", commandBuffer); |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 2109 | } |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 2110 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2111 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2112 | result = my_data->device_dispatch_table->BeginCommandBuffer(commandBuffer, pBeginInfo); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2113 | } |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2114 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2115 | clear_cmd_buf_and_mem_references(my_data, commandBuffer); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2116 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2117 | return result; |
| 2118 | } |
| 2119 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2120 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEndCommandBuffer( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2121 | VkCommandBuffer commandBuffer) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2122 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2123 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2124 | // TODO : Anything to do here? |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2125 | VkResult result = my_data->device_dispatch_table->EndCommandBuffer(commandBuffer); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2126 | return result; |
| 2127 | } |
| 2128 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2129 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandBuffer( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2130 | VkCommandBuffer commandBuffer, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2131 | VkCommandBufferResetFlags flags) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2132 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2133 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2134 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 2135 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2136 | VkBool32 commandBufferComplete = VK_FALSE; |
Mike Stroyan | 5343033 | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 2137 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2138 | |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 2139 | // Verify that CB is complete (not in-flight) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2140 | skipCall = checkCBCompleted(my_data, commandBuffer, &commandBufferComplete); |
| 2141 | if (VK_FALSE == commandBufferComplete) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2142 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, |
Mark Lobodzinski | 9d30cb1 | 2015-09-15 16:10:17 -0600 | [diff] [blame] | 2143 | MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", "Resetting CB %p before it has completed. You must check CB " |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2144 | "flag before calling vkResetCommandBuffer().", commandBuffer); |
Tobin Ehlis | 77b3abb | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 2145 | } |
| 2146 | // Clear memory references as this point. |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2147 | skipCall |= clear_cmd_buf_and_mem_references(my_data, commandBuffer); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2148 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2149 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2150 | result = my_data->device_dispatch_table->ResetCommandBuffer(commandBuffer, flags); |
Courtney Goeltzenleuchter | 0d6857f | 2015-09-04 13:52:24 -0600 | [diff] [blame] | 2151 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2152 | return result; |
| 2153 | } |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2154 | |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2155 | // TODO : For any vkCmdBind* calls that include an object which has mem bound to it, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2156 | // need to account for that mem now having binding to given commandBuffer |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2157 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindPipeline( |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2158 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2159 | VkPipelineBindPoint pipelineBindPoint, |
| 2160 | VkPipeline pipeline) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2161 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2162 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 2163 | #if 0 |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2164 | // TODO : If memory bound to pipeline, then need to tie that mem to commandBuffer |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 2165 | if (getPipeline(pipeline)) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2166 | MT_CB_INFO *pCBInfo = get_cmd_buf_info(my_data, commandBuffer); |
Mark Lobodzinski | 7a428ce | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 2167 | if (pCBInfo) { |
| 2168 | pCBInfo->pipelines[pipelineBindPoint] = pipeline; |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 2169 | } |
| 2170 | } |
| 2171 | else { |
Courtney Goeltzenleuchter | 3e19bf6 | 2015-06-14 09:50:18 -0600 | [diff] [blame] | 2172 | "Attempt to bind Pipeline %p that doesn't exist!", (void*)pipeline); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2173 | layerCbMsg(VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline, 0, MEMTRACK_INVALID_OBJECT, (char *) "DS", (char *) str); |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 2174 | } |
| 2175 | #endif |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2176 | my_data->device_dispatch_table->CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2177 | } |
| 2178 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2179 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets( |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2180 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2181 | VkPipelineBindPoint pipelineBindPoint, |
Mark Lobodzinski | a65c463 | 2015-06-15 13:21:21 -0600 | [diff] [blame] | 2182 | VkPipelineLayout layout, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2183 | uint32_t firstSet, |
| 2184 | uint32_t setCount, |
| 2185 | const VkDescriptorSet *pDescriptorSets, |
| 2186 | uint32_t dynamicOffsetCount, |
| 2187 | const uint32_t *pDynamicOffsets) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2188 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2189 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Tobin Ehlis | 2836a7d | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 2190 | // TODO : Somewhere need to verify that all textures referenced by shaders in DS are in some type of *SHADER_READ* state |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2191 | my_data->device_dispatch_table->CmdBindDescriptorSets( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2192 | commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2193 | } |
| 2194 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2195 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindVertexBuffers( |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2196 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2197 | uint32_t startBinding, |
| 2198 | uint32_t bindingCount, |
| 2199 | const VkBuffer *pBuffers, |
| 2200 | const VkDeviceSize *pOffsets) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2201 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2202 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2203 | // TODO : Somewhere need to verify that VBs have correct usage state flagged |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2204 | my_data->device_dispatch_table->CmdBindVertexBuffers(commandBuffer, startBinding, bindingCount, pBuffers, pOffsets); |
Chia-I Wu | fb5062e | 2015-01-05 13:42:56 +0800 | [diff] [blame] | 2205 | } |
| 2206 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2207 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindIndexBuffer( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2208 | VkCommandBuffer commandBuffer, |
| 2209 | VkBuffer buffer, |
| 2210 | VkDeviceSize offset, |
| 2211 | VkIndexType indexType) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2212 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2213 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2214 | // TODO : Somewhere need to verify that IBs have correct usage state flagged |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2215 | my_data->device_dispatch_table->CmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2216 | } |
| 2217 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2218 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirect( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2219 | VkCommandBuffer commandBuffer, |
| 2220 | VkBuffer buffer, |
| 2221 | VkDeviceSize offset, |
| 2222 | uint32_t count, |
| 2223 | uint32_t stride) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2224 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2225 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2226 | VkDeviceMemory mem; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2227 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2228 | VkBool32 skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2229 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdDrawIndirect"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2230 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2231 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2232 | my_data->device_dispatch_table->CmdDrawIndirect(commandBuffer, buffer, offset, count, stride); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2233 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2234 | } |
| 2235 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2236 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirect( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2237 | VkCommandBuffer commandBuffer, |
| 2238 | VkBuffer buffer, |
| 2239 | VkDeviceSize offset, |
| 2240 | uint32_t count, |
| 2241 | uint32_t stride) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2242 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2243 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2244 | VkDeviceMemory mem; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2245 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2246 | VkBool32 skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2247 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdDrawIndexedIndirect"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2248 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2249 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2250 | my_data->device_dispatch_table->CmdDrawIndexedIndirect(commandBuffer, buffer, offset, count, stride); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2251 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2252 | } |
| 2253 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2254 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDispatchIndirect( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2255 | VkCommandBuffer commandBuffer, |
| 2256 | VkBuffer buffer, |
| 2257 | VkDeviceSize offset) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2258 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2259 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2260 | VkDeviceMemory mem; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2261 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2262 | VkBool32 skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)buffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2263 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdDispatchIndirect"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2264 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2265 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2266 | my_data->device_dispatch_table->CmdDispatchIndirect(commandBuffer, buffer, offset); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2267 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2268 | } |
| 2269 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2270 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2271 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2272 | VkBuffer srcBuffer, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2273 | VkBuffer dstBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2274 | uint32_t regionCount, |
| 2275 | const VkBufferCopy *pRegions) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2276 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2277 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2278 | VkDeviceMemory mem; |
| 2279 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2280 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2281 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2282 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBuffer"); |
| 2283 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2284 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBuffer"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2285 | // Validate that SRC & DST buffers have correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2286 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, srcBuffer, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyBuffer()", "VK_BUFFER_USAGE_TRANSFER_SRC_BIT"); |
| 2287 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2288 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2289 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2290 | my_data->device_dispatch_table->CmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2291 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2292 | } |
| 2293 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2294 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2295 | VkCommandBuffer commandBuffer, |
| 2296 | VkQueryPool queryPool, |
| 2297 | uint32_t startQuery, |
| 2298 | uint32_t queryCount, |
| 2299 | VkBuffer dstBuffer, |
| 2300 | VkDeviceSize dstOffset, |
| 2301 | VkDeviceSize destStride, |
| 2302 | VkQueryResultFlags flags) |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2303 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2304 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2305 | VkDeviceMemory mem; |
| 2306 | VkBool32 skipCall = VK_FALSE; |
| 2307 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2308 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2309 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyQueryPoolResults"); |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2310 | // Validate that DST buffer has correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2311 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyQueryPoolResults()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2312 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2313 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2314 | my_data->device_dispatch_table->CmdCopyQueryPoolResults(commandBuffer, queryPool, startQuery, queryCount, dstBuffer, dstOffset, destStride, flags); |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2315 | } |
| 2316 | } |
| 2317 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2318 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2319 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2320 | VkImage srcImage, |
| 2321 | VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2322 | VkImage dstImage, |
| 2323 | VkImageLayout dstImageLayout, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2324 | uint32_t regionCount, |
| 2325 | const VkImageCopy *pRegions) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2326 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2327 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2328 | VkDeviceMemory mem; |
| 2329 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2330 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2331 | // Validate that src & dst images have correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2332 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2333 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImage"); |
| 2334 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2335 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImage"); |
| 2336 | skipCall |= validate_image_usage_flags(my_data, commandBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyImage()", "VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); |
| 2337 | skipCall |= validate_image_usage_flags(my_data, commandBuffer, dstImage, VK_IMAGE_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyImage()", "VK_IMAGE_USAGE_TRANSFER_DST_BIT"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2338 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2339 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2340 | my_data->device_dispatch_table->CmdCopyImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2341 | commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2342 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2343 | } |
| 2344 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2345 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2346 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2347 | VkImage srcImage, |
| 2348 | VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2349 | VkImage dstImage, |
| 2350 | VkImageLayout dstImageLayout, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2351 | uint32_t regionCount, |
Mark Lobodzinski | 20f6859 | 2015-05-22 14:43:25 -0500 | [diff] [blame] | 2352 | const VkImageBlit *pRegions, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2353 | VkFilter filter) |
Courtney Goeltzenleuchter | b787a1e | 2015-03-08 17:02:18 -0600 | [diff] [blame] | 2354 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2355 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2356 | VkDeviceMemory mem; |
| 2357 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2358 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2359 | // Validate that src & dst images have correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2360 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2361 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdBlitImage"); |
| 2362 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2363 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdBlitImage"); |
| 2364 | skipCall |= validate_image_usage_flags(my_data, commandBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, true, "vkCmdBlitImage()", "VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); |
| 2365 | skipCall |= validate_image_usage_flags(my_data, commandBuffer, dstImage, VK_IMAGE_USAGE_TRANSFER_DST_BIT, true, "vkCmdBlitImage()", "VK_IMAGE_USAGE_TRANSFER_DST_BIT"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2366 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2367 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2368 | my_data->device_dispatch_table->CmdBlitImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2369 | commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2370 | } |
Courtney Goeltzenleuchter | b787a1e | 2015-03-08 17:02:18 -0600 | [diff] [blame] | 2371 | } |
| 2372 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2373 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2374 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2375 | VkBuffer srcBuffer, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2376 | VkImage dstImage, |
| 2377 | VkImageLayout dstImageLayout, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2378 | uint32_t regionCount, |
| 2379 | const VkBufferImageCopy *pRegions) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2380 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2381 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2382 | VkDeviceMemory mem; |
| 2383 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2384 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2385 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2386 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBufferToImage"); |
| 2387 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2388 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyBufferToImage"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2389 | // Validate that src buff & dst image have correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2390 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, srcBuffer, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyBufferToImage()", "VK_BUFFER_USAGE_TRANSFER_SRC_BIT"); |
| 2391 | skipCall |= validate_image_usage_flags(my_data, commandBuffer, dstImage, VK_IMAGE_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyBufferToImage()", "VK_IMAGE_USAGE_TRANSFER_DST_BIT"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2392 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2393 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2394 | my_data->device_dispatch_table->CmdCopyBufferToImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2395 | commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2396 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2397 | } |
| 2398 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2399 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2400 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2401 | VkImage srcImage, |
| 2402 | VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2403 | VkBuffer dstBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2404 | uint32_t regionCount, |
| 2405 | const VkBufferImageCopy *pRegions) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2406 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2407 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2408 | VkDeviceMemory mem; |
| 2409 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2410 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2411 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2412 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImageToBuffer"); |
| 2413 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2414 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdCopyImageToBuffer"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2415 | // Validate that dst buff & src image have correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2416 | skipCall |= validate_image_usage_flags(my_data, commandBuffer, srcImage, VK_IMAGE_USAGE_TRANSFER_SRC_BIT, true, "vkCmdCopyImageToBuffer()", "VK_IMAGE_USAGE_TRANSFER_SRC_BIT"); |
| 2417 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdCopyImageToBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2418 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2419 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2420 | my_data->device_dispatch_table->CmdCopyImageToBuffer( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2421 | commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2422 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2423 | } |
| 2424 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2425 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdUpdateBuffer( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2426 | VkCommandBuffer commandBuffer, |
| 2427 | VkBuffer dstBuffer, |
| 2428 | VkDeviceSize dstOffset, |
| 2429 | VkDeviceSize dataSize, |
| 2430 | const uint32_t *pData) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2431 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2432 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2433 | VkDeviceMemory mem; |
| 2434 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2435 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2436 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2437 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdUpdateBuffer"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2438 | // Validate that dst buff has correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2439 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdUpdateBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2440 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2441 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2442 | my_data->device_dispatch_table->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2443 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2444 | } |
| 2445 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2446 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdFillBuffer( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2447 | VkCommandBuffer commandBuffer, |
| 2448 | VkBuffer dstBuffer, |
| 2449 | VkDeviceSize dstOffset, |
| 2450 | VkDeviceSize size, |
| 2451 | uint32_t data) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2452 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2453 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2454 | VkDeviceMemory mem; |
| 2455 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2456 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2457 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstBuffer, VK_OBJECT_TYPE_BUFFER, &mem); |
| 2458 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdFillBuffer"); |
Tobin Ehlis | d94ba72 | 2015-07-03 08:45:14 -0600 | [diff] [blame] | 2459 | // Validate that dst buff has correct usage flags set |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2460 | skipCall |= validate_buffer_usage_flags(my_data, commandBuffer, dstBuffer, VK_BUFFER_USAGE_TRANSFER_DST_BIT, true, "vkCmdFillBuffer()", "VK_BUFFER_USAGE_TRANSFER_DST_BIT"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2461 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2462 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2463 | my_data->device_dispatch_table->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2464 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2465 | } |
| 2466 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2467 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdClearColorImage( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2468 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2469 | VkImage image, |
| 2470 | VkImageLayout imageLayout, |
Chris Forbes | e310597 | 2015-06-24 14:34:53 +1200 | [diff] [blame] | 2471 | const VkClearColorValue *pColor, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2472 | uint32_t rangeCount, |
| 2473 | const VkImageSubresourceRange *pRanges) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2474 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2475 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2476 | // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2477 | VkDeviceMemory mem; |
| 2478 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2479 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2480 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2481 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdClearColorImage"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2482 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2483 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2484 | my_data->device_dispatch_table->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2485 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2486 | } |
| 2487 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2488 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdClearDepthStencilImage( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2489 | VkCommandBuffer commandBuffer, |
| 2490 | VkImage image, |
| 2491 | VkImageLayout imageLayout, |
| 2492 | const VkClearDepthStencilValue *pDepthStencil, |
| 2493 | uint32_t rangeCount, |
| 2494 | const VkImageSubresourceRange *pRanges) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2495 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2496 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2497 | // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2498 | VkDeviceMemory mem; |
| 2499 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2500 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2501 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)image, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2502 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdClearDepthStencilImage"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2503 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2504 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2505 | my_data->device_dispatch_table->CmdClearDepthStencilImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2506 | commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2507 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2508 | } |
| 2509 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2510 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2511 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2512 | VkImage srcImage, |
| 2513 | VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2514 | VkImage dstImage, |
| 2515 | VkImageLayout dstImageLayout, |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2516 | uint32_t regionCount, |
| 2517 | const VkImageResolve *pRegions) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2518 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2519 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2520 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2521 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2522 | VkDeviceMemory mem; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2523 | skipCall = get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)srcImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2524 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdResolveImage"); |
| 2525 | skipCall |= get_mem_binding_from_object(my_data, commandBuffer, (uint64_t)dstImage, VK_OBJECT_TYPE_IMAGE, &mem); |
| 2526 | skipCall |= update_cmd_buf_and_mem_references(my_data, commandBuffer, mem, "vkCmdResolveImage"); |
Mark Lobodzinski | 0c0d6a0 | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2527 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2528 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2529 | my_data->device_dispatch_table->CmdResolveImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2530 | commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2531 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2532 | } |
| 2533 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2534 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2535 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2536 | VkQueryPool queryPool, |
| 2537 | uint32_t slot, |
| 2538 | VkFlags flags) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2539 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2540 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 2541 | my_data->device_dispatch_table->CmdBeginQuery(commandBuffer, queryPool, slot, flags); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2542 | } |
| 2543 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2544 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2545 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2546 | VkQueryPool queryPool, |
| 2547 | uint32_t slot) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2548 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2549 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 2550 | my_data->device_dispatch_table->CmdEndQuery(commandBuffer, queryPool, slot); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2551 | } |
| 2552 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2553 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2554 | VkCommandBuffer commandBuffer, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2555 | VkQueryPool queryPool, |
| 2556 | uint32_t startQuery, |
| 2557 | uint32_t queryCount) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2558 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2559 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 2560 | my_data->device_dispatch_table->CmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2561 | } |
| 2562 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2563 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2564 | VkInstance instance, |
| 2565 | VkFlags msgFlags, |
| 2566 | const PFN_vkDbgMsgCallback pfnMsgCallback, |
| 2567 | void *pUserData, |
| 2568 | VkDbgMsgCallback *pMsgCallback) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2569 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2570 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
| 2571 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 2572 | VkResult res = pTable->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
| 2573 | if (res == VK_SUCCESS) { |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 2574 | res = layer_create_msg_callback(my_data->report_data, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
| 2575 | } |
| 2576 | return res; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2577 | } |
| 2578 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2579 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2580 | VkInstance instance, |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 2581 | VkDbgMsgCallback msgCallback) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2582 | { |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 2583 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2584 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
| 2585 | VkResult res = pTable->DbgDestroyMsgCallback(instance, msgCallback); |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 2586 | layer_destroy_msg_callback(my_data->report_data, msgCallback); |
| 2587 | |
| 2588 | return res; |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2589 | } |
| 2590 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2591 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR( |
Mark Lobodzinski | a908b16 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2592 | VkDevice device, |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 2593 | const VkSwapchainCreateInfoKHR *pCreateInfo, |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2594 | const VkAllocationCallbacks *pAllocator, |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 2595 | VkSwapchainKHR *pSwapchain) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2596 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2597 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2598 | VkResult result = my_data->device_dispatch_table->CreateSwapchainKHR(device, pCreateInfo, pAllocator, pSwapchain); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2599 | |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2600 | if (VK_SUCCESS == result) { |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2601 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2602 | add_swap_chain_info(my_data, *pSwapchain, pCreateInfo); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2603 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6208641 | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2604 | } |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2605 | |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2606 | return result; |
| 2607 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2608 | |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2609 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR( |
| 2610 | VkDevice device, |
| 2611 | VkSwapchainKHR swapchain, |
| 2612 | const VkAllocationCallbacks *pAllocator) |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2613 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2614 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2615 | VkBool32 skipCall = VK_FALSE; |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2616 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2617 | if (my_data->swapchainMap.find(swapchain) != my_data->swapchainMap.end()) { |
| 2618 | MT_SWAP_CHAIN_INFO* pInfo = my_data->swapchainMap[swapchain]; |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2619 | |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2620 | if (pInfo->images.size() > 0) { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2621 | for (auto it = pInfo->images.begin(); it != pInfo->images.end(); it++) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2622 | skipCall = clear_object_binding(my_data, device, (uint64_t)*it, VK_OBJECT_TYPE_SWAPCHAIN_KHR); |
| 2623 | auto image_item = my_data->imageMap.find((uint64_t)*it); |
| 2624 | if (image_item != my_data->imageMap.end()) |
| 2625 | my_data->imageMap.erase(image_item); |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2626 | } |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2627 | } |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2628 | delete pInfo; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2629 | my_data->swapchainMap.erase(swapchain); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2630 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2631 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2632 | if (VK_FALSE == skipCall) { |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2633 | my_data->device_dispatch_table->DestroySwapchainKHR(device, swapchain, pAllocator); |
Mark Lobodzinski | 87db501 | 2015-09-14 17:43:42 -0600 | [diff] [blame] | 2634 | } |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2635 | } |
| 2636 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2637 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2638 | VkDevice device, |
| 2639 | VkSwapchainKHR swapchain, |
| 2640 | uint32_t *pCount, |
| 2641 | VkImage *pSwapchainImages) |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2642 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2643 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2644 | VkResult result = my_data->device_dispatch_table->GetSwapchainImagesKHR(device, swapchain, pCount, pSwapchainImages); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2645 | |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 2646 | if (result == VK_SUCCESS && pSwapchainImages != NULL) { |
Ian Elliott | ccac023 | 2015-08-07 14:11:14 -0600 | [diff] [blame] | 2647 | const size_t count = *pCount; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2648 | MT_SWAP_CHAIN_INFO *pInfo = my_data->swapchainMap[swapchain]; |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2649 | |
| 2650 | if (pInfo->images.empty()) { |
| 2651 | pInfo->images.resize(count); |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 2652 | memcpy(&pInfo->images[0], pSwapchainImages, sizeof(pInfo->images[0]) * count); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2653 | |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2654 | if (pInfo->images.size() > 0) { |
Ian Elliott | ccac023 | 2015-08-07 14:11:14 -0600 | [diff] [blame] | 2655 | for (std::vector<VkImage>::const_iterator it = pInfo->images.begin(); |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2656 | it != pInfo->images.end(); it++) { |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2657 | // Add image object binding, then insert the new Mem Object and then bind it to created image |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2658 | add_object_create_info(my_data, (uint64_t)*it, VK_OBJECT_TYPE_SWAPCHAIN_KHR, &pInfo->createInfo); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2659 | } |
| 2660 | } |
| 2661 | } else { |
Ian Elliott | ccac023 | 2015-08-07 14:11:14 -0600 | [diff] [blame] | 2662 | const size_t count = *pCount; |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2663 | MT_SWAP_CHAIN_INFO *pInfo = my_data->swapchainMap[swapchain]; |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 2664 | const VkBool32 mismatch = (pInfo->images.size() != count || |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 2665 | memcmp(&pInfo->images[0], pSwapchainImages, sizeof(pInfo->images[0]) * count)); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2666 | |
| 2667 | if (mismatch) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2668 | log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_SWAPCHAIN_KHR, (uint64_t) swapchain, 0, MEMTRACK_NONE, "SWAP_CHAIN", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2669 | "vkGetSwapchainInfoKHR(%" PRIu64 ", VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_KHR) returned mismatching data", reinterpret_cast<uint64_t>(swapchain)); |
Chia-I Wu | 5b66aa5 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2670 | } |
| 2671 | } |
| 2672 | } |
Mark Lobodzinski | 4aad364 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2673 | return result; |
| 2674 | } |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2675 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2676 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR( |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2677 | VkDevice device, |
| 2678 | VkSwapchainKHR swapchain, |
| 2679 | uint64_t timeout, |
| 2680 | VkSemaphore semaphore, |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2681 | VkFence fence, |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2682 | uint32_t *pImageIndex) |
| 2683 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2684 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2685 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 2686 | VkBool32 skipCall = VK_FALSE; |
| 2687 | |
| 2688 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2689 | if (my_data->semaphoreMap.find(semaphore) != my_data->semaphoreMap.end()) { |
| 2690 | if (my_data->semaphoreMap[semaphore] != MEMTRACK_SEMAPHORE_STATE_UNSET) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame^] | 2691 | skipCall = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SEMAPHORE, (uint64_t)semaphore, |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2692 | 0, MEMTRACK_NONE, "SEMAPHORE", |
| 2693 | "vkAcquireNextImageKHR: Semaphore must not be currently signaled or in a wait state"); |
| 2694 | } |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2695 | my_data->semaphoreMap[semaphore] = MEMTRACK_SEMAPHORE_STATE_SIGNALLED; |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2696 | } |
| 2697 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2698 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2699 | result = my_data->device_dispatch_table->AcquireNextImageKHR(device, |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2700 | swapchain, timeout, semaphore, fence, pImageIndex); |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2701 | } |
| 2702 | return result; |
| 2703 | } |
| 2704 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2705 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSemaphore( |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2706 | VkDevice device, |
| 2707 | const VkSemaphoreCreateInfo *pCreateInfo, |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2708 | const VkAllocationCallbacks *pAllocator, |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2709 | VkSemaphore *pSemaphore) |
| 2710 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2711 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2712 | VkResult result = my_data->device_dispatch_table->CreateSemaphore(device, pCreateInfo, pAllocator, pSemaphore); |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2713 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2714 | if (*pSemaphore != VK_NULL_HANDLE) { |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2715 | my_data->semaphoreMap[*pSemaphore] = MEMTRACK_SEMAPHORE_STATE_UNSET; |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2716 | } |
| 2717 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2718 | return result; |
| 2719 | } |
| 2720 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2721 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySemaphore( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2722 | VkDevice device, |
| 2723 | VkSemaphore semaphore, |
| 2724 | const VkAllocationCallbacks *pAllocator) |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2725 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2726 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2727 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 96310ff | 2015-10-29 09:03:52 -0600 | [diff] [blame] | 2728 | auto item = my_data->semaphoreMap.find(semaphore); |
| 2729 | if (item != my_data->semaphoreMap.end()) { |
| 2730 | my_data->semaphoreMap.erase(item); |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2731 | } |
| 2732 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2733 | my_data->device_dispatch_table->DestroySemaphore(device, semaphore, pAllocator); |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2734 | } |
| 2735 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2736 | VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2737 | VkDevice dev, |
| 2738 | const char *funcName) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2739 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2740 | if (dev == NULL) |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2741 | return NULL; |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2742 | |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2743 | layer_data *my_data; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2744 | /* loader uses this to force layer initialization; device object is wrapped */ |
| 2745 | if (!strcmp(funcName, "vkGetDeviceProcAddr")) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2746 | VkBaseLayerObject* wrapped_dev = (VkBaseLayerObject*) dev; |
| 2747 | my_data = get_my_data_ptr(get_dispatch_key(wrapped_dev->baseObject), layer_data_map); |
| 2748 | my_data->device_dispatch_table = new VkLayerDispatchTable; |
| 2749 | layer_initialize_dispatch_table(my_data->device_dispatch_table, wrapped_dev); |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2750 | return (PFN_vkVoidFunction) vkGetDeviceProcAddr; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2751 | } |
Courtney Goeltzenleuchter | be63799 | 2015-06-25 18:01:43 -0600 | [diff] [blame] | 2752 | if (!strcmp(funcName, "vkCreateDevice")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2753 | return (PFN_vkVoidFunction) vkCreateDevice; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2754 | if (!strcmp(funcName, "vkDestroyDevice")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2755 | return (PFN_vkVoidFunction) vkDestroyDevice; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2756 | if (!strcmp(funcName, "vkQueueSubmit")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2757 | return (PFN_vkVoidFunction) vkQueueSubmit; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2758 | if (!strcmp(funcName, "vkAllocateMemory")) |
| 2759 | return (PFN_vkVoidFunction) vkAllocateMemory; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2760 | if (!strcmp(funcName, "vkFreeMemory")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2761 | return (PFN_vkVoidFunction) vkFreeMemory; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2762 | if (!strcmp(funcName, "vkMapMemory")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2763 | return (PFN_vkVoidFunction) vkMapMemory; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2764 | if (!strcmp(funcName, "vkUnmapMemory")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2765 | return (PFN_vkVoidFunction) vkUnmapMemory; |
Michael Lentine | 62c60c3 | 2015-10-29 10:41:47 -0700 | [diff] [blame] | 2766 | if (!strcmp(funcName, "vkFlushMappedMemoryRanges")) |
| 2767 | return (PFN_vkVoidFunction) vkFlushMappedMemoryRanges; |
| 2768 | if (!strcmp(funcName, "vkInvalidateMappedMemoryRanges")) |
| 2769 | return (PFN_vkVoidFunction) vkInvalidateMappedMemoryRanges; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2770 | if (!strcmp(funcName, "vkDestroyFence")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2771 | return (PFN_vkVoidFunction) vkDestroyFence; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2772 | if (!strcmp(funcName, "vkDestroyBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2773 | return (PFN_vkVoidFunction) vkDestroyBuffer; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2774 | if (!strcmp(funcName, "vkDestroyImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2775 | return (PFN_vkVoidFunction) vkDestroyImage; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2776 | if (!strcmp(funcName, "vkBindBufferMemory")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2777 | return (PFN_vkVoidFunction) vkBindBufferMemory; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2778 | if (!strcmp(funcName, "vkBindImageMemory")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2779 | return (PFN_vkVoidFunction) vkBindImageMemory; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2780 | if (!strcmp(funcName, "vkGetBufferMemoryRequirements")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2781 | return (PFN_vkVoidFunction) vkGetBufferMemoryRequirements; |
Tobin Ehlis | 92f12cd | 2015-07-08 17:08:02 -0600 | [diff] [blame] | 2782 | if (!strcmp(funcName, "vkGetImageMemoryRequirements")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2783 | return (PFN_vkVoidFunction) vkGetImageMemoryRequirements; |
Chia-I Wu | 06809d5 | 2015-10-26 16:55:27 +0800 | [diff] [blame] | 2784 | if (!strcmp(funcName, "vkQueueBindSparse")) |
| 2785 | return (PFN_vkVoidFunction) vkQueueBindSparse; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2786 | if (!strcmp(funcName, "vkCreateFence")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2787 | return (PFN_vkVoidFunction) vkCreateFence; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2788 | if (!strcmp(funcName, "vkGetFenceStatus")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2789 | return (PFN_vkVoidFunction) vkGetFenceStatus; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2790 | if (!strcmp(funcName, "vkResetFences")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2791 | return (PFN_vkVoidFunction) vkResetFences; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2792 | if (!strcmp(funcName, "vkWaitForFences")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2793 | return (PFN_vkVoidFunction) vkWaitForFences; |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2794 | if (!strcmp(funcName, "vkCreateSemaphore")) |
| 2795 | return (PFN_vkVoidFunction) vkCreateSemaphore; |
| 2796 | if (!strcmp(funcName, "vkDestroySemaphore")) |
| 2797 | return (PFN_vkVoidFunction) vkDestroySemaphore; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2798 | if (!strcmp(funcName, "vkQueueWaitIdle")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2799 | return (PFN_vkVoidFunction) vkQueueWaitIdle; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2800 | if (!strcmp(funcName, "vkDeviceWaitIdle")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2801 | return (PFN_vkVoidFunction) vkDeviceWaitIdle; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2802 | if (!strcmp(funcName, "vkCreateBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2803 | return (PFN_vkVoidFunction) vkCreateBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2804 | if (!strcmp(funcName, "vkCreateImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2805 | return (PFN_vkVoidFunction) vkCreateImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2806 | if (!strcmp(funcName, "vkCreateImageView")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2807 | return (PFN_vkVoidFunction) vkCreateImageView; |
Mark Lobodzinski | ab5c3d5 | 2015-10-27 09:53:00 -0600 | [diff] [blame] | 2808 | if (!strcmp(funcName, "vkCreateBufferView")) |
| 2809 | return (PFN_vkVoidFunction) vkCreateBufferView; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2810 | if (!strcmp(funcName, "vkAllocateCommandBuffers")) |
| 2811 | return (PFN_vkVoidFunction) vkAllocateCommandBuffers; |
Mark Lobodzinski | c0e316f | 2015-11-13 13:47:01 -0700 | [diff] [blame] | 2812 | if (!strcmp(funcName, "vkFreeCommandBuffers")) |
| 2813 | return (PFN_vkVoidFunction) vkFreeCommandBuffers; |
| 2814 | if (!strcmp(funcName, "vkCreateCommandPool")) |
| 2815 | return (PFN_vkVoidFunction) vkCreateCommandPool; |
| 2816 | if (!strcmp(funcName, "vkDestroyCommandPool")) |
| 2817 | return (PFN_vkVoidFunction) vkDestroyCommandPool; |
| 2818 | if (!strcmp(funcName, "vkResetCommandPool")) |
| 2819 | return (PFN_vkVoidFunction) vkResetCommandPool; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2820 | if (!strcmp(funcName, "vkBeginCommandBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2821 | return (PFN_vkVoidFunction) vkBeginCommandBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2822 | if (!strcmp(funcName, "vkEndCommandBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2823 | return (PFN_vkVoidFunction) vkEndCommandBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2824 | if (!strcmp(funcName, "vkResetCommandBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2825 | return (PFN_vkVoidFunction) vkResetCommandBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2826 | if (!strcmp(funcName, "vkCmdBindPipeline")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2827 | return (PFN_vkVoidFunction) vkCmdBindPipeline; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2828 | if (!strcmp(funcName, "vkCmdBindDescriptorSets")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2829 | return (PFN_vkVoidFunction) vkCmdBindDescriptorSets; |
Courtney Goeltzenleuchter | 4696294 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 2830 | if (!strcmp(funcName, "vkCmdBindVertexBuffers")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2831 | return (PFN_vkVoidFunction) vkCmdBindVertexBuffers; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2832 | if (!strcmp(funcName, "vkCmdBindIndexBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2833 | return (PFN_vkVoidFunction) vkCmdBindIndexBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2834 | if (!strcmp(funcName, "vkCmdDrawIndirect")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2835 | return (PFN_vkVoidFunction) vkCmdDrawIndirect; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2836 | if (!strcmp(funcName, "vkCmdDrawIndexedIndirect")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2837 | return (PFN_vkVoidFunction) vkCmdDrawIndexedIndirect; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2838 | if (!strcmp(funcName, "vkCmdDispatchIndirect")) |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2839 | return (PFN_vkVoidFunction)vkCmdDispatchIndirect; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2840 | if (!strcmp(funcName, "vkCmdCopyBuffer")) |
Mike Stroyan | 4081bdc | 2015-10-15 08:42:32 -0600 | [diff] [blame] | 2841 | return (PFN_vkVoidFunction)vkCmdCopyBuffer; |
| 2842 | if (!strcmp(funcName, "vkCmdCopyQueryPoolResults")) |
| 2843 | return (PFN_vkVoidFunction)vkCmdCopyQueryPoolResults; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2844 | if (!strcmp(funcName, "vkCmdCopyImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2845 | return (PFN_vkVoidFunction) vkCmdCopyImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2846 | if (!strcmp(funcName, "vkCmdCopyBufferToImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2847 | return (PFN_vkVoidFunction) vkCmdCopyBufferToImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2848 | if (!strcmp(funcName, "vkCmdCopyImageToBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2849 | return (PFN_vkVoidFunction) vkCmdCopyImageToBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2850 | if (!strcmp(funcName, "vkCmdUpdateBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2851 | return (PFN_vkVoidFunction) vkCmdUpdateBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2852 | if (!strcmp(funcName, "vkCmdFillBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2853 | return (PFN_vkVoidFunction) vkCmdFillBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2854 | if (!strcmp(funcName, "vkCmdClearColorImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2855 | return (PFN_vkVoidFunction) vkCmdClearColorImage; |
Chris Forbes | 2951d7d | 2015-06-22 17:21:59 +1200 | [diff] [blame] | 2856 | if (!strcmp(funcName, "vkCmdClearDepthStencilImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2857 | return (PFN_vkVoidFunction) vkCmdClearDepthStencilImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2858 | if (!strcmp(funcName, "vkCmdResolveImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2859 | return (PFN_vkVoidFunction) vkCmdResolveImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2860 | if (!strcmp(funcName, "vkCmdBeginQuery")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2861 | return (PFN_vkVoidFunction) vkCmdBeginQuery; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2862 | if (!strcmp(funcName, "vkCmdEndQuery")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2863 | return (PFN_vkVoidFunction) vkCmdEndQuery; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2864 | if (!strcmp(funcName, "vkCmdResetQueryPool")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2865 | return (PFN_vkVoidFunction) vkCmdResetQueryPool; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2866 | if (!strcmp(funcName, "vkGetDeviceQueue")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2867 | return (PFN_vkVoidFunction) vkGetDeviceQueue; |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 2868 | |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2869 | my_data = get_my_data_ptr(get_dispatch_key(dev), layer_data_map); |
| 2870 | if (my_data->wsi_enabled) |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 2871 | { |
Ian Elliott | 338dedb | 2015-08-21 15:09:33 -0600 | [diff] [blame] | 2872 | if (!strcmp(funcName, "vkCreateSwapchainKHR")) |
| 2873 | return (PFN_vkVoidFunction) vkCreateSwapchainKHR; |
| 2874 | if (!strcmp(funcName, "vkDestroySwapchainKHR")) |
| 2875 | return (PFN_vkVoidFunction) vkDestroySwapchainKHR; |
| 2876 | if (!strcmp(funcName, "vkGetSwapchainImagesKHR")) |
| 2877 | return (PFN_vkVoidFunction) vkGetSwapchainImagesKHR; |
Mark Lobodzinski | 2a25307 | 2015-10-08 10:44:07 -0600 | [diff] [blame] | 2878 | if (!strcmp(funcName, "vkAcquireNextImageKHR")) |
| 2879 | return (PFN_vkVoidFunction)vkAcquireNextImageKHR; |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 2880 | } |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2881 | |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2882 | VkLayerDispatchTable *pDisp = my_data->device_dispatch_table; |
Courtney Goeltzenleuchter | 9419f32 | 2015-07-05 11:17:01 -0600 | [diff] [blame] | 2883 | if (pDisp->GetDeviceProcAddr == NULL) |
| 2884 | return NULL; |
| 2885 | return pDisp->GetDeviceProcAddr(dev, funcName); |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2886 | } |
| 2887 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2888 | VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr( |
Mark Lobodzinski | e90aca1 | 2015-11-19 15:45:36 -0700 | [diff] [blame] | 2889 | VkInstance instance, |
| 2890 | const char *funcName) |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2891 | { |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2892 | PFN_vkVoidFunction fptr; |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2893 | if (instance == NULL) |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2894 | return NULL; |
Jon Ashburn | d956400 | 2015-05-07 10:27:37 -0600 | [diff] [blame] | 2895 | |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2896 | layer_data *my_data; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2897 | /* loader uses this to force layer initialization; instance object is wrapped */ |
| 2898 | if (!strcmp(funcName, "vkGetInstanceProcAddr")) { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2899 | VkBaseLayerObject* wrapped_inst = (VkBaseLayerObject*) instance; |
| 2900 | my_data = get_my_data_ptr(get_dispatch_key(wrapped_inst->baseObject), layer_data_map); |
| 2901 | my_data->instance_dispatch_table = new VkLayerInstanceDispatchTable; |
| 2902 | layer_init_instance_dispatch_table(my_data->instance_dispatch_table, wrapped_inst); |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2903 | return (PFN_vkVoidFunction) vkGetInstanceProcAddr; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2904 | } |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2905 | my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Mark Lobodzinski | 5176d3d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2906 | if (!strcmp(funcName, "vkDestroyInstance")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2907 | return (PFN_vkVoidFunction) vkDestroyInstance; |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2908 | if (!strcmp(funcName, "vkCreateInstance")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2909 | return (PFN_vkVoidFunction) vkCreateInstance; |
Mark Lobodzinski | 7234629 | 2015-07-02 16:49:40 -0600 | [diff] [blame] | 2910 | if (!strcmp(funcName, "vkGetPhysicalDeviceMemoryProperties")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 2911 | return (PFN_vkVoidFunction) vkGetPhysicalDeviceMemoryProperties; |
Courtney Goeltzenleuchter | 74c4ce9 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 2912 | if (!strcmp(funcName, "vkEnumerateInstanceLayerProperties")) |
| 2913 | return (PFN_vkVoidFunction) vkEnumerateInstanceLayerProperties; |
| 2914 | if (!strcmp(funcName, "vkEnumerateInstanceExtensionProperties")) |
| 2915 | return (PFN_vkVoidFunction) vkEnumerateInstanceExtensionProperties; |
| 2916 | if (!strcmp(funcName, "vkEnumerateDeviceLayerProperties")) |
| 2917 | return (PFN_vkVoidFunction) vkEnumerateDeviceLayerProperties; |
| 2918 | if (!strcmp(funcName, "vkEnumerateDeviceExtensionProperties")) |
| 2919 | return (PFN_vkVoidFunction) vkEnumerateDeviceExtensionProperties; |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2920 | |
Courtney Goeltzenleuchter | 1f1fbbd | 2015-06-14 12:03:26 -0600 | [diff] [blame] | 2921 | fptr = debug_report_get_instance_proc_addr(my_data->report_data, funcName); |
Courtney Goeltzenleuchter | 23b5f8d | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2922 | if (fptr) |
| 2923 | return fptr; |
| 2924 | |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2925 | { |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2926 | VkLayerInstanceDispatchTable* pTable = my_data->instance_dispatch_table; |
| 2927 | if (pTable->GetInstanceProcAddr == NULL) |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2928 | return NULL; |
Tobin Ehlis | 94680ea | 2015-10-28 16:25:11 -0600 | [diff] [blame] | 2929 | return pTable->GetInstanceProcAddr(instance, funcName); |
Tobin Ehlis | 791a49c | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2930 | } |
| 2931 | } |