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