Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1 | /* |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 2 | * Vulkan |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 3 | * |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 4 | * Copyright (C) 2015 LunarG, Inc. |
Tobin Ehlis | 6663f49 | 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 | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
Tobin Ehlis | 6663f49 | 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. |
| 23 | */ |
| 24 | |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 25 | #include <inttypes.h> |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 26 | #include <stdio.h> |
| 27 | #include <stdlib.h> |
| 28 | #include <string.h> |
| 29 | #include <assert.h> |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 30 | #include <list> |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 31 | #include <map> |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 32 | #include <vector> |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 33 | using namespace std; |
| 34 | |
Ian Elliott | 2d4ab1e | 2015-01-13 17:52:38 -0700 | [diff] [blame] | 35 | #include "loader_platform.h" |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 36 | #include "vk_dispatch_table_helper.h" |
| 37 | #include "vk_struct_string_helper_cpp.h" |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 38 | #include "mem_tracker.h" |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 39 | #include "layers_config.h" |
Ian Elliott | 655cad7 | 2015-02-12 17:08:34 -0700 | [diff] [blame] | 40 | // The following is #included again to catch certain OS-specific functions |
| 41 | // being used: |
| 42 | #include "loader_platform.h" |
Jon Ashburn | 9eed289 | 2015-06-01 10:02:09 -0600 | [diff] [blame] | 43 | #include "layers_table.h" |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 44 | #include "layer_data.h" |
| 45 | #include "layer_logging.h" |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 46 | |
Ian Elliott | 2d4ab1e | 2015-01-13 17:52:38 -0700 | [diff] [blame] | 47 | static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 48 | |
Jon Ashburn | 8c5cbcf | 2015-05-07 10:27:37 -0600 | [diff] [blame] | 49 | |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 50 | // TODO : This can be much smarter, using separate locks for separate global data |
| 51 | static int globalLockInitialized = 0; |
| 52 | static loader_platform_thread_mutex globalLock; |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 53 | |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 54 | #define MAX_BINDING 0xFFFFFFFF |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 55 | |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 56 | unordered_map<VkCmdBuffer, MT_CB_INFO> cbMap; |
| 57 | unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO> memObjMap; |
| 58 | unordered_map<VkObject, MT_OBJ_INFO> objectMap; |
| 59 | unordered_map<VkFence, MT_FENCE_INFO> fenceMap; // Map fence to fence info |
| 60 | unordered_map<VkQueue, MT_QUEUE_INFO> queueMap; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 61 | unordered_map<VkSwapChainWSI, MT_SWAP_CHAIN_INFO*> swapChainMap; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 62 | |
Mark Lobodzinski | 5093297 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 63 | // TODO : Add per-device fence completion |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 64 | static uint64_t g_currentFenceId = 1; |
Mark Lobodzinski | c52b775 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 65 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 66 | // Add new queue for this device to map container |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 67 | static void add_queue_info(const VkQueue queue) |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 68 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 69 | MT_QUEUE_INFO* pInfo = &queueMap[queue]; |
Mark Lobodzinski | 5093297 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 70 | pInfo->lastRetiredId = 0; |
| 71 | pInfo->lastSubmittedId = 0; |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 72 | } |
| 73 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 74 | static void delete_queue_info_list( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 75 | void) |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 76 | { |
| 77 | // Process queue list, cleaning up each entry before deleting |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 78 | queueMap.clear(); |
| 79 | } |
| 80 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 81 | static void add_swap_chain_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 82 | const VkSwapChainWSI swapChain) |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 83 | { |
| 84 | MT_SWAP_CHAIN_INFO* pInfo = new MT_SWAP_CHAIN_INFO; |
| 85 | swapChainMap[swapChain] = pInfo; |
| 86 | } |
| 87 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 88 | // Add new CBInfo for this cb to map container |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 89 | static void add_cmd_buf_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 90 | const VkCmdBuffer cb) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 91 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 92 | cbMap[cb].cmdBuffer = cb; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 93 | } |
| 94 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 95 | // Return ptr to Info in CB map, or NULL if not found |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 96 | static MT_CB_INFO* get_cmd_buf_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 97 | const VkCmdBuffer cb) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 98 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 99 | unordered_map<VkCmdBuffer, MT_CB_INFO>::iterator item = cbMap.find(cb); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 100 | if (item != cbMap.end()) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 101 | return &(*item).second; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 102 | } else { |
| 103 | return NULL; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 104 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 105 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 106 | |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 107 | // Return object info for 'object' or return NULL if no info exists |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 108 | static MT_OBJ_INFO* get_object_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 109 | const VkObject object) |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 110 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 111 | unordered_map<VkObject, MT_OBJ_INFO>::iterator item = objectMap.find(object); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 112 | if (item != objectMap.end()) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 113 | return &(*item).second; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 114 | } else { |
| 115 | return NULL; |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 116 | } |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 117 | } |
| 118 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 119 | static MT_OBJ_INFO* add_object_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 120 | VkObject object, |
| 121 | VkStructureType sType, |
| 122 | const void *pCreateInfo, |
| 123 | const int struct_size, |
| 124 | const char *name_prefix) |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 125 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 126 | MT_OBJ_INFO* pInfo = &objectMap[object]; |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 127 | memset(pInfo, 0, sizeof(MT_OBJ_INFO)); |
| 128 | memcpy(&pInfo->create_info, pCreateInfo, struct_size); |
| 129 | sprintf(pInfo->object_name, "%s_%p", name_prefix, object); |
| 130 | |
| 131 | pInfo->object = object; |
| 132 | pInfo->ref_count = 1; |
| 133 | pInfo->sType = sType; |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 134 | |
| 135 | return pInfo; |
| 136 | } |
| 137 | |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 138 | // Add a fence, creating one if necessary to our list of fences/fenceIds |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 139 | static uint64_t add_fence_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 140 | VkFence fence, |
| 141 | VkQueue queue) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 142 | { |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 143 | // Create fence object |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 144 | uint64_t fenceId = g_currentFenceId++; |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 145 | // If no fence, create an internal fence to track the submissions |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 146 | if (fence != NULL) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 147 | fenceMap[fence].fenceId = fenceId; |
| 148 | fenceMap[fence].queue = queue; |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 149 | // Validate that fence is in UNSIGNALED state |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 150 | MT_OBJ_INFO* pObjectInfo = get_object_info(fence); |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 151 | if (pObjectInfo != NULL) { |
Tobin Ehlis | b870cbb | 2015-04-15 07:46:12 -0600 | [diff] [blame] | 152 | if (pObjectInfo->create_info.fence_create_info.flags & VK_FENCE_CREATE_SIGNALED_BIT) { |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 153 | char str[1024]; |
| 154 | sprintf(str, "Fence %p submitted in SIGNALED state. Fences must be reset before being submitted", fence); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 155 | device_log_msg(queue, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_FENCE, fence, 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", str); |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 156 | } |
| 157 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 158 | } |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 159 | // Update most recently submitted fence and fenceId for Queue |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 160 | queueMap[queue].lastSubmittedId = fenceId; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 161 | return fenceId; |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 162 | } |
| 163 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 164 | // Remove a fenceInfo from our list of fences/fenceIds |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 165 | static void delete_fence_info( |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 166 | VkFence fence) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 167 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 168 | fenceMap.erase(fence); |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 169 | } |
| 170 | |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 171 | // Record information when a fence is known to be signalled |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 172 | static void update_fence_tracking( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 173 | VkFence fence) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 174 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 175 | unordered_map<VkFence, MT_FENCE_INFO>::iterator fence_item = fenceMap.find(fence); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 176 | if (fence_item != fenceMap.end()) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 177 | MT_FENCE_INFO *pCurFenceInfo = &(*fence_item).second; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 178 | VkQueue queue = pCurFenceInfo->queue; |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 179 | unordered_map<VkQueue, MT_QUEUE_INFO>::iterator queue_item = queueMap.find(queue); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 180 | if (queue_item != queueMap.end()) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 181 | MT_QUEUE_INFO *pQueueInfo = &(*queue_item).second; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 182 | if (pQueueInfo->lastRetiredId < pCurFenceInfo->fenceId) { |
| 183 | pQueueInfo->lastRetiredId = pCurFenceInfo->fenceId; |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 184 | } |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 185 | } |
| 186 | } |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 187 | |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 188 | // Update fence state in fenceCreateInfo structure |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 189 | MT_OBJ_INFO* pObjectInfo = get_object_info(fence); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 190 | if (pObjectInfo != NULL) { |
| 191 | pObjectInfo->create_info.fence_create_info.flags = |
| 192 | static_cast<VkFenceCreateFlags>( |
| 193 | pObjectInfo->create_info.fence_create_info.flags | VK_FENCE_CREATE_SIGNALED_BIT); |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 194 | } |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 195 | } |
| 196 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 197 | // Helper routine that updates the fence list for a specific queue to all-retired |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 198 | static void retire_queue_fences( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 199 | VkQueue queue) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 200 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 201 | MT_QUEUE_INFO *pQueueInfo = &queueMap[queue]; |
| 202 | // Set queue's lastRetired to lastSubmitted indicating all fences completed |
Courtney Goeltzenleuchter | 2f3f8a2 | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 203 | pQueueInfo->lastRetiredId = pQueueInfo->lastSubmittedId; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 204 | } |
| 205 | |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 206 | // Helper routine that updates all queues to all-retired |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 207 | static void retire_device_fences( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 208 | VkDevice device) |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 209 | { |
| 210 | // Process each queue for device |
Courtney Goeltzenleuchter | 2f3f8a2 | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 211 | // TODO: Add multiple device support |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 212 | for (unordered_map<VkQueue, MT_QUEUE_INFO>::iterator ii=queueMap.begin(); ii!=queueMap.end(); ++ii) { |
| 213 | // Set queue's lastRetired to lastSubmitted indicating all fences completed |
| 214 | MT_QUEUE_INFO *pQueueInfo = &(*ii).second; |
| 215 | pQueueInfo->lastRetiredId = pQueueInfo->lastSubmittedId; |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 216 | } |
| 217 | } |
| 218 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 219 | // Return ptr to info in map container containing mem, or NULL if not found |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 220 | // Calls to this function should be wrapped in mutex |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 221 | static MT_MEM_OBJ_INFO* get_mem_obj_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 222 | const VkDeviceMemory mem) |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 223 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 224 | unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO>::iterator item = memObjMap.find(mem); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 225 | if (item != memObjMap.end()) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 226 | return &(*item).second; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 227 | } else { |
| 228 | return NULL; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 229 | } |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 230 | } |
| 231 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 232 | static void add_mem_obj_info( |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 233 | const VkObject object, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 234 | const VkDeviceMemory mem, |
| 235 | const VkMemoryAllocInfo *pAllocInfo) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 236 | { |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 237 | MT_MEM_OBJ_INFO* pInfo = new MT_MEM_OBJ_INFO; |
| 238 | pInfo->refCount = 0; |
| 239 | pInfo->object = object; |
| 240 | memset(&pInfo->allocInfo, 0, sizeof(VkMemoryAllocInfo)); |
| 241 | |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 242 | if (pAllocInfo) { // MEM alloc created by vkCreateSwapChainWSI() doesn't have alloc info struct |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 243 | memcpy(&memObjMap[mem].allocInfo, pAllocInfo, sizeof(VkMemoryAllocInfo)); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 244 | // TODO: Update for real hardware, actually process allocation info structures |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 245 | memObjMap[mem].allocInfo.pNext = NULL; |
| 246 | } else { |
| 247 | memset(&memObjMap[mem].allocInfo, 0, sizeof(VkMemoryAllocInfo)); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 248 | } |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 249 | memObjMap[mem].mem = mem; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 250 | } |
| 251 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 252 | // Find CB Info and add mem reference to list container |
| 253 | // Find Mem Obj Info and add CB reference to list container |
| 254 | static bool32_t update_cmd_buf_and_mem_references( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 255 | const VkCmdBuffer cb, |
| 256 | const VkDeviceMemory mem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 257 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 258 | bool32_t result = VK_TRUE; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 259 | // First update CB binding in MemObj mini CB list |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 260 | MT_MEM_OBJ_INFO* pMemInfo = get_mem_obj_info(mem); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 261 | if (!pMemInfo) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 262 | char str[1024]; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 263 | sprintf(str, "Trying to bind mem obj %p to CB %p but no info for that mem obj.\n " |
| 264 | "Was it correctly allocated? Did it already get freed?", mem, cb); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 265 | device_log_msg(cb, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 266 | result = VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 267 | } else { |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 268 | // Search for cmd buffer object in memory object's binding list |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 269 | bool32_t found = VK_FALSE; |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 270 | if (pMemInfo->pCmdBufferBindings.size() > 0) { |
| 271 | for (list<VkCmdBuffer>::iterator it = pMemInfo->pCmdBufferBindings.begin(); it != pMemInfo->pCmdBufferBindings.end(); ++it) { |
| 272 | if ((*it) == cb) { |
| 273 | found = VK_TRUE; |
| 274 | break; |
| 275 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 276 | } |
| 277 | } |
| 278 | // If not present, add to list |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 279 | if (found == VK_FALSE) { |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 280 | pMemInfo->pCmdBufferBindings.push_front(cb); |
| 281 | pMemInfo->refCount++; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 282 | } |
| 283 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 284 | // Now update CBInfo's Mem reference list |
| 285 | MT_CB_INFO* pCBInfo = get_cmd_buf_info(cb); |
| 286 | // TODO: keep track of all destroyed CBs so we know if this is a stale or simply invalid object |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 287 | if (!pCBInfo) { |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 288 | char str[1024]; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 289 | sprintf(str, "Trying to bind mem obj %p to CB %p but no info for that CB. Was CB incorrectly destroyed?", mem, cb); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 290 | device_log_msg(cb, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cb, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 291 | result = VK_FALSE; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 292 | } else { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 293 | // Search for memory object in cmd buffer's reference list |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 294 | bool32_t found = VK_FALSE; |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 295 | if (pCBInfo->pMemObjList.size() > 0) { |
| 296 | for (list<VkDeviceMemory>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { |
| 297 | if ((*it) == mem) { |
| 298 | found = VK_TRUE; |
| 299 | break; |
| 300 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 301 | } |
| 302 | } |
| 303 | // If not present, add to list |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 304 | if (found == VK_FALSE) { |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 305 | pCBInfo->pMemObjList.push_front(mem); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 306 | } |
| 307 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 308 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 309 | return result; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 310 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 311 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 312 | // Clear the CB Binding for mem |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 313 | // Calls to this function should be wrapped in mutex |
| 314 | static void remove_cmd_buf_and_mem_reference( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 315 | const VkCmdBuffer cb, |
| 316 | const VkDeviceMemory mem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 317 | { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 318 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(mem); |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 319 | // TODO : Having this check is not ideal, really if memInfo was deleted, |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 320 | // its CB bindings should be cleared and then clear_cmd_buf_and_mem_references wouldn't call |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 321 | // us here with stale mem objs |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 322 | if (pInfo) { |
| 323 | pInfo->pCmdBufferBindings.remove(cb); |
| 324 | pInfo->refCount--; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 325 | } |
| 326 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 327 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 328 | // Free bindings related to CB |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 329 | static bool32_t clear_cmd_buf_and_mem_references( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 330 | const VkCmdBuffer cb) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 331 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 332 | bool32_t result = VK_TRUE; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 333 | MT_CB_INFO* pCBInfo = get_cmd_buf_info(cb); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 334 | if (!pCBInfo) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 335 | char str[1024]; |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 336 | sprintf(str, "Unable to find global CB info %p for deletion", cb); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 337 | device_log_msg(cb, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cb, 0, MEMTRACK_INVALID_CB, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 338 | result = VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 339 | } else { |
Courtney Goeltzenleuchter | e4171f0 | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 340 | if (pCBInfo->pMemObjList.size() > 0) { |
| 341 | list<VkDeviceMemory> mem_obj_list = pCBInfo->pMemObjList; |
| 342 | for (list<VkDeviceMemory>::iterator it=mem_obj_list.begin(); it!=mem_obj_list.end(); ++it) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 343 | remove_cmd_buf_and_mem_reference(cb, (*it)); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 344 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 345 | } |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 346 | pCBInfo->pMemObjList.clear(); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 347 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 348 | return result; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 349 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 350 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 351 | // Delete CBInfo from list along with all of it's mini MemObjInfo |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 352 | // and also clear mem references to CB |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 353 | static bool32_t delete_cmd_buf_info( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 354 | const VkCmdBuffer cb) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 355 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 356 | bool32_t result = VK_TRUE; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 357 | result = clear_cmd_buf_and_mem_references(cb); |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 358 | // Delete the CBInfo info |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 359 | if (result == VK_TRUE) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 360 | cbMap.erase(cb); |
Ian Elliott | 2d4ab1e | 2015-01-13 17:52:38 -0700 | [diff] [blame] | 361 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 362 | return result; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 363 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 364 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 365 | // Delete the entire CB list |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 366 | static bool32_t delete_cmd_buf_info_list( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 367 | void) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 368 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 369 | for (unordered_map<VkCmdBuffer, MT_CB_INFO>::iterator ii=cbMap.begin(); ii!=cbMap.end(); ++ii) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 370 | clear_cmd_buf_and_mem_references((*ii).first); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 371 | } |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 372 | cbMap.clear(); |
| 373 | return VK_TRUE; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 374 | } |
| 375 | |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 376 | // For given MemObjInfo, report Obj & CB bindings |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 377 | static void reportMemReferencesAndCleanUp( |
| 378 | MT_MEM_OBJ_INFO* pMemObjInfo) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 379 | { |
Tony Barbour | 18f7155 | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 380 | size_t cmdBufRefCount = pMemObjInfo->pCmdBufferBindings.size(); |
| 381 | size_t objRefCount = pMemObjInfo->pObjBindings.size(); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 382 | |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 383 | if ((pMemObjInfo->pCmdBufferBindings.size() + pMemObjInfo->pObjBindings.size()) != 0) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 384 | char str[1024]; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 385 | sprintf(str, "Attempting to free memory object %p which still contains %lu references", |
| 386 | pMemObjInfo->mem, (cmdBufRefCount + objRefCount)); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 387 | device_log_msg(pMemObjInfo->object, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, pMemObjInfo->mem, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 388 | } |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 389 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 390 | if (cmdBufRefCount > 0 && pMemObjInfo->pCmdBufferBindings.size() > 0) { |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 391 | for (list<VkCmdBuffer>::const_iterator it = pMemObjInfo->pCmdBufferBindings.begin(); it != pMemObjInfo->pCmdBufferBindings.end(); ++it) { |
| 392 | char str[1024]; |
| 393 | sprintf(str, "Command Buffer %p still has a reference to mem obj %p", (*it), pMemObjInfo->mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 394 | device_log_msg(pMemObjInfo->object, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (*it), 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 395 | } |
| 396 | // Clear the list of hanging references |
| 397 | pMemObjInfo->pCmdBufferBindings.clear(); |
| 398 | } |
| 399 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 400 | if (objRefCount > 0 && pMemObjInfo->pObjBindings.size() > 0) { |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 401 | for (list<VkObject>::const_iterator it = pMemObjInfo->pObjBindings.begin(); it != pMemObjInfo->pObjBindings.end(); ++it) { |
| 402 | char str[1024]; |
| 403 | sprintf(str, "VK Object %p still has a reference to mem obj %p", (*it), pMemObjInfo->mem); |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 404 | /* TODO: Would be nice to return the actual object type */ |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 405 | device_log_msg(pMemObjInfo->object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, (*it), 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 406 | } |
| 407 | // Clear the list of hanging references |
| 408 | pMemObjInfo->pObjBindings.clear(); |
| 409 | } |
Mark Lobodzinski | 3780e14 | 2015-05-14 15:08:13 -0500 | [diff] [blame] | 410 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 411 | } |
| 412 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 413 | static void deleteMemObjInfo( |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 414 | VkObject object, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 415 | VkDeviceMemory mem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 416 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 417 | unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO>::iterator item = memObjMap.find(mem); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 418 | if (item != memObjMap.end()) { |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 419 | memObjMap.erase(item); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 420 | } |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 421 | else { |
| 422 | char str[1024]; |
| 423 | sprintf(str, "Request to delete memory object %p not present in memory Object Map", mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 424 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 425 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 426 | } |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 427 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 428 | // Check if fence for given CB is completed |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 429 | static bool32_t checkCBCompleted( |
| 430 | const VkCmdBuffer cb) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 431 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 432 | bool32_t result = VK_TRUE; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 433 | MT_CB_INFO* pCBInfo = get_cmd_buf_info(cb); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 434 | if (!pCBInfo) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 435 | char str[1024]; |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 436 | sprintf(str, "Unable to find global CB info %p to check for completion", cb); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 437 | device_log_msg(cb, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cb, 0, MEMTRACK_INVALID_CB, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 438 | result = VK_FALSE; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 439 | } else if (pCBInfo->lastSubmittedQueue != NULL) { |
| 440 | VkQueue queue = pCBInfo->lastSubmittedQueue; |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 441 | MT_QUEUE_INFO *pQueueInfo = &queueMap[queue]; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 442 | if (pCBInfo->fenceId > pQueueInfo->lastRetiredId) { |
Courtney Goeltzenleuchter | 2f3f8a2 | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 443 | char str[1024]; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 444 | sprintf(str, "fence %p for CB %p has not been checked for completion", |
| 445 | (void*)pCBInfo->lastSubmittedFence, cb); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 446 | device_log_msg(cb, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cb, 0, MEMTRACK_NONE, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 447 | result = VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 448 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 449 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 450 | return result; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 451 | } |
| 452 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 453 | static bool32_t freeMemObjInfo( |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 454 | VkObject object, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 455 | VkDeviceMemory mem, |
| 456 | bool internal) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 457 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 458 | bool32_t result = VK_TRUE; |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 459 | // Parse global list to find info w/ mem |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 460 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(mem); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 461 | if (!pInfo) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 462 | char str[1024]; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 463 | sprintf(str, "Couldn't find mem info object for %p\n Was %p never allocated or previously freed?", |
| 464 | (void*)mem, (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 465 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 466 | result = VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 467 | } else { |
Courtney Goeltzenleuchter | 1c943a7 | 2015-03-26 16:15:39 -0600 | [diff] [blame] | 468 | if (pInfo->allocInfo.allocationSize == 0 && !internal) { |
Mark Lobodzinski | 2f3b19b | 2015-02-18 18:06:24 -0600 | [diff] [blame] | 469 | char str[1024]; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 470 | sprintf(str, "Attempting to free memory associated with a Persistent Image, %p, " |
| 471 | "this should not be explicitly freed\n", (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 472 | device_log_msg(pInfo->object, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 473 | result = VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 474 | } else { |
| 475 | // Clear any CB bindings for completed CBs |
| 476 | // TODO : Is there a better place to do this? |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 477 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 478 | list<VkCmdBuffer>::iterator it = pInfo->pCmdBufferBindings.begin(); |
| 479 | list<VkCmdBuffer>::iterator temp; |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 480 | while (pInfo->pCmdBufferBindings.size() > 0 && it != pInfo->pCmdBufferBindings.end()) { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 481 | if (VK_TRUE == checkCBCompleted(*it)) { |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 482 | temp = it; |
| 483 | ++temp; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 484 | clear_cmd_buf_and_mem_references(*it); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 485 | it = temp; |
| 486 | } else { |
| 487 | ++it; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 488 | } |
| 489 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 490 | |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 491 | // Now verify that no references to this mem obj remain |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 492 | if (0 != pInfo->refCount) { |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 493 | reportMemReferencesAndCleanUp(pInfo); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 494 | result = VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 495 | } |
Courtney Goeltzenleuchter | 2f3f8a2 | 2015-04-14 00:01:21 -0600 | [diff] [blame] | 496 | // Delete mem obj info |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 497 | deleteMemObjInfo(object, mem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 498 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 499 | } |
| 500 | return result; |
| 501 | } |
| 502 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 503 | // Remove object binding performs 3 tasks: |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 504 | // 1. Remove ObjectInfo from MemObjInfo list container of obj bindings & free it |
| 505 | // 2. Decrement refCount for MemObjInfo |
| 506 | // 3. Clear MemObjInfo ptr from ObjectInfo |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 507 | static bool32_t clear_object_binding( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 508 | VkObject object) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 509 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 510 | bool32_t result = VK_FALSE; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 511 | MT_OBJ_INFO* pObjInfo = get_object_info(object); |
| 512 | if (pObjInfo) { |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 513 | if (!pObjInfo->pMemObjInfo || pObjInfo->pMemObjInfo->pObjBindings.size() <= 0) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 514 | char str[1024]; |
| 515 | sprintf(str, "Attempting to clear mem binding on obj %p but it has no binding.", (void*)object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 516 | device_log_msg(object, VK_DBG_REPORT_WARN_BIT, (VkObjectType) 0, object, 0, MEMTRACK_MEM_OBJ_CLEAR_EMPTY_BINDINGS, "MEM", str); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 517 | } else { |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 518 | // 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 |
| 519 | // and set the objects memory binding pointer to NULL. |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 520 | for (list<VkObject>::iterator it = pObjInfo->pMemObjInfo->pObjBindings.begin(); it != pObjInfo->pMemObjInfo->pObjBindings.end(); ++it) { |
Mark Lobodzinski | 40f7f40 | 2015-04-16 11:44:05 -0500 | [diff] [blame] | 521 | if ((*it) == object) { |
| 522 | pObjInfo->pMemObjInfo->refCount--; |
| 523 | pObjInfo->pMemObjInfo->pObjBindings.erase(it); |
| 524 | pObjInfo->pMemObjInfo = NULL; |
| 525 | result = VK_TRUE; |
| 526 | break; |
| 527 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 528 | } |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 529 | if (result == VK_FALSE) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 530 | char str[1024]; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 531 | sprintf(str, "While trying to clear mem binding for object %p, unable to find that object referenced by mem obj %p", |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 532 | object, pObjInfo->pMemObjInfo->mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 533 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 534 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 535 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 536 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 537 | return result; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 538 | } |
| 539 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 540 | // For NULL mem case, output warning |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 541 | // Make sure given object is in global object map |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 542 | // IF a previous binding existed, output validation error |
| 543 | // Otherwise, add reference from objectInfo to memoryInfo |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 544 | // Add reference off of objInfo |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 545 | // Return VK_TRUE if addition is successful, VK_FALSE otherwise |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 546 | static bool32_t set_object_binding( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 547 | VkObject object, |
| 548 | VkDeviceMemory mem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 549 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 550 | bool32_t result = VK_FALSE; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 551 | // Handle NULL case separately, just clear previous binding & decrement reference |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 552 | if (mem == VK_NULL_HANDLE) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 553 | char str[1024]; |
| 554 | sprintf(str, "Attempting to Bind Obj(%p) to NULL", (void*)object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 555 | device_log_msg(object, VK_DBG_REPORT_WARN_BIT, (VkObjectType) 0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 556 | return VK_TRUE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 557 | } else { |
| 558 | char str[1024]; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 559 | MT_OBJ_INFO* pObjInfo = get_object_info(object); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 560 | if (!pObjInfo) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 561 | sprintf(str, "Attempting to update Binding of Obj(%p) that's not in global list()", (void*)object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 562 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 563 | return VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 564 | } |
| 565 | // non-null case so should have real mem obj |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 566 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(mem); |
| 567 | if (!pInfo) { |
| 568 | sprintf(str, "While trying to bind mem for obj %p, couldn't find info for mem obj %p", (void*)object, (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 569 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 570 | return VK_FALSE; |
| 571 | } else { |
| 572 | if (pObjInfo->pMemObjInfo != NULL) { |
| 573 | sprintf(str, "Attempting to bind memory (%p) to object (%p) which has already been bound to mem object %p", |
| 574 | (void*)mem, (void*)object, (void*)pObjInfo->pMemObjInfo->mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 575 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_REBIND_OBJECT, "MEM", str); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 576 | return VK_FALSE; |
| 577 | } |
| 578 | else { |
| 579 | pInfo->pObjBindings.push_front(object); |
| 580 | pInfo->refCount++; |
| 581 | |
| 582 | // For image objects, make sure default memory state is correctly set |
| 583 | // TODO : What's the best/correct way to handle this? |
| 584 | if (VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO == pObjInfo->sType) { |
| 585 | if (pObjInfo->create_info.image_create_info.usage & (VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | |
| 586 | VK_IMAGE_USAGE_DEPTH_STENCIL_BIT)) { |
| 587 | // TODO:: More memory state transition stuff. |
| 588 | } |
| 589 | } |
| 590 | pObjInfo->pMemObjInfo = pInfo; |
| 591 | } |
| 592 | } |
| 593 | } |
| 594 | return VK_TRUE; |
| 595 | } |
| 596 | |
| 597 | // For NULL mem case, clear any previous binding Else... |
| 598 | // Make sure given object is in global object map |
| 599 | // IF a previous binding existed, update binding |
| 600 | // Add reference from objectInfo to memoryInfo |
| 601 | // Add reference off of objInfo |
| 602 | // Return VK_TRUE if addition is successful, VK_FALSE otherwise |
| 603 | static bool32_t set_sparse_buffer_binding( |
| 604 | VkObject object, |
| 605 | VkDeviceMemory mem) |
| 606 | { |
| 607 | bool32_t result = VK_FALSE; |
| 608 | // Handle NULL case separately, just clear previous binding & decrement reference |
| 609 | if (mem == VK_NULL_HANDLE) { |
| 610 | clear_object_binding(object); |
| 611 | return VK_TRUE; |
| 612 | } else { |
| 613 | char str[1024]; |
| 614 | MT_OBJ_INFO* pObjInfo = get_object_info(object); |
| 615 | if (!pObjInfo) { |
| 616 | sprintf(str, "Attempting to update Binding of Obj(%p) that's not in global list()", (void*)object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 617 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, object, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 618 | return VK_FALSE; |
| 619 | } |
| 620 | // non-null case so should have real mem obj |
| 621 | MT_MEM_OBJ_INFO* pInfo = get_mem_obj_info(mem); |
Courtney Goeltzenleuchter | e4171f0 | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 622 | if (!pInfo) { |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 623 | sprintf(str, "While trying to bind mem for obj %p, couldn't find info for mem obj %p", (void*)object, (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 624 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_INVALID_MEM_OBJ, "MEM", str); |
Mark Lobodzinski | 3780e14 | 2015-05-14 15:08:13 -0500 | [diff] [blame] | 625 | return VK_FALSE; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 626 | } else { |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 627 | // Search for object in memory object's binding list |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 628 | bool32_t found = VK_FALSE; |
Courtney Goeltzenleuchter | e4171f0 | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 629 | if (pInfo->pObjBindings.size() > 0) { |
| 630 | for (list<VkObject>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { |
| 631 | if ((*it) == object) { |
| 632 | found = VK_TRUE; |
| 633 | break; |
| 634 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 635 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 636 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 637 | // If not present, add to list |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 638 | if (found == VK_FALSE) { |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 639 | pInfo->pObjBindings.push_front(object); |
| 640 | pInfo->refCount++; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 641 | } |
| 642 | |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 643 | if (pObjInfo->pMemObjInfo) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 644 | clear_object_binding(object); // Need to clear the previous object binding before setting new binding |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 645 | sprintf(str, "Updating memory binding for object %p from mem obj %p to %p", object, pObjInfo->pMemObjInfo->mem, mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 646 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, object, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 647 | } |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 648 | pObjInfo->pMemObjInfo = pInfo; |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 649 | } |
| 650 | } |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 651 | return VK_TRUE; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 652 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 653 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 654 | // Print details of global Obj tracking list |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 655 | static void print_object_list( |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 656 | VkObject object) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 657 | { |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 658 | MT_OBJ_INFO* pInfo = NULL; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 659 | char str[1024]; |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 660 | sprintf(str, "Details of Object list of size %lu elements", objectMap.size()); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 661 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 662 | if (objectMap.size() <= 0) |
| 663 | return; |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 664 | for (unordered_map<VkObject, MT_OBJ_INFO>::iterator ii=objectMap.begin(); ii!=objectMap.end(); ++ii) { |
| 665 | pInfo = &(*ii).second; |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 666 | sprintf(str, " ObjInfo %p has object %p, pMemObjInfo %p", pInfo, pInfo->object, pInfo->pMemObjInfo); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 667 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, pInfo->object, 0, MEMTRACK_NONE, "MEM", str); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 668 | } |
| 669 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 670 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 671 | // For given Object, get 'mem' obj that it's bound to or NULL if no binding |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 672 | static VkDeviceMemory get_mem_binding_from_object( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 673 | const VkObject object) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 674 | { |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 675 | VkDeviceMemory mem = NULL; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 676 | MT_OBJ_INFO* pObjInfo = get_object_info(object); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 677 | if (pObjInfo) { |
| 678 | if (pObjInfo->pMemObjInfo) { |
| 679 | mem = pObjInfo->pMemObjInfo->mem; |
Courtney Goeltzenleuchter | e4171f0 | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 680 | } else { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 681 | char str[1024]; |
| 682 | sprintf(str, "Trying to get mem binding for object %p but object has no mem binding", (void*)object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 683 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, object, 0, MEMTRACK_MISSING_MEM_BINDINGS, "MEM", str); |
| 684 | print_object_list(object); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 685 | } |
Courtney Goeltzenleuchter | e4171f0 | 2015-04-29 10:51:48 -0600 | [diff] [blame] | 686 | } else { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 687 | char str[1024]; |
| 688 | sprintf(str, "Trying to get mem binding for object %p but no such object in global list", (void*)object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 689 | device_log_msg(object, VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, object, 0, MEMTRACK_INVALID_OBJECT, "MEM", str); |
| 690 | print_object_list(object); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 691 | } |
| 692 | return mem; |
| 693 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 694 | |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 695 | // Print details of MemObjInfo list |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 696 | static void print_mem_list( |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 697 | VkObject object) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 698 | { |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 699 | MT_MEM_OBJ_INFO* pInfo = NULL; |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 700 | // Just printing each msg individually for now, may want to package these into single large print |
| 701 | char str[1024]; |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 702 | sprintf(str, "MEM INFO : Details of Memory Object list of size %lu elements", memObjMap.size()); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 703 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 704 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 705 | if (memObjMap.size() <= 0) |
| 706 | return; |
| 707 | |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 708 | for (unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO>::iterator ii=memObjMap.begin(); ii!=memObjMap.end(); ++ii) { |
| 709 | pInfo = &(*ii).second; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 710 | |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 711 | sprintf(str, " ===MemObjInfo at %p===", (void*)pInfo); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 712 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 713 | sprintf(str, " Mem object: %p", (void*)pInfo->mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 714 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 715 | sprintf(str, " Ref Count: %u", pInfo->refCount); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 716 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 717 | if (0 != pInfo->allocInfo.allocationSize) { |
Courtney Goeltzenleuchter | 95487bc | 2015-04-14 18:48:46 -0600 | [diff] [blame] | 718 | string pAllocInfoMsg = vk_print_vkmemoryallocinfo(&pInfo->allocInfo, "{MEM}INFO : "); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 719 | sprintf(str, " Mem Alloc info:\n%s", pAllocInfoMsg.c_str()); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 720 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 721 | } else { |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 722 | sprintf(str, " Mem Alloc info is NULL (alloc done by vkCreateSwapChainWSI())"); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 723 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 724 | } |
| 725 | |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 726 | sprintf(str, " VK OBJECT Binding list of size %lu elements:", pInfo->pObjBindings.size()); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 727 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 728 | if (pInfo->pObjBindings.size() > 0) { |
| 729 | for (list<VkObject>::iterator it = pInfo->pObjBindings.begin(); it != pInfo->pObjBindings.end(); ++it) { |
| 730 | sprintf(str, " VK OBJECT %p", (*it)); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 731 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 732 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 733 | } |
| 734 | |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 735 | sprintf(str, " VK Command Buffer (CB) binding list of size %lu elements", pInfo->pCmdBufferBindings.size()); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 736 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 737 | if (pInfo->pCmdBufferBindings.size() > 0) |
| 738 | { |
| 739 | for (list<VkCmdBuffer>::iterator it = pInfo->pCmdBufferBindings.begin(); it != pInfo->pCmdBufferBindings.end(); ++it) { |
| 740 | sprintf(str, " VK CB %p", (*it)); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 741 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 742 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 743 | } |
| 744 | } |
| 745 | } |
| 746 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 747 | static void printCBList( |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 748 | VkObject object) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 749 | { |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 750 | char str[1024]; |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 751 | MT_CB_INFO* pCBInfo = NULL; |
| 752 | sprintf(str, "Details of CB list of size %lu elements", cbMap.size()); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 753 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 754 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 755 | if (cbMap.size() <= 0) |
| 756 | return; |
| 757 | |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 758 | for (unordered_map<VkCmdBuffer, MT_CB_INFO>::iterator ii=cbMap.begin(); ii!=cbMap.end(); ++ii) { |
| 759 | pCBInfo = &(*ii).second; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 760 | |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 761 | sprintf(str, " CB Info (%p) has CB %p, fenceId %" PRIx64", and fence %p", |
| 762 | (void*)pCBInfo, (void*)pCBInfo->cmdBuffer, pCBInfo->fenceId, |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 763 | (void*)pCBInfo->lastSubmittedFence); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 764 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 765 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 766 | if (pCBInfo->pMemObjList.size() <= 0) |
| 767 | continue; |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 768 | for (list<VkDeviceMemory>::iterator it = pCBInfo->pMemObjList.begin(); it != pCBInfo->pMemObjList.end(); ++it) { |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 769 | sprintf(str, " Mem obj %p", (*it)); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 770 | device_log_msg(object, VK_DBG_REPORT_INFO_BIT, (VkObjectType) 0, NULL, 0, MEMTRACK_NONE, "MEM", str); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 771 | } |
| 772 | } |
| 773 | } |
| 774 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 775 | static void initMemTracker( |
| 776 | void) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 777 | { |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 778 | const char *strOpt; |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 779 | #if 0 |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 780 | // initialize MemTracker options |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 781 | getLayerOptionEnum("MemTrackerReportLevel", (uint32_t *) &g_reportFlags); |
Ian Elliott | e782671 | 2015-03-06 13:50:05 -0700 | [diff] [blame] | 782 | g_actionIsDefault = getLayerOptionEnum("MemTrackerDebugAction", (uint32_t *) &g_debugAction); |
Tobin Ehlis | ee70223 | 2015-01-08 14:26:53 -0700 | [diff] [blame] | 783 | |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 784 | if (g_debugAction & VK_DBG_LAYER_ACTION_LOG_MSG) |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 785 | { |
| 786 | strOpt = getLayerOption("MemTrackerLogFilename"); |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 787 | if (strOpt) { |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 788 | g_logFile = fopen(strOpt, "w"); |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 789 | } |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 790 | if (g_logFile == NULL) { |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 791 | g_logFile = stdout; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 792 | } |
Jon Ashburn | 7d7b3cf | 2014-12-22 13:24:15 -0700 | [diff] [blame] | 793 | } |
| 794 | |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 795 | if (!globalLockInitialized) |
| 796 | { |
| 797 | // TODO/TBD: Need to delete this mutex sometime. How??? One |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 798 | // suggestion is to call this during vkCreateInstance(), and then we |
| 799 | // can clean it up during vkDestroyInstance(). However, that requires |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 800 | // that the layer have per-instance locks. We need to come back and |
| 801 | // address this soon. |
| 802 | loader_platform_thread_create_mutex(&globalLock); |
| 803 | globalLockInitialized = 1; |
| 804 | } |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 805 | #endif |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 806 | } |
| 807 | |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 808 | // hook DestroyInstance to remove tableInstanceMap entry |
| 809 | VK_LAYER_EXPORT VkResult VKAPI vkDestroyInstance(VkInstance instance) |
| 810 | { |
| 811 | VkLayerInstanceDispatchTable *pDisp = *(VkLayerInstanceDispatchTable **) instance; |
| 812 | VkResult res = instance_dispatch_table(instance)->DestroyInstance(instance); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 813 | layer_debug_report_destroy_instance(instance); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 814 | tableInstanceMap.erase(pDisp); |
| 815 | return res; |
| 816 | } |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 817 | |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 818 | VkResult VKAPI vkCreateInstance( |
| 819 | const VkInstanceCreateInfo* pCreateInfo, |
| 820 | VkInstance* pInstance) |
| 821 | { |
| 822 | loader_platform_thread_once(&g_initOnce, initMemTracker); |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 823 | |
Courtney Goeltzenleuchter | d02a964 | 2015-06-08 14:58:39 -0600 | [diff] [blame] | 824 | VkLayerInstanceDispatchTable *pTable = instance_dispatch_table(*pInstance); |
| 825 | VkResult result = pTable->CreateInstance(pCreateInfo, pInstance); |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 826 | |
| 827 | if (result == VK_SUCCESS) { |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 828 | debug_report_create_instance( |
| 829 | pTable, |
| 830 | pCreateInfo->extensionCount, |
| 831 | pCreateInfo->pEnabledExtensions); |
Courtney Goeltzenleuchter | d02a964 | 2015-06-08 14:58:39 -0600 | [diff] [blame] | 832 | |
| 833 | debug_report_init_instance_extension_dispatch_table( |
| 834 | pTable, |
| 835 | pTable->GetInstanceProcAddr, |
| 836 | *pInstance); |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 837 | } |
| 838 | return result; |
| 839 | } |
| 840 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 841 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice( |
| 842 | VkPhysicalDevice gpu, |
| 843 | const VkDeviceCreateInfo *pCreateInfo, |
| 844 | VkDevice *pDevice) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 845 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 846 | VkResult result = instance_dispatch_table(gpu)->CreateDevice(gpu, pCreateInfo, pDevice); |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 847 | if (result == VK_SUCCESS) { |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 848 | layer_debug_report_create_device(instance_dispatch_table(gpu), *pDevice); |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 849 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 850 | return result; |
| 851 | } |
| 852 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 853 | VK_LAYER_EXPORT VkResult VKAPI vkDestroyDevice( |
| 854 | VkDevice device) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 855 | { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 856 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 857 | sprintf(str, "Printing List details prior to vkDestroyDevice()"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 858 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 859 | device_log_msg(device, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DEVICE, device, 0, MEMTRACK_NONE, "MEM", str); |
| 860 | print_mem_list(device); |
| 861 | printCBList(device); |
| 862 | print_object_list(device); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 863 | if (VK_FALSE == delete_cmd_buf_info_list()) { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 864 | sprintf(str, "Issue deleting global CB list in vkDestroyDevice()"); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 865 | device_log_msg(device, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, device, 0, MEMTRACK_INTERNAL_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 866 | } |
Tobin Ehlis | b54ef78 | 2014-11-25 18:01:12 -0700 | [diff] [blame] | 867 | // Report any memory leaks |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 868 | MT_MEM_OBJ_INFO* pInfo = NULL; |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 869 | if (memObjMap.size() > 0) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 870 | for (unordered_map<VkDeviceMemory, MT_MEM_OBJ_INFO>::iterator ii=memObjMap.begin(); ii!=memObjMap.end(); ++ii) { |
| 871 | pInfo = &(*ii).second; |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 872 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 873 | if (pInfo->allocInfo.allocationSize != 0) { |
| 874 | sprintf(str, "Mem Object %p has not been freed. You should clean up this memory by calling " |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 875 | "vkFreeMemory(%p) prior to vkDestroyDevice().", pInfo->mem, pInfo->mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 876 | device_log_msg(device, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, pInfo->mem, 0, MEMTRACK_MEMORY_LEAK, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 877 | } |
Mark Lobodzinski | 2f3b19b | 2015-02-18 18:06:24 -0600 | [diff] [blame] | 878 | } |
Tobin Ehlis | b54ef78 | 2014-11-25 18:01:12 -0700 | [diff] [blame] | 879 | } |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 880 | |
| 881 | // Queues persist until device is destroyed |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 882 | delete_queue_info_list(); |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 883 | |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 884 | layer_debug_report_destroy_device(device); |
| 885 | |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 886 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 887 | |
| 888 | VkLayerDispatchTable *pDisp = *(VkLayerDispatchTable **) device; |
Jon Ashburn | 9eed289 | 2015-06-01 10:02:09 -0600 | [diff] [blame] | 889 | VkResult result = device_dispatch_table(device)->DestroyDevice(device); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 890 | tableMap.erase(pDisp); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 891 | return result; |
| 892 | } |
| 893 | |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 894 | struct extProps { |
| 895 | uint32_t version; |
| 896 | const char * const name; |
| 897 | }; |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 898 | #define MEM_TRACKER_LAYER_EXT_ARRAY_SIZE 2 |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 899 | static const VkExtensionProperties mtExts[MEM_TRACKER_LAYER_EXT_ARRAY_SIZE] = { |
| 900 | { |
| 901 | VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES, |
| 902 | "MemTracker", |
| 903 | 0x10, |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 904 | "Validation layer: MemTracker", |
| 905 | }, |
| 906 | { |
| 907 | VK_STRUCTURE_TYPE_EXTENSION_PROPERTIES, |
| 908 | "Validation", |
| 909 | 0x10, |
| 910 | "Validation layer: MemTracker", |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 911 | } |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 912 | }; |
| 913 | |
| 914 | VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 915 | VkExtensionInfoType infoType, |
| 916 | uint32_t extensionIndex, |
| 917 | size_t *pDataSize, |
| 918 | void *pData) |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 919 | { |
Mark Lobodzinski | 3780e14 | 2015-05-14 15:08:13 -0500 | [diff] [blame] | 920 | // This entrypoint is NOT going to init its own dispatch table since loader calls here early |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 921 | uint32_t *count; |
| 922 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 923 | if (pDataSize == NULL) { |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 924 | return VK_ERROR_INVALID_POINTER; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 925 | } |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 926 | |
| 927 | switch (infoType) { |
| 928 | case VK_EXTENSION_INFO_TYPE_COUNT: |
| 929 | *pDataSize = sizeof(uint32_t); |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 930 | if (pData == NULL) { |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 931 | return VK_SUCCESS; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 932 | } |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 933 | count = (uint32_t *) pData; |
| 934 | *count = MEM_TRACKER_LAYER_EXT_ARRAY_SIZE; |
| 935 | break; |
| 936 | case VK_EXTENSION_INFO_TYPE_PROPERTIES: |
| 937 | *pDataSize = sizeof(VkExtensionProperties); |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 938 | if (pData == NULL) { |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 939 | return VK_SUCCESS; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 940 | } |
| 941 | if (extensionIndex >= MEM_TRACKER_LAYER_EXT_ARRAY_SIZE) { |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 942 | return VK_ERROR_INVALID_VALUE; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 943 | } |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 944 | memcpy((VkExtensionProperties *) pData, &mtExts[extensionIndex], sizeof(VkExtensionProperties)); |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 945 | break; |
| 946 | default: |
| 947 | return VK_ERROR_INVALID_VALUE; |
| 948 | }; |
| 949 | |
| 950 | return VK_SUCCESS; |
| 951 | } |
| 952 | |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 953 | VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionInfo( |
| 954 | VkPhysicalDevice physical_device, |
| 955 | VkExtensionInfoType infoType, |
| 956 | uint32_t extensionIndex, |
| 957 | size_t *pDataSize, |
| 958 | void *pData) |
| 959 | { |
| 960 | uint32_t *count; |
| 961 | |
| 962 | if (pDataSize == NULL) { |
| 963 | return VK_ERROR_INVALID_POINTER; |
| 964 | } |
| 965 | |
| 966 | switch (infoType) { |
| 967 | case VK_EXTENSION_INFO_TYPE_COUNT: |
| 968 | *pDataSize = sizeof(uint32_t); |
| 969 | if (pData == NULL) { |
| 970 | return VK_SUCCESS; |
| 971 | } |
| 972 | count = (uint32_t *) pData; |
| 973 | *count = MEM_TRACKER_LAYER_EXT_ARRAY_SIZE; |
| 974 | break; |
| 975 | case VK_EXTENSION_INFO_TYPE_PROPERTIES: |
| 976 | *pDataSize = sizeof(VkExtensionProperties); |
| 977 | if (pData == NULL) { |
| 978 | return VK_SUCCESS; |
| 979 | } |
| 980 | if (extensionIndex >= MEM_TRACKER_LAYER_EXT_ARRAY_SIZE) { |
| 981 | return VK_ERROR_INVALID_VALUE; |
| 982 | } |
| 983 | memcpy((VkExtensionProperties *) pData, &mtExts[extensionIndex], sizeof(VkExtensionProperties)); |
| 984 | break; |
| 985 | default: |
| 986 | return VK_ERROR_INVALID_VALUE; |
| 987 | } |
| 988 | |
| 989 | return VK_SUCCESS; |
| 990 | } |
| 991 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 992 | VK_LAYER_EXPORT VkResult VKAPI vkGetDeviceQueue( |
| 993 | VkDevice device, |
| 994 | uint32_t queueNodeIndex, |
| 995 | uint32_t queueIndex, |
| 996 | VkQueue *pQueue) |
Mark Lobodzinski | 748eddf | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 997 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 998 | VkResult result = device_dispatch_table(device)->GetDeviceQueue(device, queueNodeIndex, queueIndex, pQueue); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 999 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | ed450b0 | 2015-04-07 13:38:21 -0500 | [diff] [blame] | 1000 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1001 | add_queue_info(*pQueue); |
Mark Lobodzinski | ed450b0 | 2015-04-07 13:38:21 -0500 | [diff] [blame] | 1002 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1003 | } |
Mark Lobodzinski | 748eddf | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1004 | return result; |
| 1005 | } |
| 1006 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1007 | VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit( |
| 1008 | VkQueue queue, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1009 | uint32_t cmdBufferCount, |
| 1010 | const VkCmdBuffer *pCmdBuffers, |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1011 | VkFence fence) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1012 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1013 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1014 | // TODO : Need to track fence and clear mem references when fence clears |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1015 | MT_CB_INFO* pCBInfo = NULL; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1016 | uint64_t fenceId = add_fence_info(fence, queue); |
Mark Lobodzinski | ed450b0 | 2015-04-07 13:38:21 -0500 | [diff] [blame] | 1017 | |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1018 | print_mem_list(queue); |
| 1019 | printCBList(queue); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1020 | for (uint32_t i = 0; i < cmdBufferCount; i++) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1021 | pCBInfo = get_cmd_buf_info(pCmdBuffers[i]); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1022 | pCBInfo->fenceId = fenceId; |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1023 | pCBInfo->lastSubmittedFence = fence; |
| 1024 | pCBInfo->lastSubmittedQueue = queue; |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1025 | } |
Mark Lobodzinski | ed450b0 | 2015-04-07 13:38:21 -0500 | [diff] [blame] | 1026 | |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1027 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1028 | VkResult result = device_dispatch_table(queue)->QueueSubmit( |
| 1029 | queue, cmdBufferCount, pCmdBuffers, fence); |
Courtney Goeltzenleuchter | d3fb955 | 2015-04-02 13:39:07 -0600 | [diff] [blame] | 1030 | return result; |
| 1031 | } |
| 1032 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1033 | VK_LAYER_EXPORT VkResult VKAPI vkAllocMemory( |
| 1034 | VkDevice device, |
| 1035 | const VkMemoryAllocInfo *pAllocInfo, |
| 1036 | VkDeviceMemory *pMem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1037 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1038 | VkResult result = device_dispatch_table(device)->AllocMemory(device, pAllocInfo, pMem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1039 | // TODO : Track allocations and overall size here |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1040 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1041 | add_mem_obj_info(device, *pMem, pAllocInfo); |
| 1042 | print_mem_list(device); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1043 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1044 | return result; |
| 1045 | } |
| 1046 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1047 | VK_LAYER_EXPORT VkResult VKAPI vkFreeMemory( |
| 1048 | VkDevice device, |
| 1049 | VkDeviceMemory mem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1050 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1051 | /* From spec : A memory object is freed by calling vkFreeMemory() when it is no longer needed. Before |
Tobin Ehlis | c0418f9 | 2014-11-25 14:47:20 -0700 | [diff] [blame] | 1052 | * freeing a memory object, an application must ensure the memory object is unbound from |
| 1053 | * all API objects referencing it and that it is not referenced by any queued command buffers |
| 1054 | */ |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1055 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1056 | bool32_t noerror = freeMemObjInfo(device, mem, false); |
| 1057 | print_mem_list(device); |
| 1058 | print_object_list(device); |
| 1059 | printCBList(device); |
Mark Lobodzinski | 3780e14 | 2015-05-14 15:08:13 -0500 | [diff] [blame] | 1060 | // Output an warning message for proper error/warning handling |
| 1061 | if (noerror == VK_FALSE) { |
| 1062 | char str[1024]; |
| 1063 | sprintf(str, "Freeing memory object while it still has references: mem obj %p", (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1064 | device_log_msg(device, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_FREED_MEM_REF, "MEM", str); |
Mark Lobodzinski | 3780e14 | 2015-05-14 15:08:13 -0500 | [diff] [blame] | 1065 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1066 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1067 | VkResult result = device_dispatch_table(device)->FreeMemory(device, mem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1068 | return result; |
| 1069 | } |
| 1070 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1071 | VK_LAYER_EXPORT VkResult VKAPI vkSetMemoryPriority( |
| 1072 | VkDevice device, |
| 1073 | VkDeviceMemory mem, |
| 1074 | VkMemoryPriority priority) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1075 | { |
| 1076 | // TODO : Update tracking for this alloc |
| 1077 | // Make sure memory is not pinned, which can't have priority set |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1078 | VkResult result = device_dispatch_table(device)->SetMemoryPriority(device, mem, priority); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1079 | return result; |
| 1080 | } |
| 1081 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1082 | VK_LAYER_EXPORT VkResult VKAPI vkMapMemory( |
| 1083 | VkDevice device, |
| 1084 | VkDeviceMemory mem, |
| 1085 | VkDeviceSize offset, |
| 1086 | VkDeviceSize size, |
| 1087 | VkFlags flags, |
| 1088 | void **ppData) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1089 | { |
| 1090 | // TODO : Track when memory is mapped |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1091 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1092 | MT_MEM_OBJ_INFO *pMemObj = get_mem_obj_info(mem); |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 1093 | if ((pMemObj->allocInfo.memProps & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) == 0) { |
Mark Lobodzinski | 95152dc | 2015-02-25 12:16:04 -0600 | [diff] [blame] | 1094 | char str[1024]; |
Mark Lobodzinski | 3780e14 | 2015-05-14 15:08:13 -0500 | [diff] [blame] | 1095 | sprintf(str, "Mapping Memory without VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT set: mem obj %p", (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1096 | device_log_msg(device, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE_MEMORY, mem, 0, MEMTRACK_INVALID_STATE, "MEM", str); |
Mark Lobodzinski | 95152dc | 2015-02-25 12:16:04 -0600 | [diff] [blame] | 1097 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1098 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1099 | VkResult result = device_dispatch_table(device)->MapMemory(device, mem, offset, size, flags, ppData); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1100 | return result; |
| 1101 | } |
| 1102 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1103 | VK_LAYER_EXPORT VkResult VKAPI vkUnmapMemory( |
| 1104 | VkDevice device, |
| 1105 | VkDeviceMemory mem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1106 | { |
| 1107 | // TODO : Track as memory gets unmapped, do we want to check what changed following map? |
| 1108 | // Make sure that memory was ever mapped to begin with |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1109 | VkResult result = device_dispatch_table(device)->UnmapMemory(device, mem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1110 | return result; |
| 1111 | } |
| 1112 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1113 | VK_LAYER_EXPORT VkResult VKAPI vkPinSystemMemory( |
| 1114 | VkDevice device, |
| 1115 | const void *pSysMem, |
| 1116 | size_t memSize, |
| 1117 | VkDeviceMemory *pMem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1118 | { |
| 1119 | // TODO : Track this |
| 1120 | // Verify that memory is actually pinnable |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1121 | VkResult result = device_dispatch_table(device)->PinSystemMemory(device, pSysMem, memSize, pMem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1122 | return result; |
| 1123 | } |
| 1124 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1125 | VK_LAYER_EXPORT VkResult VKAPI vkOpenSharedMemory( |
| 1126 | VkDevice device, |
| 1127 | const VkMemoryOpenInfo *pOpenInfo, |
| 1128 | VkDeviceMemory *pMem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1129 | { |
| 1130 | // TODO : Track this |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1131 | VkResult result = device_dispatch_table(device)->OpenSharedMemory(device, pOpenInfo, pMem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1132 | return result; |
| 1133 | } |
| 1134 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1135 | VK_LAYER_EXPORT VkResult VKAPI vkOpenPeerMemory( |
| 1136 | VkDevice device, |
| 1137 | const VkPeerMemoryOpenInfo *pOpenInfo, |
| 1138 | VkDeviceMemory *pMem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1139 | { |
| 1140 | // TODO : Track this |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1141 | VkResult result = device_dispatch_table(device)->OpenPeerMemory(device, pOpenInfo, pMem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1142 | return result; |
| 1143 | } |
| 1144 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1145 | VK_LAYER_EXPORT VkResult VKAPI vkOpenPeerImage( |
| 1146 | VkDevice device, |
| 1147 | const VkPeerImageOpenInfo *pOpenInfo, |
| 1148 | VkImage *pImage, |
| 1149 | VkDeviceMemory *pMem) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1150 | { |
| 1151 | // TODO : Track this |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1152 | VkResult result = device_dispatch_table(device)->OpenPeerImage(device, pOpenInfo, pImage, pMem); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1153 | return result; |
| 1154 | } |
| 1155 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1156 | VK_LAYER_EXPORT VkResult VKAPI vkDestroyObject( |
| 1157 | VkDevice device, |
| 1158 | VkObjectType objType, |
| 1159 | VkObject object) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1160 | { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 1161 | unordered_map<VkObject, MT_OBJ_INFO>::iterator item; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1162 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 1163 | |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1164 | // First check if this is a CmdBuffer or fence |
| 1165 | switch (objType) { |
| 1166 | case VK_OBJECT_TYPE_COMMAND_BUFFER: |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1167 | delete_cmd_buf_info((VkCmdBuffer)object); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1168 | break; |
| 1169 | case VK_OBJECT_TYPE_FENCE: |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1170 | delete_fence_info((VkFence)object); |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1171 | break; |
| 1172 | default: |
| 1173 | break; |
Tobin Ehlis | a98df73 | 2014-11-27 07:52:04 -0700 | [diff] [blame] | 1174 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 1175 | |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1176 | if ((item = objectMap.find(object)) != objectMap.end()) { |
Mike Stroyan | dd7aed7 | 2015-05-19 17:03:40 -0600 | [diff] [blame] | 1177 | MT_OBJ_INFO* pDelInfo = &(*item).second; |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1178 | if (pDelInfo->pMemObjInfo) { |
Tobin Ehlis | a98df73 | 2014-11-27 07:52:04 -0700 | [diff] [blame] | 1179 | // Wsi allocated Memory is tied to image object so clear the binding and free that memory automatically |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1180 | if (0 == pDelInfo->pMemObjInfo->allocInfo.allocationSize) { // Wsi allocated memory has NULL allocInfo w/ 0 size |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 1181 | VkDeviceMemory memToFree = pDelInfo->pMemObjInfo->mem; |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1182 | clear_object_binding(object); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1183 | freeMemObjInfo(device, memToFree, true); |
Courtney Goeltzenleuchter | 1c943a7 | 2015-03-26 16:15:39 -0600 | [diff] [blame] | 1184 | } |
| 1185 | else { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1186 | // Remove this object from memory object's reference list and decrement its ref counter |
| 1187 | clear_object_binding(object); |
Tobin Ehlis | a98df73 | 2014-11-27 07:52:04 -0700 | [diff] [blame] | 1188 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1189 | } |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1190 | objectMap.erase(item); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1191 | } |
Mark Lobodzinski | b6ddb46 | 2015-03-24 16:29:24 -0500 | [diff] [blame] | 1192 | |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1193 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1194 | VkResult result = device_dispatch_table(device)->DestroyObject(device, objType, object); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1195 | return result; |
| 1196 | } |
| 1197 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1198 | VK_LAYER_EXPORT VkResult VKAPI vkGetObjectInfo( |
| 1199 | VkDevice device, |
| 1200 | VkObjectType objType, |
| 1201 | VkObject object, |
| 1202 | VkObjectInfoType infoType, |
| 1203 | size_t *pDataSize, |
| 1204 | void *pData) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1205 | { |
| 1206 | // TODO : What to track here? |
Mark Lobodzinski | 942b172 | 2015-05-11 17:21:15 -0500 | [diff] [blame] | 1207 | // Could potentially save returned mem requirements and validate values passed into BindObjectMemory for this object |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1208 | // From spec : The only objects that are guaranteed to have no external memory requirements are devices, queues, |
| 1209 | // command buffers, shaders and memory objects. |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1210 | VkResult result = device_dispatch_table(device)->GetObjectInfo(device, objType, object, infoType, pDataSize, pData); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1211 | return result; |
| 1212 | } |
| 1213 | |
Mark Lobodzinski | 942b172 | 2015-05-11 17:21:15 -0500 | [diff] [blame] | 1214 | VK_LAYER_EXPORT VkResult VKAPI vkBindObjectMemory( |
| 1215 | VkDevice device, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1216 | VkObjectType objType, |
| 1217 | VkObject object, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1218 | VkDeviceMemory mem, |
| 1219 | VkDeviceSize offset) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1220 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1221 | VkResult result = device_dispatch_table(device)->BindObjectMemory(device, objType, object, mem, offset); |
Mike Stroyan | b050c68 | 2015-04-17 12:36:38 -0600 | [diff] [blame] | 1222 | loader_platform_thread_lock_mutex(&globalLock); |
| 1223 | // Track objects tied to memory |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1224 | set_object_binding(object, mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1225 | print_object_list(device); |
| 1226 | print_mem_list(device); |
Mike Stroyan | b050c68 | 2015-04-17 12:36:38 -0600 | [diff] [blame] | 1227 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1228 | return result; |
| 1229 | } |
| 1230 | |
Mark Lobodzinski | 942b172 | 2015-05-11 17:21:15 -0500 | [diff] [blame] | 1231 | VK_LAYER_EXPORT VkResult VKAPI vkQueueBindSparseBufferMemory( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1232 | VkQueue queue, |
Mark Lobodzinski | 942b172 | 2015-05-11 17:21:15 -0500 | [diff] [blame] | 1233 | VkBuffer buffer, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1234 | VkDeviceSize rangeOffset, |
| 1235 | VkDeviceSize rangeSize, |
| 1236 | VkDeviceMemory mem, |
| 1237 | VkDeviceSize memOffset) |
Mike Stroyan | b050c68 | 2015-04-17 12:36:38 -0600 | [diff] [blame] | 1238 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1239 | VkResult result = device_dispatch_table(queue)->QueueBindSparseBufferMemory( |
| 1240 | queue, buffer, rangeOffset, rangeSize, mem, memOffset); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1241 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1242 | // Track objects tied to memory |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1243 | if (VK_FALSE == set_sparse_buffer_binding(buffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1244 | char str[1024]; |
Mark Lobodzinski | 942b172 | 2015-05-11 17:21:15 -0500 | [diff] [blame] | 1245 | sprintf(str, "Unable to set object %p binding to mem obj %p", (void*)buffer, (void*)mem); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1246 | device_log_msg(queue, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_BUFFER, buffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1247 | } |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1248 | print_object_list(queue); |
| 1249 | print_mem_list(queue); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1250 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1251 | return result; |
| 1252 | } |
| 1253 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1254 | VK_LAYER_EXPORT VkResult VKAPI vkCreateFence( |
| 1255 | VkDevice device, |
| 1256 | const VkFenceCreateInfo *pCreateInfo, |
| 1257 | VkFence *pFence) |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1258 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1259 | VkResult result = device_dispatch_table(device)->CreateFence(device, pCreateInfo, pFence); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1260 | if (VK_SUCCESS == result) { |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1261 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1262 | add_object_info(*pFence, pCreateInfo->sType, pCreateInfo, sizeof(VkFenceCreateInfo), "fence"); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1263 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1264 | } |
| 1265 | return result; |
| 1266 | } |
| 1267 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1268 | VK_LAYER_EXPORT VkResult VKAPI vkResetFences( |
| 1269 | VkDevice device, |
| 1270 | uint32_t fenceCount, |
| 1271 | VkFence *pFences) |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1272 | { |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 1273 | /* |
| 1274 | * TODO: Shouldn't we check for error conditions before passing down the chain? |
| 1275 | * What if reason result is not VK_SUCCESS is something we could report as a validation error? |
| 1276 | */ |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1277 | VkResult result = device_dispatch_table(device)->ResetFences(device, fenceCount, pFences); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1278 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1279 | loader_platform_thread_lock_mutex(&globalLock); |
| 1280 | // Reset fence state in fenceCreateInfo structure |
| 1281 | for (uint32_t i = 0; i < fenceCount; i++) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1282 | MT_OBJ_INFO* pObjectInfo = get_object_info(pFences[i]); |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1283 | if (pObjectInfo != NULL) { |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 1284 | // Validate fences in SIGNALED state |
Tobin Ehlis | b870cbb | 2015-04-15 07:46:12 -0600 | [diff] [blame] | 1285 | if (!(pObjectInfo->create_info.fence_create_info.flags & VK_FENCE_CREATE_SIGNALED_BIT)) { |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 1286 | char str[1024]; |
Mark Lobodzinski | b268921 | 2015-04-14 14:09:32 -0500 | [diff] [blame] | 1287 | sprintf(str, "Fence %p submitted to VkResetFences in UNSIGNALED STATE", pFences[i]); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1288 | device_log_msg(device, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_FENCE, pFences[i], 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", str); |
Tobin Ehlis | b870cbb | 2015-04-15 07:46:12 -0600 | [diff] [blame] | 1289 | result = VK_ERROR_INVALID_VALUE; |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 1290 | } |
| 1291 | else { |
| 1292 | pObjectInfo->create_info.fence_create_info.flags = |
Tobin Ehlis | b870cbb | 2015-04-15 07:46:12 -0600 | [diff] [blame] | 1293 | static_cast<VkFenceCreateFlags>(pObjectInfo->create_info.fence_create_info.flags & ~VK_FENCE_CREATE_SIGNALED_BIT); |
Mark Lobodzinski | abc1bc4 | 2015-04-09 13:46:09 -0500 | [diff] [blame] | 1294 | } |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1295 | } |
| 1296 | } |
| 1297 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1298 | } |
| 1299 | return result; |
| 1300 | } |
| 1301 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1302 | VK_LAYER_EXPORT VkResult VKAPI vkGetFenceStatus( |
| 1303 | VkDevice device, |
| 1304 | VkFence fence) |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1305 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1306 | VkResult result = device_dispatch_table(device)->GetFenceStatus(device, fence); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1307 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1308 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1309 | update_fence_tracking(fence); |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1310 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1311 | } |
| 1312 | return result; |
| 1313 | } |
| 1314 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1315 | VK_LAYER_EXPORT VkResult VKAPI vkWaitForFences( |
| 1316 | VkDevice device, |
| 1317 | uint32_t fenceCount, |
| 1318 | const VkFence *pFences, |
| 1319 | bool32_t waitAll, |
| 1320 | uint64_t timeout) |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1321 | { |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1322 | // Verify fence status of submitted fences |
| 1323 | for(uint32_t i = 0; i < fenceCount; i++) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1324 | MT_OBJ_INFO* pObjectInfo = get_object_info(pFences[i]); |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1325 | if (pObjectInfo != NULL) { |
Tobin Ehlis | b870cbb | 2015-04-15 07:46:12 -0600 | [diff] [blame] | 1326 | if (pObjectInfo->create_info.fence_create_info.flags & VK_FENCE_CREATE_SIGNALED_BIT) { |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1327 | char str[1024]; |
Mark Lobodzinski | b268921 | 2015-04-14 14:09:32 -0500 | [diff] [blame] | 1328 | sprintf(str, "VkWaitForFences specified fence %p already in SIGNALED state.", pFences[i]); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1329 | device_log_msg(device, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_FENCE, pFences[i], 0, MEMTRACK_INVALID_FENCE_STATE, "MEM", str); |
Mark Lobodzinski | 148e158 | 2015-04-07 16:07:57 -0500 | [diff] [blame] | 1330 | } |
| 1331 | } |
| 1332 | } |
| 1333 | |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1334 | VkResult result = device_dispatch_table(device)->WaitForFences(device, fenceCount, pFences, waitAll, timeout); |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1335 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 5093297 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 1336 | |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1337 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 5093297 | 2015-04-02 20:49:09 -0500 | [diff] [blame] | 1338 | if (waitAll || fenceCount == 1) { // Clear all the fences |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1339 | for(uint32_t i = 0; i < fenceCount; i++) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1340 | update_fence_tracking(pFences[i]); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1341 | } |
| 1342 | } |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1343 | } |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1344 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1345 | return result; |
| 1346 | } |
| 1347 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1348 | VK_LAYER_EXPORT VkResult VKAPI vkQueueWaitIdle( |
| 1349 | VkQueue queue) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1350 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1351 | VkResult result = device_dispatch_table(queue)->QueueWaitIdle(queue); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1352 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1353 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1354 | retire_queue_fences(queue); |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1355 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1356 | } |
| 1357 | return result; |
| 1358 | } |
| 1359 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1360 | VK_LAYER_EXPORT VkResult VKAPI vkDeviceWaitIdle( |
| 1361 | VkDevice device) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1362 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1363 | VkResult result = device_dispatch_table(device)->DeviceWaitIdle(device); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1364 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1365 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1366 | retire_device_fences(device); |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 1367 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1368 | } |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1369 | return result; |
| 1370 | } |
| 1371 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1372 | VK_LAYER_EXPORT VkResult VKAPI vkCreateEvent( |
| 1373 | VkDevice device, |
| 1374 | const VkEventCreateInfo *pCreateInfo, |
| 1375 | VkEvent *pEvent) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1376 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1377 | VkResult result = device_dispatch_table(device)->CreateEvent(device, pCreateInfo, pEvent); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1378 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1379 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1380 | add_object_info(*pEvent, pCreateInfo->sType, pCreateInfo, sizeof(VkEventCreateInfo), "event"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1381 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | c52b775 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 1382 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1383 | return result; |
| 1384 | } |
| 1385 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1386 | VK_LAYER_EXPORT VkResult VKAPI vkCreateQueryPool( |
| 1387 | VkDevice device, |
| 1388 | const VkQueryPoolCreateInfo *pCreateInfo, |
| 1389 | VkQueryPool *pQueryPool) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1390 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1391 | VkResult result = device_dispatch_table(device)->CreateQueryPool(device, pCreateInfo, pQueryPool); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1392 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1393 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1394 | add_object_info(*pQueryPool, pCreateInfo->sType, pCreateInfo, sizeof(VkQueryPoolCreateInfo), "query_pool"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1395 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | c52b775 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 1396 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1397 | return result; |
| 1398 | } |
| 1399 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1400 | VK_LAYER_EXPORT VkResult VKAPI vkCreateBuffer( |
| 1401 | VkDevice device, |
| 1402 | const VkBufferCreateInfo *pCreateInfo, |
| 1403 | VkBuffer *pBuffer) |
Tobin Ehlis | 7265e83 | 2015-01-19 08:42:29 -0700 | [diff] [blame] | 1404 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1405 | VkResult result = device_dispatch_table(device)->CreateBuffer(device, pCreateInfo, pBuffer); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1406 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1407 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1408 | add_object_info(*pBuffer, pCreateInfo->sType, pCreateInfo, sizeof(VkBufferCreateInfo), "buffer"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1409 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | c52b775 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 1410 | } |
Tobin Ehlis | 7265e83 | 2015-01-19 08:42:29 -0700 | [diff] [blame] | 1411 | return result; |
| 1412 | } |
| 1413 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1414 | VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView( |
| 1415 | VkDevice device, |
| 1416 | const VkBufferViewCreateInfo *pCreateInfo, |
| 1417 | VkBufferView *pView) |
Tobin Ehlis | 7265e83 | 2015-01-19 08:42:29 -0700 | [diff] [blame] | 1418 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1419 | VkResult result = device_dispatch_table(device)->CreateBufferView(device, pCreateInfo, pView); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1420 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1421 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1422 | add_object_info(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VkBufferViewCreateInfo), "buffer_view"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1423 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | c52b775 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 1424 | } |
Tobin Ehlis | 7265e83 | 2015-01-19 08:42:29 -0700 | [diff] [blame] | 1425 | return result; |
| 1426 | } |
| 1427 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1428 | VK_LAYER_EXPORT VkResult VKAPI vkCreateImage( |
| 1429 | VkDevice device, |
| 1430 | const VkImageCreateInfo *pCreateInfo, |
| 1431 | VkImage *pImage) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1432 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1433 | VkResult result = device_dispatch_table(device)->CreateImage(device, pCreateInfo, pImage); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1434 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1435 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1436 | add_object_info(*pImage, pCreateInfo->sType, pCreateInfo, sizeof(VkImageCreateInfo), "image"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1437 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1438 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1439 | return result; |
| 1440 | } |
| 1441 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1442 | VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView( |
| 1443 | VkDevice device, |
| 1444 | const VkImageViewCreateInfo *pCreateInfo, |
| 1445 | VkImageView *pView) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1446 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1447 | VkResult result = device_dispatch_table(device)->CreateImageView(device, pCreateInfo, pView); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1448 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1449 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1450 | add_object_info(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VkImageViewCreateInfo), "image_view"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1451 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1452 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1453 | return result; |
| 1454 | } |
| 1455 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1456 | VK_LAYER_EXPORT VkResult VKAPI vkCreateColorAttachmentView( |
| 1457 | VkDevice device, |
| 1458 | const VkColorAttachmentViewCreateInfo *pCreateInfo, |
| 1459 | VkColorAttachmentView *pView) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1460 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1461 | VkResult result = device_dispatch_table(device)->CreateColorAttachmentView(device, pCreateInfo, pView); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1462 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1463 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1464 | add_object_info(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VkColorAttachmentViewCreateInfo), "color_attachment_view"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1465 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1466 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1467 | return result; |
| 1468 | } |
| 1469 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1470 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDepthStencilView( |
| 1471 | VkDevice device, |
| 1472 | const VkDepthStencilViewCreateInfo *pCreateInfo, |
| 1473 | VkDepthStencilView *pView) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1474 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1475 | VkResult result = device_dispatch_table(device)->CreateDepthStencilView(device, pCreateInfo, pView); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1476 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1477 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1478 | add_object_info(*pView, pCreateInfo->sType, pCreateInfo, sizeof(VkDepthStencilViewCreateInfo), "ds_view"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1479 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1480 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1481 | return result; |
| 1482 | } |
| 1483 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1484 | VK_LAYER_EXPORT VkResult VKAPI vkCreateShader( |
| 1485 | VkDevice device, |
| 1486 | const VkShaderCreateInfo *pCreateInfo, |
| 1487 | VkShader *pShader) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1488 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1489 | VkResult result = device_dispatch_table(device)->CreateShader(device, pCreateInfo, pShader); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1490 | return result; |
| 1491 | } |
| 1492 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1493 | VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipeline( |
| 1494 | VkDevice device, |
| 1495 | const VkGraphicsPipelineCreateInfo *pCreateInfo, |
| 1496 | VkPipeline *pPipeline) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1497 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1498 | VkResult result = device_dispatch_table(device)->CreateGraphicsPipeline(device, pCreateInfo, pPipeline); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1499 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1500 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1501 | add_object_info(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(VkGraphicsPipelineCreateInfo), "graphics_pipeline"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1502 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1503 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1504 | return result; |
| 1505 | } |
| 1506 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1507 | VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelineDerivative( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1508 | VkDevice device, |
| 1509 | const VkGraphicsPipelineCreateInfo *pCreateInfo, |
| 1510 | VkPipeline basePipeline, |
| 1511 | VkPipeline *pPipeline) |
Courtney Goeltzenleuchter | 0d40f15 | 2015-03-25 15:37:49 -0600 | [diff] [blame] | 1512 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1513 | VkResult result = device_dispatch_table(device)->CreateGraphicsPipelineDerivative( |
| 1514 | device, pCreateInfo, basePipeline, pPipeline); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1515 | if (result == VK_SUCCESS) { |
Courtney Goeltzenleuchter | 0d40f15 | 2015-03-25 15:37:49 -0600 | [diff] [blame] | 1516 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1517 | add_object_info(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(VkGraphicsPipelineCreateInfo), "graphics_pipeline"); |
Courtney Goeltzenleuchter | 0d40f15 | 2015-03-25 15:37:49 -0600 | [diff] [blame] | 1518 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1519 | } |
| 1520 | return result; |
| 1521 | } |
| 1522 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1523 | VK_LAYER_EXPORT VkResult VKAPI vkCreateComputePipeline( |
| 1524 | VkDevice device, |
| 1525 | const VkComputePipelineCreateInfo *pCreateInfo, |
| 1526 | VkPipeline *pPipeline) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1527 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1528 | VkResult result = device_dispatch_table(device)->CreateComputePipeline(device, pCreateInfo, pPipeline); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1529 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1530 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1531 | add_object_info(*pPipeline, pCreateInfo->sType, pCreateInfo, sizeof(VkComputePipelineCreateInfo), "compute_pipeline"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1532 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1533 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1534 | return result; |
| 1535 | } |
| 1536 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1537 | VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler( |
| 1538 | VkDevice device, |
| 1539 | const VkSamplerCreateInfo *pCreateInfo, |
| 1540 | VkSampler *pSampler) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1541 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1542 | VkResult result = device_dispatch_table(device)->CreateSampler(device, pCreateInfo, pSampler); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1543 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1544 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1545 | add_object_info(*pSampler, pCreateInfo->sType, pCreateInfo, sizeof(VkSamplerCreateInfo), "sampler"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1546 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1547 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1548 | return result; |
| 1549 | } |
| 1550 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1551 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicViewportState( |
| 1552 | VkDevice device, |
| 1553 | const VkDynamicVpStateCreateInfo *pCreateInfo, |
| 1554 | VkDynamicVpState *pState) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1555 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1556 | VkResult result = device_dispatch_table(device)->CreateDynamicViewportState(device, pCreateInfo, pState); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1557 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1558 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1559 | add_object_info(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VkDynamicVpStateCreateInfo), "viewport_state"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1560 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1561 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1562 | return result; |
| 1563 | } |
| 1564 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1565 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicRasterState( |
| 1566 | VkDevice device, |
| 1567 | const VkDynamicRsStateCreateInfo *pCreateInfo, |
| 1568 | VkDynamicRsState *pState) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1569 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1570 | VkResult result = device_dispatch_table(device)->CreateDynamicRasterState(device, pCreateInfo, pState); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1571 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1572 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1573 | add_object_info(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VkDynamicRsStateCreateInfo), "raster_state"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1574 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1575 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1576 | return result; |
| 1577 | } |
| 1578 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1579 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState( |
| 1580 | VkDevice device, |
| 1581 | const VkDynamicCbStateCreateInfo *pCreateInfo, |
| 1582 | VkDynamicCbState *pState) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1583 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1584 | VkResult result = device_dispatch_table(device)->CreateDynamicColorBlendState(device, pCreateInfo, pState); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1585 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1586 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1587 | add_object_info(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VkDynamicCbStateCreateInfo), "cb_state"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1588 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1589 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1590 | return result; |
| 1591 | } |
| 1592 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1593 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDynamicDepthStencilState( |
| 1594 | VkDevice device, |
| 1595 | const VkDynamicDsStateCreateInfo *pCreateInfo, |
| 1596 | VkDynamicDsState *pState) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1597 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1598 | VkResult result = device_dispatch_table(device)->CreateDynamicDepthStencilState(device, pCreateInfo, pState); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1599 | if (result == VK_SUCCESS) { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1600 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1601 | add_object_info(*pState, pCreateInfo->sType, pCreateInfo, sizeof(VkDynamicDsStateCreateInfo), "ds_state"); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1602 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 8be20fd | 2015-01-07 17:49:29 -0700 | [diff] [blame] | 1603 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1604 | return result; |
| 1605 | } |
| 1606 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1607 | VK_LAYER_EXPORT VkResult VKAPI vkCreateCommandBuffer( |
| 1608 | VkDevice device, |
| 1609 | const VkCmdBufferCreateInfo *pCreateInfo, |
| 1610 | VkCmdBuffer *pCmdBuffer) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1611 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1612 | VkResult result = device_dispatch_table(device)->CreateCommandBuffer(device, pCreateInfo, pCmdBuffer); |
Mark Lobodzinski | 223ca20 | 2015-04-02 08:52:53 -0500 | [diff] [blame] | 1613 | // At time of cmd buffer creation, create global cmd buffer info for the returned cmd buffer |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1614 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1615 | if (*pCmdBuffer) |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1616 | add_cmd_buf_info(*pCmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1617 | printCBList(device); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1618 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1619 | return result; |
| 1620 | } |
| 1621 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1622 | VK_LAYER_EXPORT VkResult VKAPI vkBeginCommandBuffer( |
| 1623 | VkCmdBuffer cmdBuffer, |
| 1624 | const VkCmdBufferBeginInfo *pBeginInfo) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1625 | { |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1626 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1627 | // This implicitly resets the Cmd Buffer so make sure any fence is done and then clear memory references |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1628 | if (!checkCBCompleted(cmdBuffer)) { |
| 1629 | char str[1024]; |
| 1630 | sprintf(str, "Calling vkBeginCommandBuffer() on active CB %p before it has completed. " |
| 1631 | "You must check CB flag before this call.", cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1632 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", str); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1633 | } |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1634 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1635 | VkResult result = device_dispatch_table(cmdBuffer)->BeginCommandBuffer(cmdBuffer, pBeginInfo); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1636 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1637 | clear_cmd_buf_and_mem_references(cmdBuffer); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1638 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1639 | return result; |
| 1640 | } |
| 1641 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1642 | VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer( |
| 1643 | VkCmdBuffer cmdBuffer) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1644 | { |
| 1645 | // TODO : Anything to do here? |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1646 | VkResult result = device_dispatch_table(cmdBuffer)->EndCommandBuffer(cmdBuffer); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1647 | return result; |
| 1648 | } |
| 1649 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1650 | VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer( |
| 1651 | VkCmdBuffer cmdBuffer) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1652 | { |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1653 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1654 | // Verify that CB is complete (not in-flight) |
Mike Stroyan | 950496e | 2015-05-19 15:16:08 -0600 | [diff] [blame] | 1655 | if (!checkCBCompleted(cmdBuffer)) { |
| 1656 | char str[1024]; |
| 1657 | sprintf(str, "Resetting CB %p before it has completed. You must check CB flag before " |
| 1658 | "calling vkResetCommandBuffer().", cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1659 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_RESET_CB_WHILE_IN_FLIGHT, "MEM", str); |
Tobin Ehlis | c9dbcd5 | 2015-03-04 08:38:22 -0700 | [diff] [blame] | 1660 | } |
| 1661 | // Clear memory references as this point. |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1662 | clear_cmd_buf_and_mem_references(cmdBuffer); |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1663 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1664 | VkResult result = device_dispatch_table(cmdBuffer)->ResetCommandBuffer(cmdBuffer); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1665 | return result; |
| 1666 | } |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1667 | // TODO : For any vkCmdBind* calls that include an object which has mem bound to it, |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1668 | // need to account for that mem now having binding to given cmdBuffer |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1669 | VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline( |
| 1670 | VkCmdBuffer cmdBuffer, |
| 1671 | VkPipelineBindPoint pipelineBindPoint, |
| 1672 | VkPipeline pipeline) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1673 | { |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1674 | #if 0 |
| 1675 | // TODO : If memory bound to pipeline, then need to tie that mem to cmdBuffer |
| 1676 | if (getPipeline(pipeline)) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1677 | MT_CB_INFO *pCBInfo = get_cmd_buf_info(cmdBuffer); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1678 | if (pCBInfo) { |
| 1679 | pCBInfo->pipelines[pipelineBindPoint] = pipeline; |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1680 | } else { |
| 1681 | char str[1024]; |
| 1682 | sprintf(str, "Attempt to bind Pipeline %p to non-existant command buffer %p!", (void*)pipeline, cmdBuffer); |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1683 | layerCbMsg(VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_INVALID_CB, (char *) "DS", (char *) str); |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1684 | } |
| 1685 | } |
| 1686 | else { |
| 1687 | char str[1024]; |
| 1688 | sprintf(str, "Attempt to bind Pipeline %p that doesn't exist!", (void*)pipeline); |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1689 | layerCbMsg(VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline, 0, MEMTRACK_INVALID_OBJECT, (char *) "DS", (char *) str); |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1690 | } |
| 1691 | #endif |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1692 | device_dispatch_table(cmdBuffer)->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1693 | } |
| 1694 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1695 | VK_LAYER_EXPORT void VKAPI vkCmdBindDynamicStateObject( |
| 1696 | VkCmdBuffer cmdBuffer, |
| 1697 | VkStateBindPoint stateBindPoint, |
| 1698 | VkDynamicStateObject state) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1699 | { |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1700 | MT_OBJ_INFO *pObjInfo; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1701 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1702 | MT_CB_INFO *pCmdBuf = get_cmd_buf_info(cmdBuffer); |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1703 | if (!pCmdBuf) { |
| 1704 | char str[1024]; |
| 1705 | sprintf(str, "Unable to find command buffer object %p, was it ever created?", (void*)cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1706 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_INVALID_CB, "DD", str); |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1707 | } |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1708 | pObjInfo = get_object_info(state); |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1709 | if (!pObjInfo) { |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1710 | char str[1024]; |
| 1711 | sprintf(str, "Unable to find dynamic state object %p, was it ever created?", (void*)state); |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1712 | /* TODO: put in real object type */ |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1713 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, state, 0, MEMTRACK_INVALID_OBJECT, "DD", str); |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1714 | } |
Mark Lobodzinski | 6434eff | 2015-03-31 16:05:35 -0500 | [diff] [blame] | 1715 | pCmdBuf->pDynamicState[stateBindPoint] = pObjInfo; |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1716 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1717 | device_dispatch_table(cmdBuffer)->CmdBindDynamicStateObject(cmdBuffer, stateBindPoint, state); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1718 | } |
| 1719 | |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1720 | VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1721 | VkCmdBuffer cmdBuffer, |
| 1722 | VkPipelineBindPoint pipelineBindPoint, |
| 1723 | uint32_t firstSet, |
| 1724 | uint32_t setCount, |
| 1725 | const VkDescriptorSet *pDescriptorSets, |
| 1726 | uint32_t dynamicOffsetCount, |
| 1727 | const uint32_t *pDynamicOffsets) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1728 | { |
Tobin Ehlis | c145be8 | 2015-01-08 15:22:32 -0700 | [diff] [blame] | 1729 | // TODO : Somewhere need to verify that all textures referenced by shaders in DS are in some type of *SHADER_READ* state |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1730 | device_dispatch_table(cmdBuffer)->CmdBindDescriptorSets( |
| 1731 | cmdBuffer, pipelineBindPoint, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1732 | } |
| 1733 | |
Courtney Goeltzenleuchter | f68ad72 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 1734 | VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers( |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1735 | VkCmdBuffer cmdBuffer, |
| 1736 | uint32_t startBinding, |
| 1737 | uint32_t bindingCount, |
| 1738 | const VkBuffer *pBuffers, |
| 1739 | const VkDeviceSize *pOffsets) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1740 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1741 | device_dispatch_table(cmdBuffer)->CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets); |
Chia-I Wu | 1915682 | 2015-01-05 13:42:56 +0800 | [diff] [blame] | 1742 | } |
| 1743 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1744 | VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer( |
| 1745 | VkCmdBuffer cmdBuffer, |
| 1746 | VkBuffer buffer, |
| 1747 | VkDeviceSize offset, |
| 1748 | VkIndexType indexType) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1749 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1750 | device_dispatch_table(cmdBuffer)->CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1751 | } |
| 1752 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1753 | VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect( |
| 1754 | VkCmdBuffer cmdBuffer, |
| 1755 | VkBuffer buffer, |
| 1756 | VkDeviceSize offset, |
| 1757 | uint32_t count, |
| 1758 | uint32_t stride) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1759 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1760 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1761 | VkDeviceMemory mem = get_mem_binding_from_object(buffer); |
| 1762 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1763 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1764 | sprintf(str, "In vkCmdDrawIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1765 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1766 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1767 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1768 | device_dispatch_table(cmdBuffer)->CmdDrawIndirect(cmdBuffer, buffer, offset, count, stride); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1769 | } |
| 1770 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1771 | VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect( |
| 1772 | VkCmdBuffer cmdBuffer, |
| 1773 | VkBuffer buffer, |
| 1774 | VkDeviceSize offset, |
| 1775 | uint32_t count, |
| 1776 | uint32_t stride) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1777 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1778 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1779 | VkDeviceMemory mem = get_mem_binding_from_object(buffer); |
| 1780 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1781 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1782 | sprintf(str, "In vkCmdDrawIndexedIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1783 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1784 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1785 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1786 | device_dispatch_table(cmdBuffer)->CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1787 | } |
| 1788 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1789 | VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect( |
| 1790 | VkCmdBuffer cmdBuffer, |
| 1791 | VkBuffer buffer, |
| 1792 | VkDeviceSize offset) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1793 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1794 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1795 | VkDeviceMemory mem = get_mem_binding_from_object(buffer); |
| 1796 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1797 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1798 | sprintf(str, "In vkCmdDispatchIndirect() call unable to update binding of buffer %p to cmdBuffer %p", buffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1799 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1800 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1801 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1802 | device_dispatch_table(cmdBuffer)->CmdDispatchIndirect(cmdBuffer, buffer, offset); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1803 | } |
| 1804 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1805 | VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer( |
| 1806 | VkCmdBuffer cmdBuffer, |
| 1807 | VkBuffer srcBuffer, |
| 1808 | VkBuffer destBuffer, |
| 1809 | uint32_t regionCount, |
| 1810 | const VkBufferCopy *pRegions) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1811 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1812 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1813 | VkDeviceMemory mem = get_mem_binding_from_object(srcBuffer); |
| 1814 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1815 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1816 | sprintf(str, "In vkCmdCopyBuffer() call unable to update binding of srcBuffer %p to cmdBuffer %p", srcBuffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1817 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1818 | } |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1819 | mem = get_mem_binding_from_object(destBuffer); |
| 1820 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1821 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1822 | sprintf(str, "In vkCmdCopyBuffer() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1823 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1824 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1825 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1826 | device_dispatch_table(cmdBuffer)->CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1827 | } |
| 1828 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1829 | VK_LAYER_EXPORT void VKAPI vkCmdCopyImage( |
| 1830 | VkCmdBuffer cmdBuffer, |
| 1831 | VkImage srcImage, |
| 1832 | VkImageLayout srcImageLayout, |
| 1833 | VkImage destImage, |
| 1834 | VkImageLayout destImageLayout, |
| 1835 | uint32_t regionCount, |
| 1836 | const VkImageCopy *pRegions) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1837 | { |
| 1838 | // TODO : Each image will have mem mapping so track them |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1839 | device_dispatch_table(cmdBuffer)->CmdCopyImage( |
| 1840 | cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1841 | } |
| 1842 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1843 | VK_LAYER_EXPORT void VKAPI vkCmdBlitImage( |
| 1844 | VkCmdBuffer cmdBuffer, |
| 1845 | VkImage srcImage, |
| 1846 | VkImageLayout srcImageLayout, |
| 1847 | VkImage destImage, |
| 1848 | VkImageLayout destImageLayout, |
| 1849 | uint32_t regionCount, |
Mark Lobodzinski | ee5eef1 | 2015-05-22 14:43:25 -0500 | [diff] [blame] | 1850 | const VkImageBlit *pRegions, |
| 1851 | VkTexFilter filter) |
Courtney Goeltzenleuchter | 89299fa | 2015-03-08 17:02:18 -0600 | [diff] [blame] | 1852 | { |
| 1853 | // TODO : Each image will have mem mapping so track them |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1854 | device_dispatch_table(cmdBuffer)->CmdBlitImage( |
| 1855 | cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); |
Courtney Goeltzenleuchter | 89299fa | 2015-03-08 17:02:18 -0600 | [diff] [blame] | 1856 | } |
| 1857 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1858 | VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage( |
| 1859 | VkCmdBuffer cmdBuffer, |
| 1860 | VkBuffer srcBuffer, |
| 1861 | VkImage destImage, |
| 1862 | VkImageLayout destImageLayout, |
| 1863 | uint32_t regionCount, |
| 1864 | const VkBufferImageCopy *pRegions) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1865 | { |
| 1866 | // TODO : Track this |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1867 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1868 | VkDeviceMemory mem = get_mem_binding_from_object(destImage); |
| 1869 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1870 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1871 | sprintf(str, "In vkCmdCopyMemoryToImage() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1872 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1873 | } |
Mark Lobodzinski | c52b775 | 2015-02-18 16:38:17 -0600 | [diff] [blame] | 1874 | |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1875 | mem = get_mem_binding_from_object(srcBuffer); |
| 1876 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1877 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1878 | sprintf(str, "In vkCmdCopyMemoryToImage() call unable to update binding of srcBuffer %p to cmdBuffer %p", srcBuffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1879 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1880 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1881 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1882 | device_dispatch_table(cmdBuffer)->CmdCopyBufferToImage( |
| 1883 | cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1884 | } |
| 1885 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1886 | VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer( |
| 1887 | VkCmdBuffer cmdBuffer, |
| 1888 | VkImage srcImage, |
| 1889 | VkImageLayout srcImageLayout, |
| 1890 | VkBuffer destBuffer, |
| 1891 | uint32_t regionCount, |
| 1892 | const VkBufferImageCopy *pRegions) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1893 | { |
| 1894 | // TODO : Track this |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1895 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1896 | VkDeviceMemory mem = get_mem_binding_from_object(srcImage); |
| 1897 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1898 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1899 | sprintf(str, "In vkCmdCopyImageToMemory() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1900 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1901 | } |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1902 | mem = get_mem_binding_from_object(destBuffer); |
| 1903 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1904 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1905 | sprintf(str, "In vkCmdCopyImageToMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1906 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1907 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1908 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1909 | device_dispatch_table(cmdBuffer)->CmdCopyImageToBuffer( |
| 1910 | cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1911 | } |
| 1912 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1913 | VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer( |
| 1914 | VkCmdBuffer cmdBuffer, |
| 1915 | VkBuffer destBuffer, |
| 1916 | VkDeviceSize destOffset, |
| 1917 | VkDeviceSize dataSize, |
| 1918 | const uint32_t *pData) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1919 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1920 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1921 | VkDeviceMemory mem = get_mem_binding_from_object(destBuffer); |
| 1922 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1923 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1924 | sprintf(str, "In vkCmdUpdateMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1925 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1926 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1927 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1928 | device_dispatch_table(cmdBuffer)->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1929 | } |
| 1930 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1931 | VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer( |
| 1932 | VkCmdBuffer cmdBuffer, |
| 1933 | VkBuffer destBuffer, |
| 1934 | VkDeviceSize destOffset, |
| 1935 | VkDeviceSize fillSize, |
| 1936 | uint32_t data) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1937 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1938 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1939 | VkDeviceMemory mem = get_mem_binding_from_object(destBuffer); |
| 1940 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1941 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1942 | sprintf(str, "In vkCmdFillMemory() call unable to update binding of destBuffer %p to cmdBuffer %p", destBuffer, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1943 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1944 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1945 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1946 | device_dispatch_table(cmdBuffer)->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1947 | } |
| 1948 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1949 | VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( |
| 1950 | VkCmdBuffer cmdBuffer, |
| 1951 | VkImage image, |
| 1952 | VkImageLayout imageLayout, |
Courtney Goeltzenleuchter | d7a5cff | 2015-04-23 17:49:22 -0600 | [diff] [blame] | 1953 | const VkClearColor *pColor, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1954 | uint32_t rangeCount, |
| 1955 | const VkImageSubresourceRange *pRanges) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1956 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1957 | // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1958 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1959 | VkDeviceMemory mem = get_mem_binding_from_object(image); |
| 1960 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1961 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1962 | sprintf(str, "In vkCmdClearColorImage() call unable to update binding of image buffer %p to cmdBuffer %p", image, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1963 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1964 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1965 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1966 | device_dispatch_table(cmdBuffer)->CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1967 | } |
| 1968 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1969 | VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencil( |
| 1970 | VkCmdBuffer cmdBuffer, |
| 1971 | VkImage image, |
| 1972 | VkImageLayout imageLayout, |
| 1973 | float depth, |
| 1974 | uint32_t stencil, |
| 1975 | uint32_t rangeCount, |
| 1976 | const VkImageSubresourceRange *pRanges) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1977 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1978 | // TODO : Verify memory is in VK_IMAGE_STATE_CLEAR state |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1979 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 1980 | VkDeviceMemory mem = get_mem_binding_from_object(image); |
| 1981 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1982 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1983 | sprintf(str, "In vkCmdClearDepthStencil() call unable to update binding of image buffer %p to cmdBuffer %p", image, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 1984 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 1985 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 1986 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 1987 | device_dispatch_table(cmdBuffer)->CmdClearDepthStencil( |
| 1988 | cmdBuffer, image, imageLayout, depth, stencil, rangeCount, pRanges); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1989 | } |
| 1990 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 1991 | VK_LAYER_EXPORT void VKAPI vkCmdResolveImage( |
| 1992 | VkCmdBuffer cmdBuffer, |
| 1993 | VkImage srcImage, |
| 1994 | VkImageLayout srcImageLayout, |
| 1995 | VkImage destImage, |
| 1996 | VkImageLayout destImageLayout, |
| 1997 | uint32_t regionCount, |
| 1998 | const VkImageResolve *pRegions) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 1999 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2000 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2001 | VkDeviceMemory mem = get_mem_binding_from_object(srcImage); |
| 2002 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2003 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2004 | sprintf(str, "In vkCmdResolveImage() call unable to update binding of srcImage buffer %p to cmdBuffer %p", srcImage, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2005 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2006 | } |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2007 | mem = get_mem_binding_from_object(destImage); |
| 2008 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2009 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2010 | sprintf(str, "In vkCmdResolveImage() call unable to update binding of destImage buffer %p to cmdBuffer %p", destImage, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2011 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2012 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2013 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2014 | device_dispatch_table(cmdBuffer)->CmdResolveImage( |
| 2015 | cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2016 | } |
| 2017 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2018 | VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery( |
| 2019 | VkCmdBuffer cmdBuffer, |
| 2020 | VkQueryPool queryPool, |
| 2021 | uint32_t slot, |
| 2022 | VkFlags flags) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2023 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2024 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2025 | VkDeviceMemory mem = get_mem_binding_from_object(queryPool); |
| 2026 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2027 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2028 | sprintf(str, "In vkCmdBeginQuery() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2029 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2030 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2031 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2032 | device_dispatch_table(cmdBuffer)->CmdBeginQuery(cmdBuffer, queryPool, slot, flags); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2033 | } |
| 2034 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2035 | VK_LAYER_EXPORT void VKAPI vkCmdEndQuery( |
| 2036 | VkCmdBuffer cmdBuffer, |
| 2037 | VkQueryPool queryPool, |
| 2038 | uint32_t slot) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2039 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2040 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2041 | VkDeviceMemory mem = get_mem_binding_from_object(queryPool); |
| 2042 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2043 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2044 | sprintf(str, "In vkCmdEndQuery() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2045 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2046 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2047 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2048 | device_dispatch_table(cmdBuffer)->CmdEndQuery(cmdBuffer, queryPool, slot); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2049 | } |
| 2050 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2051 | VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool( |
| 2052 | VkCmdBuffer cmdBuffer, |
| 2053 | VkQueryPool queryPool, |
| 2054 | uint32_t startQuery, |
| 2055 | uint32_t queryCount) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2056 | { |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2057 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2058 | VkDeviceMemory mem = get_mem_binding_from_object(queryPool); |
| 2059 | if (VK_FALSE == update_cmd_buf_and_mem_references(cmdBuffer, mem)) { |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2060 | char str[1024]; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2061 | sprintf(str, "In vkCmdResetQueryPool() call unable to update binding of queryPool buffer %p to cmdBuffer %p", queryPool, cmdBuffer); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2062 | device_log_msg(cmdBuffer, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, cmdBuffer, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2063 | } |
Mark Lobodzinski | 93f494b | 2015-03-02 20:23:52 -0600 | [diff] [blame] | 2064 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2065 | device_dispatch_table(cmdBuffer)->CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2066 | } |
| 2067 | |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 2068 | VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback( |
| 2069 | VkInstance instance, |
| 2070 | VkFlags msgFlags, |
| 2071 | const PFN_vkDbgMsgCallback pfnMsgCallback, |
| 2072 | void* pUserData, |
| 2073 | VkDbgMsgCallback* pMsgCallback) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2074 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2075 | return layer_create_msg_callback(instance, instance_dispatch_table(instance), msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2076 | } |
| 2077 | |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 2078 | VK_LAYER_EXPORT VkResult VKAPI vkDbgDestroyMsgCallback( |
| 2079 | VkInstance instance, |
| 2080 | VkDbgMsgCallback msgCallback) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2081 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2082 | return layer_destroy_msg_callback(instance, instance_dispatch_table(instance), msgCallback); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2083 | } |
| 2084 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2085 | VK_LAYER_EXPORT VkResult VKAPI vkCreateSwapChainWSI( |
| 2086 | VkDevice device, |
| 2087 | const VkSwapChainCreateInfoWSI *pCreateInfo, |
| 2088 | VkSwapChainWSI *pSwapChain) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2089 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2090 | VkResult result = device_dispatch_table(device)->CreateSwapChainWSI(device, pCreateInfo, pSwapChain); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2091 | |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2092 | if (VK_SUCCESS == result) { |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2093 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2094 | add_swap_chain_info(*pSwapChain); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2095 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | cd9223b | 2014-11-19 16:19:28 -0700 | [diff] [blame] | 2096 | } |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2097 | |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2098 | return result; |
| 2099 | } |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2100 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2101 | VK_LAYER_EXPORT VkResult VKAPI vkDestroySwapChainWSI( |
| 2102 | VkSwapChainWSI swapChain) |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2103 | { |
| 2104 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2105 | |
| 2106 | if (swapChainMap.find(swapChain) != swapChainMap.end()) { |
| 2107 | MT_SWAP_CHAIN_INFO* pInfo = swapChainMap[swapChain]; |
| 2108 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2109 | if (pInfo->images.size() > 0) { |
| 2110 | for (std::vector<VkSwapChainImageInfoWSI>::const_iterator it = pInfo->images.begin(); |
| 2111 | it != pInfo->images.end(); it++) { |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2112 | clear_object_binding(it->image); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2113 | freeMemObjInfo(swapChain, it->memory, true); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2114 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2115 | objectMap.erase(it->image); |
| 2116 | } |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2117 | } |
| 2118 | |
| 2119 | delete pInfo; |
| 2120 | swapChainMap.erase(swapChain); |
| 2121 | } |
| 2122 | |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2123 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2124 | |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2125 | return device_dispatch_table(swapChain)->DestroySwapChainWSI(swapChain); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2126 | } |
| 2127 | |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2128 | VK_LAYER_EXPORT VkResult VKAPI vkGetSwapChainInfoWSI( |
| 2129 | VkSwapChainWSI swapChain, |
| 2130 | VkSwapChainInfoTypeWSI infoType, |
| 2131 | size_t *pDataSize, |
| 2132 | void *pData) |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2133 | { |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2134 | VkResult result = device_dispatch_table(swapChain)->GetSwapChainInfoWSI(swapChain, infoType, pDataSize, pData); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2135 | |
| 2136 | if (infoType == VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_WSI && result == VK_SUCCESS) { |
| 2137 | const size_t count = *pDataSize / sizeof(VkSwapChainImageInfoWSI); |
| 2138 | MT_SWAP_CHAIN_INFO *pInfo = swapChainMap[swapChain]; |
| 2139 | |
| 2140 | if (pInfo->images.empty()) { |
| 2141 | pInfo->images.resize(count); |
| 2142 | memcpy(&pInfo->images[0], pData, sizeof(pInfo->images[0]) * count); |
| 2143 | |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2144 | if (pInfo->images.size() > 0) { |
| 2145 | for (std::vector<VkSwapChainImageInfoWSI>::const_iterator it = pInfo->images.begin(); |
| 2146 | it != pInfo->images.end(); it++) { |
| 2147 | // Add image object, then insert the new Mem Object and then bind it to created image |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2148 | add_object_info(it->image, VK_STRUCTURE_TYPE_MAX_ENUM, &pInfo->createInfo, sizeof(pInfo->createInfo), "persistent_image"); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2149 | add_mem_obj_info(swapChain, it->memory, NULL); |
Mark Lobodzinski | 944aab1 | 2015-06-05 13:59:04 -0500 | [diff] [blame] | 2150 | if (VK_FALSE == set_object_binding(it->image, it->memory)) { |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2151 | char str[1024]; |
| 2152 | sprintf(str, "In vkGetSwapChainInfoWSI(), unable to set image %p binding to mem obj %p", (void*)it->image, (void*)it->memory); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2153 | device_log_msg(swapChain, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE, it->image, 0, MEMTRACK_MEMORY_BINDING_ERROR, "MEM", str); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2154 | } |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2155 | } |
| 2156 | } |
| 2157 | } else { |
| 2158 | const bool mismatch = (pInfo->images.size() != count || |
| 2159 | memcmp(&pInfo->images[0], pData, sizeof(pInfo->images[0]) * count)); |
| 2160 | |
| 2161 | if (mismatch) { |
| 2162 | char str[1024]; |
| 2163 | sprintf(str, "vkGetSwapChainInfoWSI(%p, VK_SWAP_CHAIN_INFO_TYPE_PERSISTENT_IMAGES_WSI) returned mismatching data", swapChain); |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2164 | device_log_msg(swapChain, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_SWAP_CHAIN_WSI, (VkObject) swapChain, 0, MEMTRACK_NONE, "SWAP_CHAIN", str); |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2165 | } |
| 2166 | } |
| 2167 | } |
| 2168 | |
Mark Lobodzinski | e61ebe7 | 2015-03-17 10:53:12 -0500 | [diff] [blame] | 2169 | return result; |
| 2170 | } |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2171 | |
Jon Ashburn | 8d1b0b5 | 2015-05-18 13:20:15 -0600 | [diff] [blame] | 2172 | VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr( |
| 2173 | VkDevice dev, |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2174 | const char *funcName) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2175 | { |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2176 | void *fptr; |
| 2177 | |
Jon Ashburn | 8d1b0b5 | 2015-05-18 13:20:15 -0600 | [diff] [blame] | 2178 | if (dev == NULL) { |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2179 | return NULL; |
Mark Lobodzinski | b1567a0 | 2015-04-21 15:33:04 -0600 | [diff] [blame] | 2180 | } |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2181 | |
Ian Elliott | 2d4ab1e | 2015-01-13 17:52:38 -0700 | [diff] [blame] | 2182 | loader_platform_thread_once(&g_initOnce, initMemTracker); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2183 | |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2184 | /* loader uses this to force layer initialization; device object is wrapped */ |
| 2185 | if (!strcmp(funcName, "vkGetDeviceProcAddr")) { |
| 2186 | initDeviceTable((const VkBaseLayerObject *) dev); |
Jon Ashburn | 8d1b0b5 | 2015-05-18 13:20:15 -0600 | [diff] [blame] | 2187 | return (void *) vkGetDeviceProcAddr; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2188 | } |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2189 | if (!strcmp(funcName, "vkDestroyDevice")) |
| 2190 | return (void*) vkDestroyDevice; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2191 | if (!strcmp(funcName, "vkQueueSubmit")) |
| 2192 | return (void*) vkQueueSubmit; |
| 2193 | if (!strcmp(funcName, "vkAllocMemory")) |
| 2194 | return (void*) vkAllocMemory; |
| 2195 | if (!strcmp(funcName, "vkFreeMemory")) |
| 2196 | return (void*) vkFreeMemory; |
| 2197 | if (!strcmp(funcName, "vkSetMemoryPriority")) |
| 2198 | return (void*) vkSetMemoryPriority; |
| 2199 | if (!strcmp(funcName, "vkMapMemory")) |
| 2200 | return (void*) vkMapMemory; |
| 2201 | if (!strcmp(funcName, "vkUnmapMemory")) |
| 2202 | return (void*) vkUnmapMemory; |
| 2203 | if (!strcmp(funcName, "vkPinSystemMemory")) |
| 2204 | return (void*) vkPinSystemMemory; |
| 2205 | if (!strcmp(funcName, "vkOpenSharedMemory")) |
| 2206 | return (void*) vkOpenSharedMemory; |
| 2207 | if (!strcmp(funcName, "vkOpenPeerMemory")) |
| 2208 | return (void*) vkOpenPeerMemory; |
| 2209 | if (!strcmp(funcName, "vkOpenPeerImage")) |
| 2210 | return (void*) vkOpenPeerImage; |
| 2211 | if (!strcmp(funcName, "vkDestroyObject")) |
| 2212 | return (void*) vkDestroyObject; |
| 2213 | if (!strcmp(funcName, "vkGetObjectInfo")) |
| 2214 | return (void*) vkGetObjectInfo; |
Mark Lobodzinski | 942b172 | 2015-05-11 17:21:15 -0500 | [diff] [blame] | 2215 | if (!strcmp(funcName, "vkBindObjectMemory")) |
| 2216 | return (void*) vkBindObjectMemory; |
| 2217 | if (!strcmp(funcName, "vkQueueBindSparseBufferMemory")) |
| 2218 | return (void*) vkQueueBindSparseBufferMemory; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2219 | if (!strcmp(funcName, "vkCreateFence")) |
| 2220 | return (void*) vkCreateFence; |
| 2221 | if (!strcmp(funcName, "vkGetFenceStatus")) |
| 2222 | return (void*) vkGetFenceStatus; |
| 2223 | if (!strcmp(funcName, "vkResetFences")) |
| 2224 | return (void*) vkResetFences; |
| 2225 | if (!strcmp(funcName, "vkWaitForFences")) |
| 2226 | return (void*) vkWaitForFences; |
| 2227 | if (!strcmp(funcName, "vkQueueWaitIdle")) |
| 2228 | return (void*) vkQueueWaitIdle; |
| 2229 | if (!strcmp(funcName, "vkDeviceWaitIdle")) |
| 2230 | return (void*) vkDeviceWaitIdle; |
| 2231 | if (!strcmp(funcName, "vkCreateEvent")) |
| 2232 | return (void*) vkCreateEvent; |
| 2233 | if (!strcmp(funcName, "vkCreateQueryPool")) |
| 2234 | return (void*) vkCreateQueryPool; |
| 2235 | if (!strcmp(funcName, "vkCreateBuffer")) |
| 2236 | return (void*) vkCreateBuffer; |
| 2237 | if (!strcmp(funcName, "vkCreateBufferView")) |
| 2238 | return (void*) vkCreateBufferView; |
| 2239 | if (!strcmp(funcName, "vkCreateImage")) |
| 2240 | return (void*) vkCreateImage; |
| 2241 | if (!strcmp(funcName, "vkCreateImageView")) |
| 2242 | return (void*) vkCreateImageView; |
| 2243 | if (!strcmp(funcName, "vkCreateColorAttachmentView")) |
| 2244 | return (void*) vkCreateColorAttachmentView; |
| 2245 | if (!strcmp(funcName, "vkCreateDepthStencilView")) |
| 2246 | return (void*) vkCreateDepthStencilView; |
| 2247 | if (!strcmp(funcName, "vkCreateShader")) |
| 2248 | return (void*) vkCreateShader; |
| 2249 | if (!strcmp(funcName, "vkCreateGraphicsPipeline")) |
| 2250 | return (void*) vkCreateGraphicsPipeline; |
| 2251 | if (!strcmp(funcName, "vkCreateGraphicsPipelineDerivative")) |
| 2252 | return (void*) vkCreateGraphicsPipelineDerivative; |
| 2253 | if (!strcmp(funcName, "vkCreateComputePipeline")) |
| 2254 | return (void*) vkCreateComputePipeline; |
| 2255 | if (!strcmp(funcName, "vkCreateSampler")) |
| 2256 | return (void*) vkCreateSampler; |
| 2257 | if (!strcmp(funcName, "vkCreateDynamicViewportState")) |
| 2258 | return (void*) vkCreateDynamicViewportState; |
| 2259 | if (!strcmp(funcName, "vkCreateDynamicRasterState")) |
| 2260 | return (void*) vkCreateDynamicRasterState; |
| 2261 | if (!strcmp(funcName, "vkCreateDynamicColorBlendState")) |
| 2262 | return (void*) vkCreateDynamicColorBlendState; |
| 2263 | if (!strcmp(funcName, "vkCreateDynamicDepthStencilState")) |
| 2264 | return (void*) vkCreateDynamicDepthStencilState; |
| 2265 | if (!strcmp(funcName, "vkCreateCommandBuffer")) |
| 2266 | return (void*) vkCreateCommandBuffer; |
| 2267 | if (!strcmp(funcName, "vkBeginCommandBuffer")) |
| 2268 | return (void*) vkBeginCommandBuffer; |
| 2269 | if (!strcmp(funcName, "vkEndCommandBuffer")) |
| 2270 | return (void*) vkEndCommandBuffer; |
| 2271 | if (!strcmp(funcName, "vkResetCommandBuffer")) |
| 2272 | return (void*) vkResetCommandBuffer; |
| 2273 | if (!strcmp(funcName, "vkCmdBindPipeline")) |
| 2274 | return (void*) vkCmdBindPipeline; |
| 2275 | if (!strcmp(funcName, "vkCmdBindDynamicStateObject")) |
| 2276 | return (void*) vkCmdBindDynamicStateObject; |
| 2277 | if (!strcmp(funcName, "vkCmdBindDescriptorSets")) |
| 2278 | return (void*) vkCmdBindDescriptorSets; |
Courtney Goeltzenleuchter | f68ad72 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 2279 | if (!strcmp(funcName, "vkCmdBindVertexBuffers")) |
| 2280 | return (void*) vkCmdBindVertexBuffers; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2281 | if (!strcmp(funcName, "vkCmdBindIndexBuffer")) |
| 2282 | return (void*) vkCmdBindIndexBuffer; |
| 2283 | if (!strcmp(funcName, "vkCmdDrawIndirect")) |
| 2284 | return (void*) vkCmdDrawIndirect; |
| 2285 | if (!strcmp(funcName, "vkCmdDrawIndexedIndirect")) |
| 2286 | return (void*) vkCmdDrawIndexedIndirect; |
| 2287 | if (!strcmp(funcName, "vkCmdDispatchIndirect")) |
| 2288 | return (void*) vkCmdDispatchIndirect; |
| 2289 | if (!strcmp(funcName, "vkCmdCopyBuffer")) |
| 2290 | return (void*) vkCmdCopyBuffer; |
| 2291 | if (!strcmp(funcName, "vkCmdCopyImage")) |
| 2292 | return (void*) vkCmdCopyImage; |
| 2293 | if (!strcmp(funcName, "vkCmdCopyBufferToImage")) |
| 2294 | return (void*) vkCmdCopyBufferToImage; |
| 2295 | if (!strcmp(funcName, "vkCmdCopyImageToBuffer")) |
| 2296 | return (void*) vkCmdCopyImageToBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2297 | if (!strcmp(funcName, "vkCmdUpdateBuffer")) |
| 2298 | return (void*) vkCmdUpdateBuffer; |
| 2299 | if (!strcmp(funcName, "vkCmdFillBuffer")) |
| 2300 | return (void*) vkCmdFillBuffer; |
| 2301 | if (!strcmp(funcName, "vkCmdClearColorImage")) |
| 2302 | return (void*) vkCmdClearColorImage; |
| 2303 | if (!strcmp(funcName, "vkCmdClearDepthStencil")) |
| 2304 | return (void*) vkCmdClearDepthStencil; |
| 2305 | if (!strcmp(funcName, "vkCmdResolveImage")) |
| 2306 | return (void*) vkCmdResolveImage; |
| 2307 | if (!strcmp(funcName, "vkCmdBeginQuery")) |
| 2308 | return (void*) vkCmdBeginQuery; |
| 2309 | if (!strcmp(funcName, "vkCmdEndQuery")) |
| 2310 | return (void*) vkCmdEndQuery; |
| 2311 | if (!strcmp(funcName, "vkCmdResetQueryPool")) |
| 2312 | return (void*) vkCmdResetQueryPool; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2313 | if (!strcmp(funcName, "vkGetDeviceQueue")) |
| 2314 | return (void*) vkGetDeviceQueue; |
Chia-I Wu | f869338 | 2015-04-16 22:02:10 +0800 | [diff] [blame] | 2315 | if (!strcmp(funcName, "vkCreateSwapChainWSI")) |
| 2316 | return (void*) vkCreateSwapChainWSI; |
| 2317 | if (!strcmp(funcName, "vkDestroySwapChainWSI")) |
| 2318 | return (void*) vkDestroySwapChainWSI; |
| 2319 | if (!strcmp(funcName, "vkGetSwapChainInfoWSI")) |
| 2320 | return (void*) vkGetSwapChainInfoWSI; |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2321 | |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2322 | { |
Jon Ashburn | 9eed289 | 2015-06-01 10:02:09 -0600 | [diff] [blame] | 2323 | if (device_dispatch_table(dev)->GetDeviceProcAddr == NULL) |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2324 | return NULL; |
Jon Ashburn | 9eed289 | 2015-06-01 10:02:09 -0600 | [diff] [blame] | 2325 | return device_dispatch_table(dev)->GetDeviceProcAddr(dev, funcName); |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2326 | } |
| 2327 | } |
| 2328 | |
| 2329 | VK_LAYER_EXPORT void* VKAPI vkGetInstanceProcAddr( |
| 2330 | VkInstance instance, |
| 2331 | const char *funcName) |
| 2332 | { |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2333 | void *fptr; |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2334 | if (instance == NULL) { |
| 2335 | return NULL; |
| 2336 | } |
Jon Ashburn | 8c5cbcf | 2015-05-07 10:27:37 -0600 | [diff] [blame] | 2337 | |
Jon Ashburn | 8c5cbcf | 2015-05-07 10:27:37 -0600 | [diff] [blame] | 2338 | loader_platform_thread_once(&g_initOnce, initMemTracker); |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2339 | |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2340 | /* loader uses this to force layer initialization; instance object is wrapped */ |
| 2341 | if (!strcmp(funcName, "vkGetInstanceProcAddr")) { |
| 2342 | initInstanceTable((const VkBaseLayerObject *) instance); |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2343 | return (void *) vkGetInstanceProcAddr; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2344 | } |
| 2345 | |
Mark Lobodzinski | 76c991d | 2015-05-20 16:16:37 -0500 | [diff] [blame] | 2346 | if (!strcmp(funcName, "vkDestroyInstance")) |
| 2347 | return (void *) vkDestroyInstance; |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2348 | if (!strcmp(funcName, "vkCreateInstance")) |
| 2349 | return (void*) vkCreateInstance; |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2350 | if (!strcmp(funcName, "vkCreateDevice")) |
| 2351 | return (void*) vkCreateDevice; |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2352 | |
Courtney Goeltzenleuchter | 7dcc6a7 | 2015-06-11 16:01:11 -0600 | [diff] [blame^] | 2353 | fptr = debug_report_get_instance_proc_addr(instance, funcName); |
Courtney Goeltzenleuchter | d971b61 | 2015-06-17 20:51:59 -0600 | [diff] [blame] | 2354 | if (fptr) |
| 2355 | return fptr; |
| 2356 | |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 2357 | { |
Jon Ashburn | 9eed289 | 2015-06-01 10:02:09 -0600 | [diff] [blame] | 2358 | if (instance_dispatch_table(instance)->GetInstanceProcAddr == NULL) |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 2359 | return NULL; |
Jon Ashburn | 9eed289 | 2015-06-01 10:02:09 -0600 | [diff] [blame] | 2360 | return instance_dispatch_table(instance)->GetInstanceProcAddr(instance, funcName); |
Tobin Ehlis | 6663f49 | 2014-11-10 12:29:12 -0700 | [diff] [blame] | 2361 | } |
| 2362 | } |