Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1 | /* |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2 | * Vulkan |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3 | * |
| 4 | * Copyright (C) 2014 LunarG, Inc. |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 5 | * Copyright (C) 2015 Google, Inc. |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 6 | * |
| 7 | * Permission is hereby granted, free of charge, to any person obtaining a |
| 8 | * copy of this software and associated documentation files (the "Software"), |
| 9 | * to deal in the Software without restriction, including without limitation |
| 10 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| 11 | * and/or sell copies of the Software, and to permit persons to whom the |
| 12 | * Software is furnished to do so, subject to the following conditions: |
| 13 | * |
| 14 | * The above copyright notice and this permission notice shall be included |
| 15 | * in all copies or substantial portions of the Software. |
| 16 | * |
| 17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 18 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 19 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| 20 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 21 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 22 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 23 | * DEALINGS IN THE SOFTWARE. |
| 24 | */ |
| 25 | |
| 26 | #include <stdio.h> |
| 27 | #include <stdlib.h> |
| 28 | #include <string.h> |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 29 | #include <algorithm> |
| 30 | #include <memory> |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 31 | #include <unordered_map> |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 32 | #include <unordered_set> |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 33 | |
Tobin Ehlis | b835d1b | 2015-07-03 10:34:49 -0600 | [diff] [blame] | 34 | #include "vk_loader_platform.h" |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 35 | #include "vk_dispatch_table_helper.h" |
| 36 | #include "vk_struct_string_helper_cpp.h" |
Tony Barbour | 18f7155 | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 37 | #if defined(__GNUC__) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 38 | #pragma GCC diagnostic ignored "-Wwrite-strings" |
Tony Barbour | 18f7155 | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 39 | #endif |
Tony Barbour | 18f7155 | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 40 | #if defined(__GNUC__) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 41 | #pragma GCC diagnostic warning "-Wwrite-strings" |
Tony Barbour | 18f7155 | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 42 | #endif |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 43 | #include "vk_struct_size_helper.h" |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 44 | #include "draw_state.h" |
Tobin Ehlis | a0cb02e | 2015-07-03 10:15:26 -0600 | [diff] [blame] | 45 | #include "vk_layer_config.h" |
Jon Ashburn | e68a9ff | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 46 | #include "vk_debug_marker_layer.h" |
Tobin Ehlis | a0cb02e | 2015-07-03 10:15:26 -0600 | [diff] [blame] | 47 | #include "vk_layer_table.h" |
| 48 | #include "vk_layer_debug_marker_table.h" |
| 49 | #include "vk_layer_data.h" |
| 50 | #include "vk_layer_logging.h" |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 51 | #include "vk_layer_extension_utils.h" |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 52 | |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 53 | struct devExts { |
| 54 | bool debug_marker_enabled; |
| 55 | }; |
| 56 | |
Cody Northrop | 55443ef | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 57 | struct layer_data { |
Tobin Ehlis | c16c3e9 | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 58 | debug_report_data *report_data; |
| 59 | // TODO: put instance data here |
Courtney Goeltzenleuchter | 62d945a | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 60 | std::vector<VkDbgMsgCallback> logging_callback; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 61 | VkLayerDispatchTable* device_dispatch_table; |
| 62 | VkLayerInstanceDispatchTable* instance_dispatch_table; |
| 63 | devExts device_extensions; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 64 | // Layer specific data |
| 65 | unordered_map<uint64_t, unique_ptr<SAMPLER_NODE>> sampleMap; |
| 66 | unordered_map<uint64_t, unique_ptr<VkImageViewCreateInfo>> imageViewMap; |
| 67 | unordered_map<uint64_t, unique_ptr<BUFFER_NODE>> bufferViewMap; |
| 68 | unordered_map<uint64_t, PIPELINE_NODE*> pipelineMap; |
| 69 | unordered_map<uint64_t, POOL_NODE*> poolMap; |
| 70 | unordered_map<uint64_t, SET_NODE*> setMap; |
| 71 | unordered_map<uint64_t, LAYOUT_NODE*> layoutMap; |
Tobin Ehlis | 644ff04 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 72 | unordered_map<uint64_t, PIPELINE_LAYOUT_NODE> pipelineLayoutMap; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 73 | // Map for layout chains |
| 74 | unordered_map<void*, GLOBAL_CB_NODE*> cmdBufferMap; |
| 75 | unordered_map<uint64_t, VkRenderPassCreateInfo*> renderPassMap; |
| 76 | unordered_map<uint64_t, VkFramebufferCreateInfo*> frameBufferMap; |
Cody Northrop | 55443ef | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 77 | |
| 78 | layer_data() : |
| 79 | report_data(nullptr), |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 80 | device_dispatch_table(nullptr), |
| 81 | instance_dispatch_table(nullptr), |
| 82 | device_extensions() |
Cody Northrop | 55443ef | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 83 | {}; |
| 84 | }; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 85 | // TODO : Do we need to guard access to layer_data_map w/ lock? |
Tobin Ehlis | c16c3e9 | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 86 | static std::unordered_map<void *, layer_data *> layer_data_map; |
Courtney Goeltzenleuchter | 3d0dfad | 2015-06-13 21:23:09 -0600 | [diff] [blame] | 87 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 88 | static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce); |
Jon Ashburn | 8c5cbcf | 2015-05-07 10:27:37 -0600 | [diff] [blame] | 89 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 90 | // TODO : This can be much smarter, using separate locks for separate global data |
| 91 | static int globalLockInitialized = 0; |
| 92 | static loader_platform_thread_mutex globalLock; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 93 | #define MAX_TID 513 |
| 94 | static loader_platform_thread_id g_tidMapping[MAX_TID] = {0}; |
| 95 | static uint32_t g_maxTID = 0; |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 96 | |
| 97 | template layer_data *get_my_data_ptr<layer_data>( |
| 98 | void *data_key, |
| 99 | std::unordered_map<void *, layer_data *> &data_map); |
| 100 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 101 | // Map actual TID to an index value and return that index |
| 102 | // This keeps TIDs in range from 0-MAX_TID and simplifies compares between runs |
| 103 | static uint32_t getTIDIndex() { |
| 104 | loader_platform_thread_id tid = loader_platform_get_thread_id(); |
| 105 | for (uint32_t i = 0; i < g_maxTID; i++) { |
| 106 | if (tid == g_tidMapping[i]) |
| 107 | return i; |
| 108 | } |
| 109 | // Don't yet have mapping, set it and return newly set index |
| 110 | uint32_t retVal = (uint32_t) g_maxTID; |
| 111 | g_tidMapping[g_maxTID++] = tid; |
| 112 | assert(g_maxTID < MAX_TID); |
| 113 | return retVal; |
| 114 | } |
| 115 | // Return a string representation of CMD_TYPE enum |
| 116 | static string cmdTypeToString(CMD_TYPE cmd) |
| 117 | { |
| 118 | switch (cmd) |
| 119 | { |
| 120 | case CMD_BINDPIPELINE: |
| 121 | return "CMD_BINDPIPELINE"; |
| 122 | case CMD_BINDPIPELINEDELTA: |
| 123 | return "CMD_BINDPIPELINEDELTA"; |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 124 | case CMD_SETVIEWPORTSTATE: |
| 125 | return "CMD_SETVIEWPORTSTATE"; |
| 126 | case CMD_SETLINEWIDTHSTATE: |
| 127 | return "CMD_SETLINEWIDTHSTATE"; |
| 128 | case CMD_SETDEPTHBIASSTATE: |
| 129 | return "CMD_SETDEPTHBIASSTATE"; |
| 130 | case CMD_SETBLENDSTATE: |
| 131 | return "CMD_SETBLENDSTATE"; |
| 132 | case CMD_SETDEPTHBOUNDSSTATE: |
| 133 | return "CMD_SETDEPTHBOUNDSSTATE"; |
| 134 | case CMD_SETSTENCILREADMASKSTATE: |
| 135 | return "CMD_SETSTENCILREADMASKSTATE"; |
| 136 | case CMD_SETSTENCILWRITEMASKSTATE: |
| 137 | return "CMD_SETSTENCILWRITEMASKSTATE"; |
| 138 | case CMD_SETSTENCILREFERENCESTATE: |
| 139 | return "CMD_SETSTENCILREFERENCESTATE"; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 140 | case CMD_BINDDESCRIPTORSETS: |
| 141 | return "CMD_BINDDESCRIPTORSETS"; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 142 | case CMD_BINDINDEXBUFFER: |
| 143 | return "CMD_BINDINDEXBUFFER"; |
| 144 | case CMD_BINDVERTEXBUFFER: |
| 145 | return "CMD_BINDVERTEXBUFFER"; |
| 146 | case CMD_DRAW: |
| 147 | return "CMD_DRAW"; |
| 148 | case CMD_DRAWINDEXED: |
| 149 | return "CMD_DRAWINDEXED"; |
| 150 | case CMD_DRAWINDIRECT: |
| 151 | return "CMD_DRAWINDIRECT"; |
| 152 | case CMD_DRAWINDEXEDINDIRECT: |
| 153 | return "CMD_DRAWINDEXEDINDIRECT"; |
| 154 | case CMD_DISPATCH: |
| 155 | return "CMD_DISPATCH"; |
| 156 | case CMD_DISPATCHINDIRECT: |
| 157 | return "CMD_DISPATCHINDIRECT"; |
| 158 | case CMD_COPYBUFFER: |
| 159 | return "CMD_COPYBUFFER"; |
| 160 | case CMD_COPYIMAGE: |
| 161 | return "CMD_COPYIMAGE"; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 162 | case CMD_BLITIMAGE: |
| 163 | return "CMD_BLITIMAGE"; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 164 | case CMD_COPYBUFFERTOIMAGE: |
| 165 | return "CMD_COPYBUFFERTOIMAGE"; |
| 166 | case CMD_COPYIMAGETOBUFFER: |
| 167 | return "CMD_COPYIMAGETOBUFFER"; |
| 168 | case CMD_CLONEIMAGEDATA: |
| 169 | return "CMD_CLONEIMAGEDATA"; |
| 170 | case CMD_UPDATEBUFFER: |
| 171 | return "CMD_UPDATEBUFFER"; |
| 172 | case CMD_FILLBUFFER: |
| 173 | return "CMD_FILLBUFFER"; |
| 174 | case CMD_CLEARCOLORIMAGE: |
| 175 | return "CMD_CLEARCOLORIMAGE"; |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 176 | case CMD_CLEARATTACHMENTS: |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 177 | return "CMD_CLEARCOLORATTACHMENT"; |
| 178 | case CMD_CLEARDEPTHSTENCILIMAGE: |
| 179 | return "CMD_CLEARDEPTHSTENCILIMAGE"; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 180 | case CMD_RESOLVEIMAGE: |
| 181 | return "CMD_RESOLVEIMAGE"; |
| 182 | case CMD_SETEVENT: |
| 183 | return "CMD_SETEVENT"; |
| 184 | case CMD_RESETEVENT: |
| 185 | return "CMD_RESETEVENT"; |
| 186 | case CMD_WAITEVENTS: |
| 187 | return "CMD_WAITEVENTS"; |
| 188 | case CMD_PIPELINEBARRIER: |
| 189 | return "CMD_PIPELINEBARRIER"; |
| 190 | case CMD_BEGINQUERY: |
| 191 | return "CMD_BEGINQUERY"; |
| 192 | case CMD_ENDQUERY: |
| 193 | return "CMD_ENDQUERY"; |
| 194 | case CMD_RESETQUERYPOOL: |
| 195 | return "CMD_RESETQUERYPOOL"; |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 196 | case CMD_COPYQUERYPOOLRESULTS: |
| 197 | return "CMD_COPYQUERYPOOLRESULTS"; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 198 | case CMD_WRITETIMESTAMP: |
| 199 | return "CMD_WRITETIMESTAMP"; |
| 200 | case CMD_INITATOMICCOUNTERS: |
| 201 | return "CMD_INITATOMICCOUNTERS"; |
| 202 | case CMD_LOADATOMICCOUNTERS: |
| 203 | return "CMD_LOADATOMICCOUNTERS"; |
| 204 | case CMD_SAVEATOMICCOUNTERS: |
| 205 | return "CMD_SAVEATOMICCOUNTERS"; |
| 206 | case CMD_BEGINRENDERPASS: |
| 207 | return "CMD_BEGINRENDERPASS"; |
| 208 | case CMD_ENDRENDERPASS: |
| 209 | return "CMD_ENDRENDERPASS"; |
| 210 | case CMD_DBGMARKERBEGIN: |
| 211 | return "CMD_DBGMARKERBEGIN"; |
| 212 | case CMD_DBGMARKEREND: |
| 213 | return "CMD_DBGMARKEREND"; |
| 214 | default: |
| 215 | return "UNKNOWN"; |
| 216 | } |
| 217 | } |
| 218 | // Block of code at start here for managing/tracking Pipeline state that this layer cares about |
| 219 | // Just track 2 shaders for now |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 220 | #define MAX_SLOTS 2048 |
| 221 | #define NUM_COMMAND_BUFFERS_TO_DISPLAY 10 |
| 222 | |
| 223 | static uint64_t g_drawCount[NUM_DRAW_TYPES] = {0, 0, 0, 0}; |
| 224 | |
| 225 | // TODO : Should be tracking lastBound per cmdBuffer and when draws occur, report based on that cmd buffer lastBound |
| 226 | // Then need to synchronize the accesses based on cmd buffer so that if I'm reading state on one cmd buffer, updates |
| 227 | // to that same cmd buffer by separate thread are not changing state from underneath us |
| 228 | // Track the last cmd buffer touched by this thread |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 229 | static VkCmdBuffer g_lastCmdBuffer[MAX_TID] = {NULL}; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 230 | // Track the last group of CBs touched for displaying to dot file |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 231 | static GLOBAL_CB_NODE* g_pLastTouchedCB[NUM_COMMAND_BUFFERS_TO_DISPLAY] = {NULL}; |
| 232 | static uint32_t g_lastTouchedCBIndex = 0; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 233 | // Track the last global DrawState of interest touched by any thread |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 234 | static GLOBAL_CB_NODE* g_lastGlobalCB = NULL; |
| 235 | static PIPELINE_NODE* g_lastBoundPipeline = NULL; |
Dana Jansens | c73ff98 | 2015-07-30 13:22:15 -0700 | [diff] [blame] | 236 | static VkDescriptorSet g_lastBoundDescriptorSet = VK_NULL_HANDLE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 237 | #define MAX_BINDING 0xFFFFFFFF // Default vtxBinding value in CB Node to identify if no vtxBinding set |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 238 | // prototype |
| 239 | static GLOBAL_CB_NODE* getCBNode(layer_data*, const VkCmdBuffer); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 240 | // Update global ptrs to reflect that specified cmdBuffer has been used |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 241 | static void updateCBTracking(GLOBAL_CB_NODE* pCB) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 242 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 243 | g_lastCmdBuffer[getTIDIndex()] = pCB->cmdBuffer; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 244 | loader_platform_thread_lock_mutex(&globalLock); |
| 245 | g_lastGlobalCB = pCB; |
| 246 | // TODO : This is a dumb algorithm. Need smart LRU that drops off oldest |
| 247 | for (uint32_t i = 0; i < NUM_COMMAND_BUFFERS_TO_DISPLAY; i++) { |
| 248 | if (g_pLastTouchedCB[i] == pCB) { |
| 249 | loader_platform_thread_unlock_mutex(&globalLock); |
| 250 | return; |
| 251 | } |
| 252 | } |
| 253 | g_pLastTouchedCB[g_lastTouchedCBIndex++] = pCB; |
| 254 | g_lastTouchedCBIndex = g_lastTouchedCBIndex % NUM_COMMAND_BUFFERS_TO_DISPLAY; |
| 255 | loader_platform_thread_unlock_mutex(&globalLock); |
| 256 | } |
Courtney Goeltzenleuchter | cd2a099 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 257 | static VkBool32 hasDrawCmd(GLOBAL_CB_NODE* pCB) |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 258 | { |
| 259 | for (uint32_t i=0; i<NUM_DRAW_TYPES; i++) { |
| 260 | if (pCB->drawCount[i]) |
| 261 | return VK_TRUE; |
| 262 | } |
| 263 | return VK_FALSE; |
| 264 | } |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 265 | // Check object status for selected flag state |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 266 | static VkBool32 validate_status(layer_data* my_data, GLOBAL_CB_NODE* pNode, CBStatusFlags enable_mask, CBStatusFlags status_mask, CBStatusFlags status_flag, VkFlags msg_flags, DRAW_STATE_ERROR error_code, const char* fail_msg) |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 267 | { |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 268 | // If non-zero enable mask is present, check it against status but if enable_mask |
| 269 | // is 0 then no enable required so we should always just check status |
| 270 | if ((!enable_mask) || (enable_mask & pNode->status)) { |
| 271 | if ((pNode->status & status_mask) != status_flag) { |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 272 | // TODO : How to pass dispatchable objects as srcObject? Here src obj should be cmd buffer |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 273 | return log_msg(my_data->report_data, msg_flags, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, error_code, "DS", |
Courtney Goeltzenleuchter | dee721d | 2015-08-26 15:09:25 -0600 | [diff] [blame] | 274 | "CB object %#" PRIxLEAST64 ": %s", reinterpret_cast<uint64_t>(pNode->cmdBuffer), fail_msg); |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 275 | } |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 276 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 277 | return VK_FALSE; |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 278 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 279 | // Retrieve pipeline node ptr for given pipeline object |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 280 | static PIPELINE_NODE* getPipeline(layer_data* my_data, const VkPipeline pipeline) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 281 | { |
| 282 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 283 | if (my_data->pipelineMap.find(pipeline.handle) == my_data->pipelineMap.end()) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 284 | loader_platform_thread_unlock_mutex(&globalLock); |
| 285 | return NULL; |
| 286 | } |
| 287 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 288 | return my_data->pipelineMap[pipeline.handle]; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 289 | } |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 290 | // Return VK_TRUE if for a given PSO, the given state enum is dynamic, else return VK_FALSE |
| 291 | static VkBool32 isDynamic(const PIPELINE_NODE* pPipeline, const VkDynamicState state) |
| 292 | { |
| 293 | if (pPipeline && pPipeline->graphicsPipelineCI.pDynamicState) { |
| 294 | for (uint32_t i=0; i<pPipeline->graphicsPipelineCI.pDynamicState->dynamicStateCount; i++) { |
| 295 | if (state == pPipeline->graphicsPipelineCI.pDynamicState->pDynamicStates[i]) |
| 296 | return VK_TRUE; |
| 297 | } |
| 298 | } |
| 299 | return VK_FALSE; |
| 300 | } |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 301 | // Validate state stored as flags at time of draw call |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 302 | static VkBool32 validate_draw_state_flags(layer_data* my_data, GLOBAL_CB_NODE* pCB, VkBool32 indexedDraw) { |
Courtney Goeltzenleuchter | cd2a099 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 303 | VkBool32 result; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 304 | result = validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_VIEWPORT_SET, CBSTATUS_VIEWPORT_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_VIEWPORT_NOT_BOUND, "Dynamic viewport state not set for this command buffer"); |
| 305 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_SCISSOR_SET, CBSTATUS_SCISSOR_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic scissor state not set for this command buffer"); |
| 306 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_LINE_WIDTH_SET, CBSTATUS_LINE_WIDTH_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_LINE_WIDTH_NOT_BOUND, "Dynamic line width state not set for this command buffer"); |
| 307 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_DEPTH_BIAS_SET, CBSTATUS_DEPTH_BIAS_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_DEPTH_BIAS_NOT_BOUND, "Dynamic depth bias state not set for this command buffer"); |
| 308 | result |= validate_status(my_data, pCB, CBSTATUS_COLOR_BLEND_WRITE_ENABLE, CBSTATUS_BLEND_SET, CBSTATUS_BLEND_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_BLEND_NOT_BOUND, "Dynamic blend object state not set for this command buffer"); |
| 309 | result |= validate_status(my_data, pCB, CBSTATUS_DEPTH_WRITE_ENABLE, CBSTATUS_DEPTH_BOUNDS_SET, CBSTATUS_DEPTH_BOUNDS_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_DEPTH_BOUNDS_NOT_BOUND, "Dynamic depth bounds state not set for this command buffer"); |
| 310 | result |= validate_status(my_data, pCB, CBSTATUS_STENCIL_TEST_ENABLE, CBSTATUS_STENCIL_READ_MASK_SET, CBSTATUS_STENCIL_READ_MASK_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic stencil read mask state not set for this command buffer"); |
| 311 | result |= validate_status(my_data, pCB, CBSTATUS_STENCIL_TEST_ENABLE, CBSTATUS_STENCIL_WRITE_MASK_SET, CBSTATUS_STENCIL_WRITE_MASK_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic stencil write mask state not set for this command buffer"); |
| 312 | result |= validate_status(my_data, pCB, CBSTATUS_STENCIL_TEST_ENABLE, CBSTATUS_STENCIL_REFERENCE_SET, CBSTATUS_STENCIL_REFERENCE_SET, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic stencil reference state not set for this command buffer"); |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 313 | if (indexedDraw) |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 314 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_INDEX_BUFFER_BOUND, CBSTATUS_INDEX_BUFFER_BOUND, VK_DBG_REPORT_ERROR_BIT, DRAWSTATE_INDEX_BUFFER_NOT_BOUND, "Index buffer object not bound to this command buffer when Indexed Draw attempted"); |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 315 | return result; |
| 316 | } |
| 317 | // Validate overall state at the time of a draw call |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 318 | static VkBool32 validate_draw_state(layer_data* my_data, GLOBAL_CB_NODE* pCB, VkBool32 indexedDraw) { |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 319 | // First check flag states |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 320 | VkBool32 result = validate_draw_state_flags(my_data, pCB, indexedDraw); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 321 | PIPELINE_NODE* pPipe = getPipeline(my_data, pCB->lastBoundPipeline); |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 322 | // Now complete other state checks |
Tobin Ehlis | e90e66d | 2015-09-09 13:31:01 -0600 | [diff] [blame] | 323 | // TODO : Currently only performing next check if *something* was bound (non-zero last bound) |
| 324 | // There is probably a better way to gate when this check happens, and to know if something *should* have been bound |
| 325 | // We should have that check separately and then gate this check based on that check |
| 326 | if (pPipe && (pCB->lastBoundPipelineLayout) && (pCB->lastBoundPipelineLayout != pPipe->graphicsPipelineCI.layout)) { |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 327 | result = VK_FALSE; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 328 | result |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE_LAYOUT, pCB->lastBoundPipelineLayout.handle, 0, DRAWSTATE_PIPELINE_LAYOUT_MISMATCH, "DS", |
Mark Lobodzinski | 735e4b3 | 2015-08-04 10:54:43 -0600 | [diff] [blame] | 329 | "Pipeline layout from last vkCmdBindDescriptorSets() (%#" PRIxLEAST64 ") does not match PSO Pipeline layout (%#" PRIxLEAST64 ") ", pCB->lastBoundPipelineLayout.handle, pPipe->graphicsPipelineCI.layout.handle); |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 330 | } |
Tobin Ehlis | f7bf450 | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 331 | // Verify Vtx binding |
| 332 | if (MAX_BINDING != pCB->lastVtxBinding) { |
| 333 | if (pCB->lastVtxBinding >= pPipe->vtxBindingCount) { |
| 334 | if (0 == pPipe->vtxBindingCount) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 335 | result |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | f7bf450 | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 336 | "Vtx Buffer Index %u was bound, but no vtx buffers are attached to PSO.", pCB->lastVtxBinding); |
Tobin Ehlis | f7bf450 | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 337 | } |
| 338 | else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 339 | result |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | f7bf450 | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 340 | "Vtx binding Index of %u exceeds PSO pVertexBindingDescriptions max array index of %u.", pCB->lastVtxBinding, (pPipe->vtxBindingCount - 1)); |
Tobin Ehlis | f7bf450 | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 341 | } |
| 342 | } |
| 343 | } |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 344 | // If Viewport or scissors are dynamic, verify that dynamic count matches PSO count |
| 345 | VkBool32 dynViewport = isDynamic(pPipe, VK_DYNAMIC_STATE_VIEWPORT); |
| 346 | VkBool32 dynScissor = isDynamic(pPipe, VK_DYNAMIC_STATE_SCISSOR); |
| 347 | if (dynViewport) { |
| 348 | if (pCB->viewports.size() != pPipe->graphicsPipelineCI.pViewportState->viewportCount) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 349 | result |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 350 | "Dynamic viewportCount from vkCmdSetViewport() is %u, but PSO viewportCount is %u. These counts must match.", pCB->viewports.size(), pPipe->graphicsPipelineCI.pViewportState->viewportCount); |
| 351 | } |
| 352 | } |
| 353 | if (dynScissor) { |
| 354 | if (pCB->scissors.size() != pPipe->graphicsPipelineCI.pViewportState->scissorCount) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 355 | result |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 356 | "Dynamic scissorCount from vkCmdSetScissor() is %u, but PSO scissorCount is %u. These counts must match.", pCB->scissors.size(), pPipe->graphicsPipelineCI.pViewportState->scissorCount); |
| 357 | } |
| 358 | } |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 359 | return result; |
| 360 | } |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 361 | // Verify that create state for a pipeline is valid |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 362 | static VkBool32 verifyPipelineCreateState(layer_data* my_data, const VkDevice device, const PIPELINE_NODE* pPipeline) |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 363 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 364 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 365 | // VS is required |
| 366 | if (!(pPipeline->active_shaders & VK_SHADER_STAGE_VERTEX_BIT)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 367 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 368 | "Invalid Pipeline CreateInfo State: Vtx Shader required"); |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 369 | } |
| 370 | // Either both or neither TC/TE shaders should be defined |
Courtney Goeltzenleuchter | 9683589 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 371 | if (((pPipeline->active_shaders & VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT) == 0) != |
| 372 | ((pPipeline->active_shaders & VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT) == 0) ) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 373 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 374 | "Invalid Pipeline CreateInfo State: TE and TC shaders must be included or excluded as a pair"); |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 375 | } |
| 376 | // Compute shaders should be specified independent of Gfx shaders |
| 377 | if ((pPipeline->active_shaders & VK_SHADER_STAGE_COMPUTE_BIT) && |
Courtney Goeltzenleuchter | 9683589 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 378 | (pPipeline->active_shaders & (VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | |
| 379 | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT | VK_SHADER_STAGE_GEOMETRY_BIT | |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 380 | VK_SHADER_STAGE_FRAGMENT_BIT))) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 381 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 382 | "Invalid Pipeline CreateInfo State: Do not specify Compute Shader for Gfx Pipeline"); |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 383 | } |
| 384 | // VK_PRIMITIVE_TOPOLOGY_PATCH primitive topology is only valid for tessellation pipelines. |
| 385 | // Mismatching primitive topology and tessellation fails graphics pipeline creation. |
Courtney Goeltzenleuchter | 9683589 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 386 | if (pPipeline->active_shaders & (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT) && |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 387 | (pPipeline->iaStateCI.topology != VK_PRIMITIVE_TOPOLOGY_PATCH)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 388 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 389 | "Invalid Pipeline CreateInfo State: VK_PRIMITIVE_TOPOLOGY_PATCH must be set as IA topology for tessellation pipelines"); |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 390 | } |
Tobin Ehlis | 912df02 | 2015-09-17 08:46:18 -0600 | [diff] [blame] | 391 | if (pPipeline->iaStateCI.topology == VK_PRIMITIVE_TOPOLOGY_PATCH) { |
Courtney Goeltzenleuchter | 9683589 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 392 | if (~pPipeline->active_shaders & VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 393 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 394 | "Invalid Pipeline CreateInfo State: VK_PRIMITIVE_TOPOLOGY_PATCH primitive topology is only valid for tessellation pipelines"); |
Tobin Ehlis | 912df02 | 2015-09-17 08:46:18 -0600 | [diff] [blame] | 395 | } |
| 396 | if (!pPipeline->tessStateCI.patchControlPoints || (pPipeline->tessStateCI.patchControlPoints > 32)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 397 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | 912df02 | 2015-09-17 08:46:18 -0600 | [diff] [blame] | 398 | "Invalid Pipeline CreateInfo State: VK_PRIMITIVE_TOPOLOGY_PATCH primitive topology used with patchControlPoints value %u." |
| 399 | " patchControlPoints should be >0 and <=32.", pPipeline->tessStateCI.patchControlPoints); |
| 400 | } |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 401 | } |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 402 | // Viewport state must be included and viewport and scissor counts should always match |
Tobin Ehlis | e68360f | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 403 | // NOTE : Even if these are flagged as dynamic, counts need to be set correctly for shader compiler |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 404 | if (!pPipeline->graphicsPipelineCI.pViewportState) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 405 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 406 | "Gfx Pipeline pViewportState is null. Even if viewport and scissors are dynamic PSO must include viewportCount and scissorCount in pViewportState."); |
| 407 | } else if (pPipeline->graphicsPipelineCI.pViewportState->scissorCount != pPipeline->graphicsPipelineCI.pViewportState->viewportCount) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 408 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | e68360f | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 409 | "Gfx Pipeline viewport count (%u) must match scissor count (%u).", pPipeline->vpStateCI.viewportCount, pPipeline->vpStateCI.scissorCount); |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 410 | } else { |
| 411 | // If viewport or scissor are not dynamic, then verify that data is appropriate for count |
| 412 | VkBool32 dynViewport = isDynamic(pPipeline, VK_DYNAMIC_STATE_VIEWPORT); |
| 413 | VkBool32 dynScissor = isDynamic(pPipeline, VK_DYNAMIC_STATE_SCISSOR); |
| 414 | if (!dynViewport) { |
| 415 | if (pPipeline->graphicsPipelineCI.pViewportState->viewportCount && !pPipeline->graphicsPipelineCI.pViewportState->pViewports) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 416 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 417 | "Gfx Pipeline viewportCount is %u, but pViewports is NULL. For non-zero viewportCount, you must either include pViewports data, or include viewport in pDynamicState and set it with vkCmdSetViewport().", pPipeline->graphicsPipelineCI.pViewportState->viewportCount); |
Tobin Ehlis | e68360f | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 418 | } |
| 419 | } |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 420 | if (!dynScissor) { |
| 421 | if (pPipeline->graphicsPipelineCI.pViewportState->scissorCount && !pPipeline->graphicsPipelineCI.pViewportState->pScissors) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 422 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 423 | "Gfx Pipeline scissorCount is %u, but pScissors is NULL. For non-zero scissorCount, you must either include pScissors data, or include scissor in pDynamicState and set it with vkCmdSetScissor().", pPipeline->graphicsPipelineCI.pViewportState->scissorCount); |
| 424 | } |
Tobin Ehlis | e68360f | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 425 | } |
| 426 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 427 | return skipCall; |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 428 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 429 | // Init the pipeline mapping info based on pipeline create info LL tree |
| 430 | // Threading note : Calls to this function should wrapped in mutex |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 431 | static PIPELINE_NODE* initPipeline(const VkGraphicsPipelineCreateInfo* pCreateInfo, PIPELINE_NODE* pBasePipeline) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 432 | { |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 433 | PIPELINE_NODE* pPipeline = new PIPELINE_NODE; |
| 434 | if (pBasePipeline) { |
| 435 | memcpy((void*)pPipeline, (void*)pBasePipeline, sizeof(PIPELINE_NODE)); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 436 | } else { |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 437 | memset((void*)pPipeline, 0, sizeof(PIPELINE_NODE)); |
| 438 | } |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 439 | // First init create info |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 440 | memcpy(&pPipeline->graphicsPipelineCI, pCreateInfo, sizeof(VkGraphicsPipelineCreateInfo)); |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 441 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 442 | size_t bufferSize = 0; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 443 | const VkPipelineVertexInputStateCreateInfo* pVICI = NULL; |
Tobin Ehlis | 5a65cca | 2015-07-13 13:14:24 -0600 | [diff] [blame] | 444 | const VkPipelineColorBlendStateCreateInfo* pCBCI = NULL; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 445 | |
| 446 | for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { |
| 447 | const VkPipelineShaderStageCreateInfo *pPSSCI = &pCreateInfo->pStages[i]; |
| 448 | |
| 449 | switch (pPSSCI->stage) { |
Courtney Goeltzenleuchter | d263550 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 450 | case VK_SHADER_STAGE_VERTEX_BIT: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 451 | memcpy(&pPipeline->vsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
| 452 | pPipeline->active_shaders |= VK_SHADER_STAGE_VERTEX_BIT; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 453 | break; |
Courtney Goeltzenleuchter | d263550 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 454 | case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 455 | memcpy(&pPipeline->tcsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
Courtney Goeltzenleuchter | 9683589 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 456 | pPipeline->active_shaders |= VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 457 | break; |
Courtney Goeltzenleuchter | d263550 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 458 | case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 459 | memcpy(&pPipeline->tesCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
Courtney Goeltzenleuchter | 9683589 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 460 | pPipeline->active_shaders |= VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 461 | break; |
Courtney Goeltzenleuchter | d263550 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 462 | case VK_SHADER_STAGE_GEOMETRY_BIT: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 463 | memcpy(&pPipeline->gsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
| 464 | pPipeline->active_shaders |= VK_SHADER_STAGE_GEOMETRY_BIT; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 465 | break; |
Courtney Goeltzenleuchter | d263550 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 466 | case VK_SHADER_STAGE_FRAGMENT_BIT: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 467 | memcpy(&pPipeline->fsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
| 468 | pPipeline->active_shaders |= VK_SHADER_STAGE_FRAGMENT_BIT; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 469 | break; |
Courtney Goeltzenleuchter | d263550 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 470 | case VK_SHADER_STAGE_COMPUTE_BIT: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 471 | // TODO : Flag error, CS is specified through VkComputePipelineCreateInfo |
| 472 | pPipeline->active_shaders |= VK_SHADER_STAGE_COMPUTE_BIT; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 473 | break; |
| 474 | default: |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 475 | // TODO : Flag error |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 476 | break; |
| 477 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 478 | } |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 479 | // Copy over GraphicsPipelineCreateInfo structure embedded pointers |
| 480 | if (pCreateInfo->stageCount != 0) { |
| 481 | pPipeline->graphicsPipelineCI.pStages = new VkPipelineShaderStageCreateInfo[pCreateInfo->stageCount]; |
| 482 | bufferSize = pCreateInfo->stageCount * sizeof(VkPipelineShaderStageCreateInfo); |
| 483 | memcpy((void*)pPipeline->graphicsPipelineCI.pStages, pCreateInfo->pStages, bufferSize); |
| 484 | } |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 485 | if (pCreateInfo->pVertexInputState != NULL) { |
| 486 | memcpy((void*)&pPipeline->vertexInputCI, pCreateInfo->pVertexInputState , sizeof(VkPipelineVertexInputStateCreateInfo)); |
| 487 | // Copy embedded ptrs |
| 488 | pVICI = pCreateInfo->pVertexInputState; |
| 489 | pPipeline->vtxBindingCount = pVICI->bindingCount; |
| 490 | if (pPipeline->vtxBindingCount) { |
| 491 | pPipeline->pVertexBindingDescriptions = new VkVertexInputBindingDescription[pPipeline->vtxBindingCount]; |
| 492 | bufferSize = pPipeline->vtxBindingCount * sizeof(VkVertexInputBindingDescription); |
| 493 | memcpy((void*)pPipeline->pVertexBindingDescriptions, pVICI->pVertexBindingDescriptions, bufferSize); |
| 494 | } |
| 495 | pPipeline->vtxAttributeCount = pVICI->attributeCount; |
| 496 | if (pPipeline->vtxAttributeCount) { |
| 497 | pPipeline->pVertexAttributeDescriptions = new VkVertexInputAttributeDescription[pPipeline->vtxAttributeCount]; |
| 498 | bufferSize = pPipeline->vtxAttributeCount * sizeof(VkVertexInputAttributeDescription); |
| 499 | memcpy((void*)pPipeline->pVertexAttributeDescriptions, pVICI->pVertexAttributeDescriptions, bufferSize); |
| 500 | } |
| 501 | pPipeline->graphicsPipelineCI.pVertexInputState = &pPipeline->vertexInputCI; |
| 502 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 503 | if (pCreateInfo->pInputAssemblyState != NULL) { |
| 504 | memcpy((void*)&pPipeline->iaStateCI, pCreateInfo->pInputAssemblyState, sizeof(VkPipelineInputAssemblyStateCreateInfo)); |
| 505 | pPipeline->graphicsPipelineCI.pInputAssemblyState = &pPipeline->iaStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 506 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 507 | if (pCreateInfo->pTessellationState != NULL) { |
| 508 | memcpy((void*)&pPipeline->tessStateCI, pCreateInfo->pTessellationState, sizeof(VkPipelineTessellationStateCreateInfo)); |
| 509 | pPipeline->graphicsPipelineCI.pTessellationState = &pPipeline->tessStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 510 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 511 | if (pCreateInfo->pViewportState != NULL) { |
| 512 | memcpy((void*)&pPipeline->vpStateCI, pCreateInfo->pViewportState, sizeof(VkPipelineViewportStateCreateInfo)); |
| 513 | pPipeline->graphicsPipelineCI.pViewportState = &pPipeline->vpStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 514 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 515 | if (pCreateInfo->pRasterState != NULL) { |
| 516 | memcpy((void*)&pPipeline->rsStateCI, pCreateInfo->pRasterState, sizeof(VkPipelineRasterStateCreateInfo)); |
| 517 | pPipeline->graphicsPipelineCI.pRasterState = &pPipeline->rsStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 518 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 519 | if (pCreateInfo->pMultisampleState != NULL) { |
| 520 | memcpy((void*)&pPipeline->msStateCI, pCreateInfo->pMultisampleState, sizeof(VkPipelineMultisampleStateCreateInfo)); |
| 521 | pPipeline->graphicsPipelineCI.pMultisampleState = &pPipeline->msStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 522 | } |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 523 | if (pCreateInfo->pDepthStencilState != NULL) { |
| 524 | memcpy((void*)&pPipeline->dsStateCI, pCreateInfo->pDepthStencilState, sizeof(VkPipelineDepthStencilStateCreateInfo)); |
| 525 | pPipeline->graphicsPipelineCI.pDepthStencilState = &pPipeline->dsStateCI; |
| 526 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 527 | if (pCreateInfo->pColorBlendState != NULL) { |
| 528 | memcpy((void*)&pPipeline->cbStateCI, pCreateInfo->pColorBlendState, sizeof(VkPipelineColorBlendStateCreateInfo)); |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 529 | // Copy embedded ptrs |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 530 | pCBCI = pCreateInfo->pColorBlendState; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 531 | pPipeline->attachmentCount = pCBCI->attachmentCount; |
| 532 | if (pPipeline->attachmentCount) { |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 533 | pPipeline->pAttachments = new VkPipelineColorBlendAttachmentState[pPipeline->attachmentCount]; |
| 534 | bufferSize = pPipeline->attachmentCount * sizeof(VkPipelineColorBlendAttachmentState); |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 535 | memcpy((void*)pPipeline->pAttachments, pCBCI->pAttachments, bufferSize); |
| 536 | } |
Tony Barbour | dd6e32e | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 537 | pPipeline->graphicsPipelineCI.pColorBlendState = &pPipeline->cbStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 538 | } |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 539 | if (pCreateInfo->pDynamicState != NULL) { |
| 540 | memcpy((void*)&pPipeline->dynStateCI, pCreateInfo->pDynamicState, sizeof(VkPipelineDynamicStateCreateInfo)); |
| 541 | if (pPipeline->dynStateCI.dynamicStateCount) { |
| 542 | pPipeline->dynStateCI.pDynamicStates = new VkDynamicState[pPipeline->dynStateCI.dynamicStateCount]; |
| 543 | bufferSize = pPipeline->dynStateCI.dynamicStateCount * sizeof(VkDynamicState); |
| 544 | memcpy((void*)pPipeline->dynStateCI.pDynamicStates, pCreateInfo->pDynamicState->pDynamicStates, bufferSize); |
| 545 | } |
| 546 | pPipeline->graphicsPipelineCI.pDynamicState = &pPipeline->dynStateCI; |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 547 | } |
| 548 | |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 549 | return pPipeline; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 550 | } |
| 551 | // Free the Pipeline nodes |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 552 | static void deletePipelines(layer_data* my_data) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 553 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 554 | if (my_data->pipelineMap.size() <= 0) |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 555 | return; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 556 | for (auto ii=my_data->pipelineMap.begin(); ii!=my_data->pipelineMap.end(); ++ii) { |
Mark Lobodzinski | d5732f3 | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 557 | if ((*ii).second->graphicsPipelineCI.stageCount != 0) { |
| 558 | delete[] (*ii).second->graphicsPipelineCI.pStages; |
| 559 | } |
Tobin Ehlis | f313c8b | 2015-04-01 11:59:08 -0600 | [diff] [blame] | 560 | if ((*ii).second->pVertexBindingDescriptions) { |
| 561 | delete[] (*ii).second->pVertexBindingDescriptions; |
| 562 | } |
| 563 | if ((*ii).second->pVertexAttributeDescriptions) { |
| 564 | delete[] (*ii).second->pVertexAttributeDescriptions; |
| 565 | } |
| 566 | if ((*ii).second->pAttachments) { |
| 567 | delete[] (*ii).second->pAttachments; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 568 | } |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 569 | if ((*ii).second->dynStateCI.dynamicStateCount != 0) { |
| 570 | delete[] (*ii).second->dynStateCI.pDynamicStates; |
| 571 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 572 | delete (*ii).second; |
| 573 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 574 | my_data->pipelineMap.clear(); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 575 | } |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 576 | // For given pipeline, return number of MSAA samples, or one if MSAA disabled |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 577 | static uint32_t getNumSamples(layer_data* my_data, const VkPipeline pipeline) |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 578 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 579 | PIPELINE_NODE* pPipe = my_data->pipelineMap[pipeline.handle]; |
Tobin Ehlis | 577188e | 2015-07-13 14:51:15 -0600 | [diff] [blame] | 580 | if (VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO == pPipe->msStateCI.sType) { |
| 581 | return pPipe->msStateCI.rasterSamples; |
| 582 | } |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 583 | return 1; |
| 584 | } |
| 585 | // Validate state related to the PSO |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 586 | static VkBool32 validatePipelineState(layer_data* my_data, const GLOBAL_CB_NODE* pCB, const VkPipelineBindPoint pipelineBindPoint, const VkPipeline pipeline) |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 587 | { |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 588 | if (VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) { |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 589 | // Verify that any MSAA request in PSO matches sample# in bound FB |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 590 | uint32_t psoNumSamples = getNumSamples(my_data, pipeline); |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 591 | if (pCB->activeRenderPass) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 592 | const VkRenderPassCreateInfo* pRPCI = my_data->renderPassMap[pCB->activeRenderPass.handle]; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 593 | const VkSubpassDescription* pSD = &pRPCI->pSubpasses[pCB->activeSubpass]; |
| 594 | int subpassNumSamples = 0; |
| 595 | uint32_t i; |
| 596 | |
| 597 | for (i = 0; i < pSD->colorCount; i++) { |
| 598 | uint32_t samples; |
| 599 | |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 600 | if (pSD->pColorAttachments[i].attachment == VK_ATTACHMENT_UNUSED) |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 601 | continue; |
| 602 | |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 603 | samples = pRPCI->pAttachments[pSD->pColorAttachments[i].attachment].samples; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 604 | if (subpassNumSamples == 0) { |
| 605 | subpassNumSamples = samples; |
| 606 | } else if (subpassNumSamples != samples) { |
| 607 | subpassNumSamples = -1; |
| 608 | break; |
| 609 | } |
| 610 | } |
| 611 | if (pSD->depthStencilAttachment.attachment != VK_ATTACHMENT_UNUSED) { |
| 612 | const uint32_t samples = pRPCI->pAttachments[pSD->depthStencilAttachment.attachment].samples; |
| 613 | if (subpassNumSamples == 0) |
| 614 | subpassNumSamples = samples; |
| 615 | else if (subpassNumSamples != samples) |
| 616 | subpassNumSamples = -1; |
| 617 | } |
| 618 | |
| 619 | if (psoNumSamples != subpassNumSamples) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 620 | return log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline.handle, 0, DRAWSTATE_NUM_SAMPLES_MISMATCH, "DS", |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 621 | "Num samples mismatch! Binding PSO (%#" PRIxLEAST64 ") with %u samples while current RenderPass (%#" PRIxLEAST64 ") w/ %u samples!", |
| 622 | pipeline.handle, psoNumSamples, pCB->activeRenderPass.handle, subpassNumSamples); |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 623 | } |
| 624 | } else { |
| 625 | // TODO : I believe it's an error if we reach this point and don't have an activeRenderPass |
| 626 | // Verify and flag error as appropriate |
| 627 | } |
| 628 | // TODO : Add more checks here |
| 629 | } else { |
| 630 | // TODO : Validate non-gfx pipeline updates |
| 631 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 632 | return VK_FALSE; |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 633 | } |
| 634 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 635 | // Block of code at start here specifically for managing/tracking DSs |
| 636 | |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 637 | // Return Pool node ptr for specified pool or else NULL |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 638 | static POOL_NODE* getPoolNode(layer_data* my_data, const VkDescriptorPool pool) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 639 | { |
| 640 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 641 | if (my_data->poolMap.find(pool.handle) == my_data->poolMap.end()) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 642 | loader_platform_thread_unlock_mutex(&globalLock); |
| 643 | return NULL; |
| 644 | } |
| 645 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 646 | return my_data->poolMap[pool.handle]; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 647 | } |
| 648 | // Return Set node ptr for specified set or else NULL |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 649 | static SET_NODE* getSetNode(layer_data* my_data, const VkDescriptorSet set) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 650 | { |
| 651 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 652 | if (my_data->setMap.find(set.handle) == my_data->setMap.end()) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 653 | loader_platform_thread_unlock_mutex(&globalLock); |
| 654 | return NULL; |
| 655 | } |
| 656 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 657 | return my_data->setMap[set.handle]; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 658 | } |
| 659 | |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 660 | static LAYOUT_NODE* getLayoutNode(layer_data* my_data, const VkDescriptorSetLayout layout) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 661 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 662 | if (my_data->layoutMap.find(layout.handle) == my_data->layoutMap.end()) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 663 | loader_platform_thread_unlock_mutex(&globalLock); |
| 664 | return NULL; |
| 665 | } |
| 666 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 667 | return my_data->layoutMap[layout.handle]; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 668 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 669 | // Return VK_FALSE if update struct is of valid type, otherwise flag error and return code from callback |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 670 | static VkBool32 validUpdateStruct(layer_data* my_data, const VkDevice device, const GENERIC_HEADER* pUpdateStruct) |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 671 | { |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 672 | switch (pUpdateStruct->sType) |
| 673 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 674 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 675 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 676 | return VK_FALSE; |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 677 | default: |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 678 | return log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 679 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 680 | } |
| 681 | } |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 682 | // For given update struct, return binding |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 683 | static VkBool32 getUpdateBinding(layer_data* my_data, const VkDevice device, const GENERIC_HEADER* pUpdateStruct, uint32_t* binding) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 684 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 685 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 686 | switch (pUpdateStruct->sType) |
| 687 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 688 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 689 | *binding = ((VkWriteDescriptorSet*)pUpdateStruct)->destBinding; |
| 690 | break; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 691 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 692 | *binding = ((VkCopyDescriptorSet*)pUpdateStruct)->destBinding; |
| 693 | break; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 694 | default: |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 695 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 696 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 697 | *binding = 0xFFFFFFFF; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 698 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 699 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 700 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 701 | // Set arrayIndex for given update struct in the last parameter |
| 702 | // Return value of skipCall, which is only VK_TRUE is error occurs and callback signals execution to cease |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 703 | static uint32_t getUpdateArrayIndex(layer_data* my_data, const VkDevice device, const GENERIC_HEADER* pUpdateStruct, uint32_t* arrayIndex) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 704 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 705 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 706 | switch (pUpdateStruct->sType) |
| 707 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 708 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 709 | *arrayIndex = ((VkWriteDescriptorSet*)pUpdateStruct)->destArrayElement; |
| 710 | break; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 711 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 712 | // TODO : Need to understand this case better and make sure code is correct |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 713 | *arrayIndex = ((VkCopyDescriptorSet*)pUpdateStruct)->destArrayElement; |
| 714 | break; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 715 | default: |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 716 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 717 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 718 | *arrayIndex = 0; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 719 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 720 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 721 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 722 | // Set count for given update struct in the last parameter |
| 723 | // Return value of skipCall, which is only VK_TRUE is error occurs and callback signals execution to cease |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 724 | static uint32_t getUpdateCount(layer_data* my_data, const VkDevice device, const GENERIC_HEADER* pUpdateStruct, uint32_t* count) |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 725 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 726 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 727 | switch (pUpdateStruct->sType) |
| 728 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 729 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 730 | *count = ((VkWriteDescriptorSet*)pUpdateStruct)->count; |
| 731 | break; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 732 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 733 | // TODO : Need to understand this case better and make sure code is correct |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 734 | *count = ((VkCopyDescriptorSet*)pUpdateStruct)->count; |
| 735 | break; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 736 | default: |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 737 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 738 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 739 | *count = 0; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 740 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 741 | return skipCall; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 742 | } |
| 743 | // For given Layout Node and binding, return index where that binding begins |
| 744 | static uint32_t getBindingStartIndex(const LAYOUT_NODE* pLayout, const uint32_t binding) |
| 745 | { |
| 746 | uint32_t offsetIndex = 0; |
| 747 | for (uint32_t i = 0; i<binding; i++) { |
Chia-I Wu | 712bb5d | 2015-05-25 16:22:52 +0800 | [diff] [blame] | 748 | offsetIndex += pLayout->createInfo.pBinding[i].arraySize; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 749 | } |
| 750 | return offsetIndex; |
| 751 | } |
| 752 | // For given layout node and binding, return last index that is updated |
| 753 | static uint32_t getBindingEndIndex(const LAYOUT_NODE* pLayout, const uint32_t binding) |
| 754 | { |
| 755 | uint32_t offsetIndex = 0; |
| 756 | for (uint32_t i = 0; i<=binding; i++) { |
Chia-I Wu | 712bb5d | 2015-05-25 16:22:52 +0800 | [diff] [blame] | 757 | offsetIndex += pLayout->createInfo.pBinding[i].arraySize; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 758 | } |
| 759 | return offsetIndex-1; |
| 760 | } |
| 761 | // For given layout and update, return the first overall index of the layout that is update |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 762 | static VkBool32 getUpdateStartIndex(layer_data* my_data, const VkDevice device, const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct, uint32_t* startIndex) |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 763 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 764 | uint32_t binding = 0, arrayIndex = 0; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 765 | VkBool32 skipCall = getUpdateBinding(my_data, device, pUpdateStruct, &binding); |
| 766 | skipCall |= getUpdateArrayIndex(my_data, device, pUpdateStruct, &arrayIndex); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 767 | if (VK_FALSE == skipCall) |
| 768 | *startIndex = getBindingStartIndex(pLayout, binding)+arrayIndex; |
| 769 | return skipCall; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 770 | } |
| 771 | // For given layout and update, return the last overall index of the layout that is update |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 772 | static VkBool32 getUpdateEndIndex(layer_data* my_data, const VkDevice device, const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct, uint32_t* endIndex) |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 773 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 774 | uint32_t binding = 0, arrayIndex = 0, count = 0; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 775 | VkBool32 skipCall = getUpdateBinding(my_data, device, pUpdateStruct, &binding); |
| 776 | skipCall |= getUpdateArrayIndex(my_data, device, pUpdateStruct, &arrayIndex); |
| 777 | skipCall |= getUpdateCount(my_data, device, pUpdateStruct, &count); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 778 | if (VK_FALSE == skipCall) |
| 779 | *endIndex = getBindingStartIndex(pLayout, binding)+arrayIndex+count-1; |
| 780 | return skipCall; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 781 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 782 | // Verify that the descriptor type in the update struct matches what's expected by the layout |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 783 | static VkBool32 validateUpdateType(layer_data* my_data, const VkDevice device, const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 784 | { |
| 785 | // First get actual type of update |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 786 | VkBool32 skipCall = VK_FALSE; |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 787 | VkDescriptorType actualType; |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 788 | uint32_t i = 0, startIndex = 0, endIndex = 0; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 789 | switch (pUpdateStruct->sType) |
| 790 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 791 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 792 | actualType = ((VkWriteDescriptorSet*)pUpdateStruct)->descriptorType; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 793 | break; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 794 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
| 795 | /* no need to validate */ |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 796 | return VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 797 | break; |
| 798 | default: |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 799 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 800 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 801 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 802 | skipCall |= getUpdateStartIndex(my_data, device, pLayout, pUpdateStruct, &startIndex); |
| 803 | skipCall |= getUpdateEndIndex(my_data, device, pLayout, pUpdateStruct, &endIndex); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 804 | if (VK_FALSE == skipCall) { |
| 805 | for (i = startIndex; i <= endIndex; i++) { |
Tobin Ehlis | 644ff04 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 806 | if (pLayout->descriptorTypes[i] != actualType) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 807 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH, "DS", |
Tobin Ehlis | 483cc35 | 2015-09-30 08:30:20 -0600 | [diff] [blame] | 808 | "Descriptor update type of %s has descriptor type %s that does not match overlapping binding descriptor type of %s!", |
Tobin Ehlis | 644ff04 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 809 | string_VkStructureType(pUpdateStruct->sType), string_VkDescriptorType(actualType), string_VkDescriptorType(pLayout->descriptorTypes[i])); |
Tobin Ehlis | 483cc35 | 2015-09-30 08:30:20 -0600 | [diff] [blame] | 810 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 811 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 812 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 813 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 814 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 815 | // Determine the update type, allocate a new struct of that type, shadow the given pUpdate |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 816 | // struct into the pNewNode param. Return VK_TRUE if error condition encountered and callback signals early exit. |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 817 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 818 | static VkBool32 shadowUpdateNode(layer_data* my_data, const VkDevice device, GENERIC_HEADER* pUpdate, GENERIC_HEADER** pNewNode) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 819 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 820 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 821 | VkWriteDescriptorSet* pWDS = NULL; |
| 822 | VkCopyDescriptorSet* pCDS = NULL; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 823 | size_t array_size = 0; |
| 824 | size_t base_array_size = 0; |
| 825 | size_t total_array_size = 0; |
| 826 | size_t baseBuffAddr = 0; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 827 | switch (pUpdate->sType) |
| 828 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 829 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 830 | pWDS = new VkWriteDescriptorSet; |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 831 | *pNewNode = (GENERIC_HEADER*)pWDS; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 832 | memcpy(pWDS, pUpdate, sizeof(VkWriteDescriptorSet)); |
Courtney Goeltzenleuchter | 4cb6d92 | 2015-10-23 13:38:14 -0600 | [diff] [blame^] | 833 | |
| 834 | switch (pWDS->descriptorType) { |
| 835 | case VK_DESCRIPTOR_TYPE_SAMPLER: |
| 836 | case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: |
| 837 | case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: |
| 838 | case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: |
| 839 | { |
| 840 | VkDescriptorImageInfo *info = new VkDescriptorImageInfo[pWDS->count]; |
| 841 | memcpy(info, pWDS->pImageInfo, pWDS->count * sizeof(VkDescriptorImageInfo)); |
| 842 | pWDS->pImageInfo = info; |
| 843 | } |
| 844 | break; |
| 845 | case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: |
| 846 | case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: |
| 847 | { |
| 848 | VkBufferView *info = new VkBufferView[pWDS->count]; |
| 849 | memcpy(info, pWDS->pTexelBufferView, pWDS->count * sizeof(VkBufferView)); |
| 850 | pWDS->pTexelBufferView = info; |
| 851 | } |
| 852 | break; |
| 853 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: |
| 854 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: |
| 855 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: |
| 856 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: |
| 857 | { |
| 858 | VkDescriptorBufferInfo *info = new VkDescriptorBufferInfo[pWDS->count]; |
| 859 | memcpy(info, pWDS->pBufferInfo, pWDS->count * sizeof(VkDescriptorBufferInfo)); |
| 860 | pWDS->pBufferInfo = info; |
| 861 | } |
| 862 | break; |
| 863 | default: |
| 864 | return VK_ERROR_VALIDATION_FAILED; |
| 865 | break; |
| 866 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 867 | break; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 868 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
| 869 | pCDS = new VkCopyDescriptorSet; |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 870 | *pNewNode = (GENERIC_HEADER*)pCDS; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 871 | memcpy(pCDS, pUpdate, sizeof(VkCopyDescriptorSet)); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 872 | break; |
| 873 | default: |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 874 | if (log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 875 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdate->sType), pUpdate->sType)) |
| 876 | return VK_TRUE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 877 | } |
| 878 | // Make sure that pNext for the end of shadow copy is NULL |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 879 | (*pNewNode)->pNext = NULL; |
| 880 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 881 | } |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 882 | |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 883 | static VkBool32 validateDescriptorSetImageView(const layer_data* my_data, VkDevice device, uint32_t writeDsCount, const VkWriteDescriptorSet *pWDS) |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 884 | { |
| 885 | VkBool32 skipCall = VK_FALSE; |
| 886 | layer_data *dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 887 | |
| 888 | // Check ImageAspects of each descriptorSet in each writeDescriptorSet array |
| 889 | for (uint32_t i = 0; i < writeDsCount; i++) { |
| 890 | for (uint32_t j = 0; j < pWDS[i].count; j++) { |
Courtney Goeltzenleuchter | 4cb6d92 | 2015-10-23 13:38:14 -0600 | [diff] [blame^] | 891 | const VkDescriptorImageInfo *dInfo = &pWDS[i].pImageInfo[j]; |
| 892 | auto imageViewItem = dev_data->imageViewMap.find(dInfo->imageView.handle); |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 893 | if (imageViewItem != dev_data->imageViewMap.end()) { |
| 894 | VkImageAspectFlags flags = ((*imageViewItem).second)->subresourceRange.aspectMask; |
| 895 | if ((flags & VK_IMAGE_ASPECT_DEPTH_BIT) && |
| 896 | (flags & VK_IMAGE_ASPECT_STENCIL_BIT)) { |
Courtney Goeltzenleuchter | 4cb6d92 | 2015-10-23 13:38:14 -0600 | [diff] [blame^] | 897 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, dInfo->imageView.handle, 0, |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 898 | DRAWSTATE_INVALID_IMAGE_ASPECT, "DS", "vkUpdateDescriptorSets: DesriptorSet[%d] in WriteDesriptorSet[%d] " |
Tobin Ehlis | 07c100d | 2015-10-19 14:31:10 -0600 | [diff] [blame] | 899 | "has ImageView with both STENCIL and DEPTH aspects set", j, i); |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 900 | } |
| 901 | } |
| 902 | } |
| 903 | } |
| 904 | return skipCall; |
| 905 | } |
| 906 | |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 907 | // update DS mappings based on ppUpdateArray |
Tobin Ehlis | 1a4b9e7 | 2015-10-20 09:13:54 -0600 | [diff] [blame] | 908 | // TODO : copy updates are completely broken |
Courtney Goeltzenleuchter | 4cb6d92 | 2015-10-23 13:38:14 -0600 | [diff] [blame^] | 909 | // TODO : Validate that actual VkDescriptorImageInfo, VkDescriptorBufferInfo |
| 910 | // and VkBufferView in VkWriteDescriptorSet matches type: |
Tobin Ehlis | 1a4b9e7 | 2015-10-20 09:13:54 -0600 | [diff] [blame] | 911 | // pImageInfo array should be used for each descriptor if type is: |
| 912 | // VK_DESCRIPTOR_TYPE_SAMPLER: |
| 913 | // - uses sampler field of VkDescriptorImageInfo, |
| 914 | // VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: |
| 915 | // - uses sampler if binding doesn't use immutable sampler, |
| 916 | // - uses imageView & imageLayout |
| 917 | // VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, |
| 918 | // VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT |
| 919 | // - all use imageView & imageLayout |
| 920 | // pTexelBuffer array should be used for each descriptor if type is: |
| 921 | // VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER |
| 922 | // pBufferInfo array should be used for each descriptor if type is: |
| 923 | // VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, |
| 924 | // VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC |
| 925 | // TODO : Verify we validate this spec req: All consecutive bindings updated via a single |
| 926 | // VkWriteDescriptorSet structure must have identical descriptorType and stageFlags, |
| 927 | // and must all either use immutable samplers or none must use immutable samplers. |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 928 | static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, VkStructureType type, uint32_t updateCount, const void* pUpdateArray) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 929 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 930 | const VkWriteDescriptorSet *pWDS = NULL; |
| 931 | const VkCopyDescriptorSet *pCDS = NULL; |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 932 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 933 | |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 934 | if (type == VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET) { |
| 935 | pWDS = (const VkWriteDescriptorSet *)pUpdateArray; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 936 | skipCall |= validateDescriptorSetImageView(my_data, device, updateCount, pWDS); |
Mark Lobodzinski | f53c6e5 | 2015-10-16 13:32:24 -0600 | [diff] [blame] | 937 | } else { |
| 938 | pCDS = (const VkCopyDescriptorSet *)pUpdateArray; |
| 939 | } |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 940 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 941 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 942 | LAYOUT_NODE* pLayout = NULL; |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 943 | VkDescriptorSetLayoutCreateInfo* pLayoutCI = NULL; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 944 | // TODO : If pCIList is NULL, flag error |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 945 | // Perform all updates |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 946 | for (uint32_t i = 0; i < updateCount; i++) { |
Mark Lobodzinski | 5283348 | 2015-10-13 11:50:56 -0600 | [diff] [blame] | 947 | VkDescriptorSet ds = (pWDS) ? pWDS[i].destSet : pCDS[i].destSet; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 948 | SET_NODE* pSet = my_data->setMap[ds.handle]; // getSetNode() without locking |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 949 | g_lastBoundDescriptorSet = pSet->set; |
| 950 | GENERIC_HEADER* pUpdate = (pWDS) ? (GENERIC_HEADER*) &pWDS[i] : (GENERIC_HEADER*) &pCDS[i]; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 951 | pLayout = pSet->pLayout; |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 952 | // First verify valid update struct |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 953 | if ((skipCall = validUpdateStruct(my_data, device, pUpdate)) == VK_TRUE) { |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 954 | break; |
| 955 | } |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 956 | // Make sure that binding is within bounds |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 957 | uint32_t binding = 0, endIndex = 0; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 958 | skipCall |= getUpdateBinding(my_data, device, pUpdate, &binding); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 959 | if (pLayout->createInfo.count < binding) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 960 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, ds.handle, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 961 | "Descriptor Set %p does not have binding to match update binding %u for update type %s!", ds, binding, string_VkStructureType(pUpdate->sType)); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 962 | } else { |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 963 | // Next verify that update falls within size of given binding |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 964 | skipCall |= getUpdateBinding(my_data, device, pUpdate, &binding); |
| 965 | skipCall |= getUpdateEndIndex(my_data, device, pLayout, pUpdate, &endIndex); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 966 | if (getBindingEndIndex(pLayout, binding) < endIndex) { |
Tony Barbour | 3b4732f | 2015-07-13 13:37:24 -0600 | [diff] [blame] | 967 | // TODO : Keep count of layout CI structs and size this string dynamically based on that count |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 968 | pLayoutCI = &pLayout->createInfo; |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 969 | string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 970 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, ds.handle, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 971 | "Descriptor update type of %s is out of bounds for matching binding %u in Layout w/ CI:\n%s!", string_VkStructureType(pUpdate->sType), binding, DSstr.c_str()); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 972 | } else { // TODO : should we skip update on a type mismatch or force it? |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 973 | // Layout bindings match w/ update ok, now verify that update is of the right type |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 974 | if ((skipCall = validateUpdateType(my_data, device, pLayout, pUpdate)) == VK_FALSE) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 975 | // Save the update info |
| 976 | // TODO : Info message that update successful |
| 977 | // Create new update struct for this set's shadow copy |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 978 | GENERIC_HEADER* pNewNode = NULL; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 979 | skipCall |= shadowUpdateNode(my_data, device, pUpdate, &pNewNode); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 980 | if (NULL == pNewNode) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 981 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, ds.handle, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 982 | "Out of memory while attempting to allocate UPDATE struct in vkUpdateDescriptors()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 983 | } else { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 984 | // Insert shadow node into LL of updates for this set |
| 985 | pNewNode->pNext = pSet->pUpdateStructs; |
| 986 | pSet->pUpdateStructs = pNewNode; |
| 987 | // Now update appropriate descriptor(s) to point to new Update node |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 988 | skipCall |= getUpdateEndIndex(my_data, device, pLayout, pUpdate, &endIndex); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 989 | uint32_t startIndex; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 990 | skipCall |= getUpdateStartIndex(my_data, device, pLayout, pUpdate, &startIndex); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 991 | for (uint32_t j = startIndex; j <= endIndex; j++) { |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 992 | assert(j<pSet->descriptorCount); |
| 993 | pSet->ppDescriptors[j] = pNewNode; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 994 | } |
| 995 | } |
| 996 | } |
| 997 | } |
| 998 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 999 | } |
| 1000 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1001 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1002 | } |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1003 | // Verify that given pool has descriptors that are being requested for allocation |
| 1004 | static VkBool32 validate_descriptor_availability_in_pool(layer_data* dev_data, POOL_NODE* pPoolNode, uint32_t count, const VkDescriptorSetLayout* pSetLayouts) |
| 1005 | { |
| 1006 | VkBool32 skipCall = VK_FALSE; |
| 1007 | uint32_t i = 0, j = 0; |
| 1008 | for (i=0; i<count; ++i) { |
| 1009 | LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pSetLayouts[i]); |
| 1010 | if (NULL == pLayout) { |
| 1011 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, pSetLayouts[i].handle, 0, DRAWSTATE_INVALID_LAYOUT, "DS", |
| 1012 | "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocDescriptorSets() call", pSetLayouts[i].handle); |
| 1013 | } else { |
| 1014 | uint32_t typeIndex = 0, typeCount = 0; |
| 1015 | for (j=0; j<pLayout->createInfo.count; ++j) { |
| 1016 | typeIndex = static_cast<uint32_t>(pLayout->createInfo.pBinding[j].descriptorType); |
| 1017 | typeCount = pLayout->createInfo.pBinding[j].arraySize; |
| 1018 | if (typeCount > pPoolNode->availableDescriptorTypeCount[typeIndex]) { |
| 1019 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, pLayout->layout.handle, 0, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, "DS", |
| 1020 | "Unable to allocate %u descriptors of type %s from pool %#" PRIxLEAST64 ". This pool only has %u descriptors of this type remaining.", |
| 1021 | typeCount, string_VkDescriptorType(pLayout->createInfo.pBinding[j].descriptorType), pPoolNode->pool.handle, pPoolNode->availableDescriptorTypeCount[typeIndex]); |
| 1022 | } else { // Decrement available descriptors of this type |
| 1023 | pPoolNode->availableDescriptorTypeCount[typeIndex] -= typeCount; |
| 1024 | } |
| 1025 | } |
| 1026 | } |
| 1027 | } |
| 1028 | return skipCall; |
| 1029 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1030 | // Free the shadowed update node for this Set |
| 1031 | // NOTE : Calls to this function should be wrapped in mutex |
| 1032 | static void freeShadowUpdateTree(SET_NODE* pSet) |
| 1033 | { |
| 1034 | GENERIC_HEADER* pShadowUpdate = pSet->pUpdateStructs; |
| 1035 | pSet->pUpdateStructs = NULL; |
| 1036 | GENERIC_HEADER* pFreeUpdate = pShadowUpdate; |
| 1037 | // Clear the descriptor mappings as they will now be invalid |
| 1038 | memset(pSet->ppDescriptors, 0, pSet->descriptorCount*sizeof(GENERIC_HEADER*)); |
| 1039 | while(pShadowUpdate) { |
| 1040 | pFreeUpdate = pShadowUpdate; |
| 1041 | pShadowUpdate = (GENERIC_HEADER*)pShadowUpdate->pNext; |
| 1042 | uint32_t index = 0; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1043 | VkWriteDescriptorSet * pWDS = NULL; |
| 1044 | VkCopyDescriptorSet * pCDS = NULL; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1045 | void** ppToFree = NULL; |
| 1046 | switch (pFreeUpdate->sType) |
| 1047 | { |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1048 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 1049 | pWDS = (VkWriteDescriptorSet*)pFreeUpdate; |
Courtney Goeltzenleuchter | 4cb6d92 | 2015-10-23 13:38:14 -0600 | [diff] [blame^] | 1050 | if (pWDS->pImageInfo) { |
| 1051 | delete[] pWDS->pImageInfo; |
| 1052 | } |
| 1053 | if (pWDS->pBufferInfo) { |
| 1054 | delete[] pWDS->pBufferInfo; |
| 1055 | } |
| 1056 | if (pWDS->pTexelBufferView) { |
| 1057 | delete[] pWDS->pTexelBufferView; |
Courtney Goeltzenleuchter | aa132e7 | 2015-10-22 15:31:56 -0600 | [diff] [blame] | 1058 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1059 | break; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1060 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1061 | break; |
| 1062 | default: |
| 1063 | assert(0); |
| 1064 | break; |
| 1065 | } |
Tobin Ehlis | ecc6bd0 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 1066 | delete pFreeUpdate; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1067 | } |
| 1068 | } |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1069 | // Free all DS Pools including their Sets & related sub-structs |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1070 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1071 | static void deletePools(layer_data* my_data) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1072 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1073 | if (my_data->poolMap.size() <= 0) |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1074 | return; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1075 | for (auto ii=my_data->poolMap.begin(); ii!=my_data->poolMap.end(); ++ii) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1076 | SET_NODE* pSet = (*ii).second->pSets; |
| 1077 | SET_NODE* pFreeSet = pSet; |
| 1078 | while (pSet) { |
| 1079 | pFreeSet = pSet; |
| 1080 | pSet = pSet->pNext; |
Tobin Ehlis | ecc6bd0 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 1081 | // Freeing layouts handled in deleteLayouts() function |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1082 | // Free Update shadow struct tree |
| 1083 | freeShadowUpdateTree(pFreeSet); |
| 1084 | if (pFreeSet->ppDescriptors) { |
Chris Forbes | 0203879 | 2015-06-04 10:49:27 +1200 | [diff] [blame] | 1085 | delete[] pFreeSet->ppDescriptors; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1086 | } |
| 1087 | delete pFreeSet; |
| 1088 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1089 | delete (*ii).second; |
| 1090 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1091 | my_data->poolMap.clear(); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1092 | } |
Tobin Ehlis | ecc6bd0 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 1093 | // WARN : Once deleteLayouts() called, any layout ptrs in Pool/Set data structure will be invalid |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1094 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1095 | static void deleteLayouts(layer_data* my_data) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1096 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1097 | if (my_data->layoutMap.size() <= 0) |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1098 | return; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1099 | for (auto ii=my_data->layoutMap.begin(); ii!=my_data->layoutMap.end(); ++ii) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1100 | LAYOUT_NODE* pLayout = (*ii).second; |
Tobin Ehlis | ecc6bd0 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 1101 | if (pLayout->createInfo.pBinding) { |
| 1102 | for (uint32_t i=0; i<pLayout->createInfo.count; i++) { |
| 1103 | if (pLayout->createInfo.pBinding[i].pImmutableSamplers) |
| 1104 | delete[] pLayout->createInfo.pBinding[i].pImmutableSamplers; |
| 1105 | } |
| 1106 | delete[] pLayout->createInfo.pBinding; |
| 1107 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1108 | delete pLayout; |
| 1109 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1110 | my_data->layoutMap.clear(); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1111 | } |
| 1112 | // Currently clearing a set is removing all previous updates to that set |
| 1113 | // TODO : Validate if this is correct clearing behavior |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1114 | static void clearDescriptorSet(layer_data* my_data, VkDescriptorSet set) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1115 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1116 | SET_NODE* pSet = getSetNode(my_data, set); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1117 | if (!pSet) { |
| 1118 | // TODO : Return error |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1119 | } else { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1120 | loader_platform_thread_lock_mutex(&globalLock); |
| 1121 | freeShadowUpdateTree(pSet); |
| 1122 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1123 | } |
| 1124 | } |
| 1125 | |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1126 | static void clearDescriptorPool(layer_data* my_data, const VkDevice device, const VkDescriptorPool pool, VkDescriptorPoolResetFlags flags) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1127 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1128 | POOL_NODE* pPool = getPoolNode(my_data, pool); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1129 | if (!pPool) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1130 | log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, pool.handle, 0, DRAWSTATE_INVALID_POOL, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1131 | "Unable to find pool node for pool %#" PRIxLEAST64 " specified in vkResetDescriptorPool() call", pool.handle); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1132 | } else { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1133 | // TODO: validate flags |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1134 | // For every set off of this pool, clear it |
| 1135 | SET_NODE* pSet = pPool->pSets; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1136 | while (pSet) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1137 | clearDescriptorSet(my_data, pSet->set); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1138 | } |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1139 | // Reset available count to max count for this pool |
| 1140 | for (uint32_t i=0; i<pPool->availableDescriptorTypeCount.size(); ++i) { |
| 1141 | pPool->availableDescriptorTypeCount[i] = pPool->maxDescriptorTypeCount[i]; |
| 1142 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1143 | } |
| 1144 | } |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1145 | // For given CB object, fetch associated CB Node from map |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1146 | static GLOBAL_CB_NODE* getCBNode(layer_data* my_data, const VkCmdBuffer cb) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1147 | { |
| 1148 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1149 | if (my_data->cmdBufferMap.find(cb) == my_data->cmdBufferMap.end()) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1150 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1151 | // TODO : How to pass cb as srcObj here? |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1152 | log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", |
Courtney Goeltzenleuchter | dee721d | 2015-08-26 15:09:25 -0600 | [diff] [blame] | 1153 | "Attempt to use CmdBuffer %#" PRIxLEAST64 " that doesn't exist!", reinterpret_cast<uint64_t>(cb)); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1154 | return NULL; |
| 1155 | } |
| 1156 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1157 | return my_data->cmdBufferMap[cb]; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1158 | } |
| 1159 | // Free all CB Nodes |
| 1160 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1161 | static void deleteCmdBuffers(layer_data* my_data) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1162 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1163 | if (my_data->cmdBufferMap.size() <= 0) |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1164 | return; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1165 | for (auto ii=my_data->cmdBufferMap.begin(); ii!=my_data->cmdBufferMap.end(); ++ii) { |
Courtney Goeltzenleuchter | ea3117c | 2015-04-27 15:04:43 -0600 | [diff] [blame] | 1166 | vector<CMD_NODE*> cmd_node_list = (*ii).second->pCmds; |
| 1167 | while (!cmd_node_list.empty()) { |
| 1168 | CMD_NODE* cmd_node = cmd_node_list.back(); |
| 1169 | delete cmd_node; |
| 1170 | cmd_node_list.pop_back(); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1171 | } |
| 1172 | delete (*ii).second; |
| 1173 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1174 | my_data->cmdBufferMap.clear(); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1175 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1176 | static VkBool32 report_error_no_cb_begin(const layer_data* dev_data, const VkCmdBuffer cb, const char* caller_name) |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 1177 | { |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1178 | // TODO : How to pass cb as srcObj here? |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1179 | return log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_BEGIN_CMD_BUFFER, "DS", |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 1180 | "You must call vkBeginCommandBuffer() before this call to %s", (void*)caller_name); |
| 1181 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1182 | static VkBool32 addCmd(const layer_data* my_data, GLOBAL_CB_NODE* pCB, const CMD_TYPE cmd) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1183 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1184 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1185 | CMD_NODE* pCmd = new CMD_NODE; |
| 1186 | if (pCmd) { |
| 1187 | // init cmd node and append to end of cmd LL |
| 1188 | memset(pCmd, 0, sizeof(CMD_NODE)); |
| 1189 | pCmd->cmdNumber = ++pCB->numCmds; |
| 1190 | pCmd->type = cmd; |
| 1191 | pCB->pCmds.push_back(pCmd); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1192 | } else { |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1193 | // TODO : How to pass cb as srcObj here? |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1194 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Courtney Goeltzenleuchter | dee721d | 2015-08-26 15:09:25 -0600 | [diff] [blame] | 1195 | "Out of memory while attempting to allocate new CMD_NODE for cmdBuffer %#" PRIxLEAST64, reinterpret_cast<uint64_t>(pCB->cmdBuffer)); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1196 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1197 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1198 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1199 | static void resetCB(layer_data* my_data, const VkCmdBuffer cb) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1200 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1201 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1202 | if (pCB) { |
Courtney Goeltzenleuchter | 3597a20 | 2015-04-27 17:16:56 -0600 | [diff] [blame] | 1203 | vector<CMD_NODE*> cmd_list = pCB->pCmds; |
| 1204 | while (!cmd_list.empty()) { |
| 1205 | delete cmd_list.back(); |
| 1206 | cmd_list.pop_back(); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1207 | } |
Courtney Goeltzenleuchter | 3597a20 | 2015-04-27 17:16:56 -0600 | [diff] [blame] | 1208 | pCB->pCmds.clear(); |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 1209 | // Reset CB state (need to save createInfo) |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1210 | VkCmdBufferAllocInfo saveCBCI = pCB->createInfo; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1211 | memset(pCB, 0, sizeof(GLOBAL_CB_NODE)); |
| 1212 | pCB->cmdBuffer = cb; |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 1213 | pCB->createInfo = saveCBCI; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1214 | pCB->lastVtxBinding = MAX_BINDING; |
| 1215 | } |
| 1216 | } |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1217 | // Set PSO-related status bits for CB, including dynamic state set via PSO |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1218 | static void set_cb_pso_status(GLOBAL_CB_NODE* pCB, const PIPELINE_NODE* pPipe) |
| 1219 | { |
| 1220 | for (uint32_t i = 0; i < pPipe->cbStateCI.attachmentCount; i++) { |
| 1221 | if (0 != pPipe->pAttachments[i].channelWriteMask) { |
| 1222 | pCB->status |= CBSTATUS_COLOR_BLEND_WRITE_ENABLE; |
| 1223 | } |
| 1224 | } |
| 1225 | if (pPipe->dsStateCI.depthWriteEnable) { |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 1226 | pCB->status |= CBSTATUS_DEPTH_WRITE_ENABLE; |
| 1227 | } |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 1228 | if (pPipe->dsStateCI.stencilTestEnable) { |
| 1229 | pCB->status |= CBSTATUS_STENCIL_TEST_ENABLE; |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1230 | } |
Tobin Ehlis | d332f28 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1231 | // Account for any dynamic state not set via this PSO |
| 1232 | if (!pPipe->dynStateCI.dynamicStateCount) { // All state is static |
| 1233 | pCB->status = CBSTATUS_ALL; |
| 1234 | } else { |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1235 | // First consider all state on |
| 1236 | // Then unset any state that's noted as dynamic in PSO |
| 1237 | // Finally OR that into CB statemask |
| 1238 | CBStatusFlags psoDynStateMask = CBSTATUS_ALL; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1239 | for (uint32_t i=0; i < pPipe->dynStateCI.dynamicStateCount; i++) { |
| 1240 | switch (pPipe->dynStateCI.pDynamicStates[i]) { |
| 1241 | case VK_DYNAMIC_STATE_VIEWPORT: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1242 | psoDynStateMask &= ~CBSTATUS_VIEWPORT_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1243 | break; |
| 1244 | case VK_DYNAMIC_STATE_SCISSOR: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1245 | psoDynStateMask &= ~CBSTATUS_SCISSOR_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1246 | break; |
| 1247 | case VK_DYNAMIC_STATE_LINE_WIDTH: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1248 | psoDynStateMask &= ~CBSTATUS_LINE_WIDTH_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1249 | break; |
| 1250 | case VK_DYNAMIC_STATE_DEPTH_BIAS: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1251 | psoDynStateMask &= ~CBSTATUS_DEPTH_BIAS_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1252 | break; |
| 1253 | case VK_DYNAMIC_STATE_BLEND_CONSTANTS: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1254 | psoDynStateMask &= ~CBSTATUS_BLEND_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1255 | break; |
| 1256 | case VK_DYNAMIC_STATE_DEPTH_BOUNDS: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1257 | psoDynStateMask &= ~CBSTATUS_DEPTH_BOUNDS_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1258 | break; |
| 1259 | case VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1260 | psoDynStateMask &= ~CBSTATUS_STENCIL_READ_MASK_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1261 | break; |
| 1262 | case VK_DYNAMIC_STATE_STENCIL_WRITE_MASK: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1263 | psoDynStateMask &= ~CBSTATUS_STENCIL_WRITE_MASK_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1264 | break; |
| 1265 | case VK_DYNAMIC_STATE_STENCIL_REFERENCE: |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1266 | psoDynStateMask &= ~CBSTATUS_STENCIL_REFERENCE_SET; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1267 | break; |
| 1268 | default: |
| 1269 | // TODO : Flag error here |
| 1270 | break; |
| 1271 | } |
| 1272 | } |
Tobin Ehlis | 5e5a1e9 | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 1273 | pCB->status |= psoDynStateMask; |
Tobin Ehlis | 963a404 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1274 | } |
Tobin Ehlis | e382c5a | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1275 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1276 | // Print the last bound Gfx Pipeline |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1277 | static VkBool32 printPipeline(layer_data* my_data, const VkCmdBuffer cb) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1278 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1279 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1280 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1281 | if (pCB) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1282 | PIPELINE_NODE *pPipeTrav = getPipeline(my_data, pCB->lastBoundPipeline); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1283 | if (!pPipeTrav) { |
| 1284 | // nothing to print |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1285 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1286 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1287 | vk_print_vkgraphicspipelinecreateinfo(&pPipeTrav->graphicsPipelineCI, "{DS}").c_str()); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1288 | } |
| 1289 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1290 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1291 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1292 | // Print details of DS config to stdout |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1293 | static VkBool32 printDSConfig(layer_data* my_data, const VkCmdBuffer cb) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1294 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1295 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1296 | char ds_config_str[1024*256] = {0}; // TODO : Currently making this buffer HUGE w/o overrun protection. Need to be smarter, start smaller, and grow as needed. |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1297 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
Tobin Ehlis | 93f89e8 | 2015-06-09 08:39:32 -0600 | [diff] [blame] | 1298 | if (pCB && pCB->lastBoundDescriptorSet) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1299 | SET_NODE* pSet = getSetNode(my_data, pCB->lastBoundDescriptorSet); |
| 1300 | POOL_NODE* pPool = getPoolNode(my_data, pSet->pool); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1301 | // Print out pool details |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1302 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1303 | "Details for pool %#" PRIxLEAST64 ".", pPool->pool.handle); |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1304 | string poolStr = vk_print_vkdescriptorpoolcreateinfo(&pPool->createInfo, " "); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1305 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1306 | "%s", poolStr.c_str()); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1307 | // Print out set details |
| 1308 | char prefix[10]; |
| 1309 | uint32_t index = 0; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1310 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1311 | "Details for descriptor set %#" PRIxLEAST64 ".", pSet->set.handle); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1312 | LAYOUT_NODE* pLayout = pSet->pLayout; |
| 1313 | // Print layout details |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1314 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1315 | "Layout #%u, (object %#" PRIxLEAST64 ") for DS %#" PRIxLEAST64 ".", index+1, (void*)pLayout->layout.handle, (void*)pSet->set.handle); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1316 | sprintf(prefix, " [L%u] ", index); |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1317 | string DSLstr = vk_print_vkdescriptorsetlayoutcreateinfo(&pLayout->createInfo, prefix).c_str(); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1318 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1319 | "%s", DSLstr.c_str()); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1320 | index++; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1321 | GENERIC_HEADER* pUpdate = pSet->pUpdateStructs; |
| 1322 | if (pUpdate) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1323 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1324 | "Update Chain [UC] for descriptor set %#" PRIxLEAST64 ":", pSet->set.handle); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1325 | sprintf(prefix, " [UC] "); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1326 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1327 | dynamic_display(pUpdate, prefix).c_str()); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1328 | // TODO : If there is a "view" associated with this update, print CI for that view |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1329 | } else { |
Tobin Ehlis | bf081f3 | 2015-06-15 08:41:17 -0600 | [diff] [blame] | 1330 | if (0 != pSet->descriptorCount) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1331 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1332 | "No Update Chain for descriptor set %#" PRIxLEAST64 " which has %u descriptors (vkUpdateDescriptors has not been called)", pSet->set.handle, pSet->descriptorCount); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1333 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1334 | skipCall |= log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1335 | "FYI: No descriptors in descriptor set %#" PRIxLEAST64 ".", pSet->set.handle); |
Tobin Ehlis | bf081f3 | 2015-06-15 08:41:17 -0600 | [diff] [blame] | 1336 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1337 | } |
| 1338 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1339 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1340 | } |
| 1341 | |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1342 | static void printCB(layer_data* my_data, const VkCmdBuffer cb) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1343 | { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1344 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
David Pinedo | d8f83d8 | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1345 | if (pCB && pCB->pCmds.size() > 0) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1346 | log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1347 | "Cmds in CB %p", (void*)cb); |
Courtney Goeltzenleuchter | ba348a9 | 2015-04-27 11:16:35 -0600 | [diff] [blame] | 1348 | vector<CMD_NODE*> pCmds = pCB->pCmds; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1349 | for (auto ii=pCmds.begin(); ii!=pCmds.end(); ++ii) { |
| 1350 | // TODO : Need to pass cb as srcObj here |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1351 | log_msg(my_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1352 | " CMD#%lu: %s", (*ii)->cmdNumber, cmdTypeToString((*ii)->type).c_str()); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1353 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1354 | } else { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1355 | // Nothing to print |
| 1356 | } |
| 1357 | } |
| 1358 | |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1359 | static VkBool32 synchAndPrintDSConfig(layer_data* my_data, const VkCmdBuffer cb) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1360 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1361 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1362 | if (!(my_data->report_data->active_flags & VK_DBG_REPORT_INFO_BIT)) { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1363 | return skipCall; |
Mike Stroyan | ba35e35 | 2015-08-12 17:11:28 -0600 | [diff] [blame] | 1364 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1365 | skipCall |= printDSConfig(my_data, cb); |
| 1366 | skipCall |= printPipeline(my_data, cb); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1367 | return skipCall; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1368 | } |
| 1369 | |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 1370 | // Flags validation error if the associated call is made inside a render pass. The apiName |
| 1371 | // routine should ONLY be called outside a render pass. |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1372 | static VkBool32 insideRenderPass(const layer_data* my_data, GLOBAL_CB_NODE *pCB, const char *apiName) |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 1373 | { |
| 1374 | VkBool32 inside = VK_FALSE; |
| 1375 | if (pCB->activeRenderPass) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1376 | inside = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 1377 | (uint64_t)pCB->cmdBuffer, 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", |
| 1378 | "%s: It is invalid to issue this call inside an active render pass (%#" PRIxLEAST64 ")", |
| 1379 | apiName, pCB->activeRenderPass.handle); |
| 1380 | } |
| 1381 | return inside; |
| 1382 | } |
| 1383 | |
| 1384 | // Flags validation error if the associated call is made outside a render pass. The apiName |
| 1385 | // routine should ONLY be called inside a render pass. |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1386 | static VkBool32 outsideRenderPass(const layer_data* my_data, GLOBAL_CB_NODE *pCB, const char *apiName) |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 1387 | { |
| 1388 | VkBool32 outside = VK_FALSE; |
| 1389 | if (!pCB->activeRenderPass) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1390 | outside = log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
Mark Lobodzinski | 61f4d1f | 2015-10-01 17:00:47 -0600 | [diff] [blame] | 1391 | (uint64_t)pCB->cmdBuffer, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 1392 | "%s: This call must be issued inside an active render pass.", apiName); |
| 1393 | } |
| 1394 | return outside; |
| 1395 | } |
| 1396 | |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1397 | static void init_draw_state(layer_data *my_data) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1398 | { |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1399 | uint32_t report_flags = 0; |
| 1400 | uint32_t debug_action = 0; |
| 1401 | FILE *log_output = NULL; |
| 1402 | const char *option_str; |
Courtney Goeltzenleuchter | 62d945a | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 1403 | VkDbgMsgCallback callback; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1404 | // initialize DrawState options |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1405 | report_flags = getLayerOptionFlags("DrawStateReportFlags", 0); |
| 1406 | getLayerOptionEnum("DrawStateDebugAction", (uint32_t *) &debug_action); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1407 | |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1408 | if (debug_action & VK_DBG_LAYER_ACTION_LOG_MSG) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1409 | { |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1410 | option_str = getLayerOption("DrawStateLogFilename"); |
Tobin Ehlis | b1df55e | 2015-09-15 09:55:54 -0600 | [diff] [blame] | 1411 | log_output = getLayerLogOutput(option_str, "DrawState"); |
Courtney Goeltzenleuchter | 62d945a | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 1412 | layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &callback); |
| 1413 | my_data->logging_callback.push_back(callback); |
| 1414 | } |
| 1415 | |
| 1416 | if (debug_action & VK_DBG_LAYER_ACTION_DEBUG_OUTPUT) { |
| 1417 | layer_create_msg_callback(my_data->report_data, report_flags, win32_debug_output_msg, NULL, &callback); |
| 1418 | my_data->logging_callback.push_back(callback); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1419 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1420 | |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1421 | if (!globalLockInitialized) |
| 1422 | { |
Mike Stroyan | fcb4ba6 | 2015-08-18 15:56:18 -0600 | [diff] [blame] | 1423 | // This mutex may be deleted by vkDestroyInstance of last instance. |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1424 | loader_platform_thread_create_mutex(&globalLock); |
| 1425 | globalLockInitialized = 1; |
| 1426 | } |
| 1427 | } |
| 1428 | |
Courtney Goeltzenleuchter | abc035e | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 1429 | VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, VkInstance* pInstance) |
| 1430 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1431 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); |
| 1432 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Courtney Goeltzenleuchter | abc035e | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 1433 | VkResult result = pTable->CreateInstance(pCreateInfo, pInstance); |
| 1434 | |
| 1435 | if (result == VK_SUCCESS) { |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1436 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); |
| 1437 | my_data->report_data = debug_report_create_instance( |
| 1438 | pTable, |
| 1439 | *pInstance, |
| 1440 | pCreateInfo->extensionCount, |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1441 | pCreateInfo->ppEnabledExtensionNames); |
Courtney Goeltzenleuchter | d02a964 | 2015-06-08 14:58:39 -0600 | [diff] [blame] | 1442 | |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1443 | init_draw_state(my_data); |
Courtney Goeltzenleuchter | abc035e | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 1444 | } |
| 1445 | return result; |
| 1446 | } |
| 1447 | |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 1448 | /* hook DestroyInstance to remove tableInstanceMap entry */ |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1449 | VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance) |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 1450 | { |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1451 | dispatch_key key = get_dispatch_key(instance); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1452 | layer_data *my_data = get_my_data_ptr(key, layer_data_map); |
| 1453 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1454 | pTable->DestroyInstance(instance); |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1455 | |
| 1456 | // Clean up logging callback, if any |
Courtney Goeltzenleuchter | 62d945a | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 1457 | while (my_data->logging_callback.size() > 0) { |
| 1458 | VkDbgMsgCallback callback = my_data->logging_callback.back(); |
| 1459 | layer_destroy_msg_callback(my_data->report_data, callback); |
| 1460 | my_data->logging_callback.pop_back(); |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1461 | } |
| 1462 | |
Courtney Goeltzenleuchter | ee4027d | 2015-06-28 13:01:17 -0600 | [diff] [blame] | 1463 | layer_debug_report_destroy_instance(my_data->report_data); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1464 | delete my_data->instance_dispatch_table; |
| 1465 | layer_data_map.erase(key); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1466 | // TODO : Potential race here with separate threads creating/destroying instance |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1467 | if (layer_data_map.empty()) { |
Mike Stroyan | fcb4ba6 | 2015-08-18 15:56:18 -0600 | [diff] [blame] | 1468 | // Release mutex when destroying last instance. |
| 1469 | loader_platform_thread_delete_mutex(&globalLock); |
| 1470 | globalLockInitialized = 0; |
| 1471 | } |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 1472 | } |
| 1473 | |
Jon Ashburn | e68a9ff | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 1474 | static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo, VkDevice device) |
| 1475 | { |
Tony Barbour | 3b4732f | 2015-07-13 13:37:24 -0600 | [diff] [blame] | 1476 | uint32_t i; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1477 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1478 | dev_data->device_extensions.debug_marker_enabled = false; |
Jon Ashburn | e68a9ff | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 1479 | |
| 1480 | for (i = 0; i < pCreateInfo->extensionCount; i++) { |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1481 | if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], DEBUG_MARKER_EXTENSION_NAME) == 0) { |
Jon Ashburn | eab3449 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 1482 | /* Found a matching extension name, mark it enabled and init dispatch table*/ |
| 1483 | initDebugMarkerTable(device); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1484 | dev_data->device_extensions.debug_marker_enabled = true; |
Jon Ashburn | e68a9ff | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 1485 | } |
Jon Ashburn | e68a9ff | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 1486 | } |
| 1487 | } |
| 1488 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 1489 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1490 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1491 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); |
| 1492 | VkResult result = dev_data->device_dispatch_table->CreateDevice(gpu, pCreateInfo, pDevice); |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1493 | if (result == VK_SUCCESS) { |
| 1494 | layer_data *my_instance_data = get_my_data_ptr(get_dispatch_key(gpu), layer_data_map); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1495 | dev_data->report_data = layer_debug_report_create_device(my_instance_data->report_data, *pDevice); |
Jon Ashburn | 747f2b6 | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 1496 | createDeviceRegisterExtensions(pCreateInfo, *pDevice); |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1497 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1498 | return result; |
| 1499 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1500 | // prototype |
| 1501 | static void deleteRenderPasses(layer_data*); |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1502 | VK_LAYER_EXPORT void VKAPI vkDestroyDevice(VkDevice device) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1503 | { |
Jeremy Hayes | 5d29ce3 | 2015-06-19 11:37:38 -0600 | [diff] [blame] | 1504 | dispatch_key key = get_dispatch_key(device); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1505 | layer_data* dev_data = get_my_data_ptr(key, layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1506 | // Free all the memory |
| 1507 | loader_platform_thread_lock_mutex(&globalLock); |
| 1508 | deletePipelines(dev_data); |
| 1509 | deleteRenderPasses(dev_data); |
| 1510 | deleteCmdBuffers(dev_data); |
| 1511 | deletePools(dev_data); |
| 1512 | deleteLayouts(dev_data); |
| 1513 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1514 | |
| 1515 | dev_data->device_dispatch_table->DestroyDevice(device); |
| 1516 | tableDebugMarkerMap.erase(key); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1517 | delete dev_data->device_dispatch_table; |
| 1518 | layer_data_map.erase(key); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1519 | } |
| 1520 | |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1521 | static const VkLayerProperties ds_global_layers[] = { |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1522 | { |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1523 | "DrawState", |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1524 | VK_API_VERSION, |
| 1525 | VK_MAKE_VERSION(0, 1, 0), |
| 1526 | "Validation layer: DrawState", |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1527 | } |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1528 | }; |
| 1529 | |
Courtney Goeltzenleuchter | 35985f6 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 1530 | VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceExtensionProperties( |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1531 | const char *pLayerName, |
| 1532 | uint32_t *pCount, |
| 1533 | VkExtensionProperties* pProperties) |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1534 | { |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1535 | /* DrawState does not have any global extensions */ |
| 1536 | return util_GetExtensionProperties(0, NULL, pCount, pProperties); |
| 1537 | } |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1538 | |
Courtney Goeltzenleuchter | 35985f6 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 1539 | VK_LAYER_EXPORT VkResult VKAPI vkEnumerateInstanceLayerProperties( |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1540 | uint32_t *pCount, |
| 1541 | VkLayerProperties* pProperties) |
| 1542 | { |
| 1543 | return util_GetLayerProperties(ARRAY_SIZE(ds_global_layers), |
| 1544 | ds_global_layers, |
| 1545 | pCount, pProperties); |
| 1546 | } |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1547 | |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1548 | static const VkExtensionProperties ds_device_extensions[] = { |
| 1549 | { |
| 1550 | DEBUG_MARKER_EXTENSION_NAME, |
| 1551 | VK_MAKE_VERSION(0, 1, 0), |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1552 | } |
| 1553 | }; |
| 1554 | |
| 1555 | static const VkLayerProperties ds_device_layers[] = { |
| 1556 | { |
| 1557 | "DrawState", |
| 1558 | VK_API_VERSION, |
| 1559 | VK_MAKE_VERSION(0, 1, 0), |
| 1560 | "Validation layer: DrawState", |
| 1561 | } |
| 1562 | }; |
| 1563 | |
Courtney Goeltzenleuchter | 35985f6 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 1564 | VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceExtensionProperties( |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1565 | VkPhysicalDevice physicalDevice, |
| 1566 | const char* pLayerName, |
| 1567 | uint32_t* pCount, |
| 1568 | VkExtensionProperties* pProperties) |
| 1569 | { |
| 1570 | /* Mem tracker does not have any physical device extensions */ |
| 1571 | return util_GetExtensionProperties(ARRAY_SIZE(ds_device_extensions), ds_device_extensions, |
| 1572 | pCount, pProperties); |
| 1573 | } |
| 1574 | |
Courtney Goeltzenleuchter | 35985f6 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 1575 | VK_LAYER_EXPORT VkResult VKAPI vkEnumerateDeviceLayerProperties( |
Courtney Goeltzenleuchter | 7ad58c0 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 1576 | VkPhysicalDevice physicalDevice, |
| 1577 | uint32_t* pCount, |
| 1578 | VkLayerProperties* pProperties) |
| 1579 | { |
| 1580 | /* Mem tracker's physical device layers are the same as global */ |
| 1581 | return util_GetLayerProperties(ARRAY_SIZE(ds_device_layers), ds_device_layers, |
| 1582 | pCount, pProperties); |
Jon Ashburn | 9fd4cc4 | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 1583 | } |
| 1584 | |
Courtney Goeltzenleuchter | 646b907 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1585 | VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmitInfo, VkFence fence) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1586 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1587 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | a9f3d76 | 2015-05-22 12:38:16 -0600 | [diff] [blame] | 1588 | GLOBAL_CB_NODE* pCB = NULL; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1589 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); |
Courtney Goeltzenleuchter | 646b907 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1590 | for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { |
| 1591 | const VkSubmitInfo *submit = &pSubmitInfo[submit_idx]; |
| 1592 | for (uint32_t i=0; i < submit->cmdBufferCount; i++) { |
| 1593 | // Validate that cmd buffers have been updated |
| 1594 | pCB = getCBNode(dev_data, submit->pCommandBuffers[i]); |
| 1595 | loader_platform_thread_lock_mutex(&globalLock); |
| 1596 | pCB->submitCount++; // increment submit count |
Courtney Goeltzenleuchter | 04bb5f8 | 2015-10-21 18:11:04 -0600 | [diff] [blame] | 1597 | if ((pCB->beginInfo.flags & VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) && (pCB->submitCount > 1)) { |
Courtney Goeltzenleuchter | 646b907 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1598 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_CMD_BUFFER_SINGLE_SUBMIT_VIOLATION, "DS", |
Courtney Goeltzenleuchter | 04bb5f8 | 2015-10-21 18:11:04 -0600 | [diff] [blame] | 1599 | "CB %#" PRIxLEAST64 " was begun w/ VK_CMD_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT set, but has been submitted %#" PRIxLEAST64 " times.", reinterpret_cast<uint64_t>(pCB->cmdBuffer), pCB->submitCount); |
Courtney Goeltzenleuchter | 646b907 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1600 | } |
| 1601 | if (CB_UPDATE_COMPLETE != pCB->state) { |
| 1602 | // Flag error for using CB w/o vkEndCommandBuffer() called |
| 1603 | // TODO : How to pass cb as srcObj? |
| 1604 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_END_CMD_BUFFER, "DS", |
| 1605 | "You must call vkEndCommandBuffer() on CB %#" PRIxLEAST64 " before this call to vkQueueSubmit()!", reinterpret_cast<uint64_t>(pCB->cmdBuffer)); |
| 1606 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1607 | return VK_ERROR_VALIDATION_FAILED; |
| 1608 | } |
Tobin Ehlis | c4bdde1 | 2015-05-27 14:30:06 -0600 | [diff] [blame] | 1609 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | a9f3d76 | 2015-05-22 12:38:16 -0600 | [diff] [blame] | 1610 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1611 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1612 | if (VK_FALSE == skipCall) |
Courtney Goeltzenleuchter | 646b907 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 1613 | return dev_data->device_dispatch_table->QueueSubmit(queue, submitCount, pSubmitInfo, fence); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1614 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1615 | } |
| 1616 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1617 | VK_LAYER_EXPORT void VKAPI vkDestroyFence(VkDevice device, VkFence fence) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1618 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1619 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyFence(device, fence); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1620 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1621 | } |
| 1622 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1623 | VK_LAYER_EXPORT void VKAPI vkDestroySemaphore(VkDevice device, VkSemaphore semaphore) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1624 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1625 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroySemaphore(device, semaphore); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1626 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1627 | } |
| 1628 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1629 | VK_LAYER_EXPORT void VKAPI vkDestroyEvent(VkDevice device, VkEvent event) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1630 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1631 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyEvent(device, event); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1632 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1633 | } |
| 1634 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1635 | VK_LAYER_EXPORT void VKAPI vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1636 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1637 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyQueryPool(device, queryPool); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1638 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1639 | } |
| 1640 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1641 | VK_LAYER_EXPORT void VKAPI vkDestroyBuffer(VkDevice device, VkBuffer buffer) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1642 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1643 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyBuffer(device, buffer); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1644 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1645 | } |
| 1646 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1647 | VK_LAYER_EXPORT void VKAPI vkDestroyBufferView(VkDevice device, VkBufferView bufferView) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1648 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1649 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyBufferView(device, bufferView); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1650 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1651 | } |
| 1652 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1653 | VK_LAYER_EXPORT void VKAPI vkDestroyImage(VkDevice device, VkImage image) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1654 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1655 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyImage(device, image); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1656 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1657 | } |
| 1658 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1659 | VK_LAYER_EXPORT void VKAPI vkDestroyImageView(VkDevice device, VkImageView imageView) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1660 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1661 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyImageView(device, imageView); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1662 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1663 | } |
| 1664 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1665 | VK_LAYER_EXPORT void VKAPI vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1666 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1667 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyShaderModule(device, shaderModule); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1668 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1669 | } |
| 1670 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1671 | VK_LAYER_EXPORT void VKAPI vkDestroyShader(VkDevice device, VkShader shader) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1672 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1673 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyShader(device, shader); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1674 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1675 | } |
| 1676 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1677 | VK_LAYER_EXPORT void VKAPI vkDestroyPipeline(VkDevice device, VkPipeline pipeline) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1678 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1679 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyPipeline(device, pipeline); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1680 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1681 | } |
| 1682 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1683 | VK_LAYER_EXPORT void VKAPI vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1684 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1685 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyPipelineLayout(device, pipelineLayout); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1686 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1687 | } |
| 1688 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1689 | VK_LAYER_EXPORT void VKAPI vkDestroySampler(VkDevice device, VkSampler sampler) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1690 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1691 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroySampler(device, sampler); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1692 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1693 | } |
| 1694 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1695 | VK_LAYER_EXPORT void VKAPI vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1696 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1697 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyDescriptorSetLayout(device, descriptorSetLayout); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1698 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1699 | } |
| 1700 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1701 | VK_LAYER_EXPORT void VKAPI vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1702 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1703 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyDescriptorPool(device, descriptorPool); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1704 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1705 | } |
| 1706 | |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1707 | VK_LAYER_EXPORT void VKAPI vkFreeCommandBuffers(VkDevice device, VkCmdPool cmdPool, uint32_t count, const VkCmdBuffer *pCommandBuffers) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1708 | { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1709 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->FreeCommandBuffers(device, cmdPool, count, pCommandBuffers); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1710 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1711 | } |
| 1712 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1713 | VK_LAYER_EXPORT void VKAPI vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1714 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1715 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyFramebuffer(device, framebuffer); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1716 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1717 | } |
| 1718 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1719 | VK_LAYER_EXPORT void VKAPI vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1720 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1721 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyRenderPass(device, renderPass); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1722 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1723 | } |
| 1724 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1725 | VK_LAYER_EXPORT VkResult VKAPI vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, VkBufferView* pView) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1726 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1727 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1728 | VkResult result = dev_data->device_dispatch_table->CreateBufferView(device, pCreateInfo, pView); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1729 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1730 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1731 | dev_data->bufferViewMap[pView->handle] = unique_ptr<BUFFER_NODE>(new BUFFER_NODE(pView, pCreateInfo)); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1732 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1733 | } |
| 1734 | return result; |
| 1735 | } |
| 1736 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1737 | VK_LAYER_EXPORT VkResult VKAPI vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, VkImageView* pView) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1738 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1739 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1740 | VkResult result = dev_data->device_dispatch_table->CreateImageView(device, pCreateInfo, pView); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1741 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1742 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1743 | dev_data->imageViewMap[pView->handle] = unique_ptr<VkImageViewCreateInfo>(new VkImageViewCreateInfo(*pCreateInfo)); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 1744 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1745 | } |
| 1746 | return result; |
| 1747 | } |
| 1748 | |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1749 | //TODO handle pipeline caches |
| 1750 | VkResult VKAPI vkCreatePipelineCache( |
| 1751 | VkDevice device, |
| 1752 | const VkPipelineCacheCreateInfo* pCreateInfo, |
| 1753 | VkPipelineCache* pPipelineCache) |
| 1754 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1755 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1756 | VkResult result = dev_data->device_dispatch_table->CreatePipelineCache(device, pCreateInfo, pPipelineCache); |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1757 | return result; |
| 1758 | } |
| 1759 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 1760 | void VKAPI vkDestroyPipelineCache( |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1761 | VkDevice device, |
| 1762 | VkPipelineCache pipelineCache) |
| 1763 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1764 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1765 | dev_data->device_dispatch_table->DestroyPipelineCache(device, pipelineCache); |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1766 | } |
| 1767 | |
| 1768 | size_t VKAPI vkGetPipelineCacheSize( |
| 1769 | VkDevice device, |
| 1770 | VkPipelineCache pipelineCache) |
| 1771 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1772 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1773 | size_t size = dev_data->device_dispatch_table->GetPipelineCacheSize(device, pipelineCache); |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1774 | return size; |
| 1775 | } |
| 1776 | |
| 1777 | VkResult VKAPI vkGetPipelineCacheData( |
| 1778 | VkDevice device, |
| 1779 | VkPipelineCache pipelineCache, |
Courtney Goeltzenleuchter | 299e6d1 | 2015-10-16 09:58:26 -0600 | [diff] [blame] | 1780 | size_t dataSize, |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1781 | void* pData) |
| 1782 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1783 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Courtney Goeltzenleuchter | 299e6d1 | 2015-10-16 09:58:26 -0600 | [diff] [blame] | 1784 | VkResult result = dev_data->device_dispatch_table->GetPipelineCacheData(device, pipelineCache, dataSize, pData); |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1785 | return result; |
| 1786 | } |
| 1787 | |
| 1788 | VkResult VKAPI vkMergePipelineCaches( |
| 1789 | VkDevice device, |
| 1790 | VkPipelineCache destCache, |
| 1791 | uint32_t srcCacheCount, |
| 1792 | const VkPipelineCache* pSrcCaches) |
| 1793 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1794 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1795 | VkResult result = dev_data->device_dispatch_table->MergePipelineCaches(device, destCache, srcCacheCount, pSrcCaches); |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 1796 | return result; |
| 1797 | } |
| 1798 | |
| 1799 | VK_LAYER_EXPORT VkResult VKAPI vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, VkPipeline* pPipelines) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1800 | { |
Courtney Goeltzenleuchter | ed89407 | 2015-09-04 13:39:59 -0600 | [diff] [blame] | 1801 | VkResult result = VK_SUCCESS; |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1802 | //TODO What to do with pipelineCache? |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1803 | // The order of operations here is a little convoluted but gets the job done |
| 1804 | // 1. Pipeline create state is first shadowed into PIPELINE_NODE struct |
| 1805 | // 2. Create state is then validated (which uses flags setup during shadowing) |
| 1806 | // 3. If everything looks good, we'll then create the pipeline and add NODE to pipelineMap |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1807 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 6539977 | 2015-09-17 16:33:58 -0600 | [diff] [blame] | 1808 | // TODO : Improve this data struct w/ unique_ptrs so cleanup below is automatic |
| 1809 | vector<PIPELINE_NODE*> pPipeNode(count); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1810 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1811 | uint32_t i=0; |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1812 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1813 | for (i=0; i<count; i++) { |
| 1814 | pPipeNode[i] = initPipeline(&pCreateInfos[i], NULL); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1815 | skipCall |= verifyPipelineCreateState(dev_data, device, pPipeNode[i]); |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1816 | } |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1817 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1818 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1819 | result = dev_data->device_dispatch_table->CreateGraphicsPipelines(device, pipelineCache, count, pCreateInfos, pPipelines); |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1820 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1821 | for (i=0; i<count; i++) { |
| 1822 | pPipeNode[i]->pipeline = pPipelines[i]; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1823 | dev_data->pipelineMap[pPipeNode[i]->pipeline.handle] = pPipeNode[i]; |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1824 | } |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1825 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1826 | } else { |
Tobin Ehlis | 11efc30 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 1827 | for (i=0; i<count; i++) { |
| 1828 | if (pPipeNode[i]) { |
| 1829 | // If we allocated a pipeNode, need to clean it up here |
| 1830 | delete[] pPipeNode[i]->pVertexBindingDescriptions; |
| 1831 | delete[] pPipeNode[i]->pVertexAttributeDescriptions; |
| 1832 | delete[] pPipeNode[i]->pAttachments; |
| 1833 | delete pPipeNode[i]; |
| 1834 | } |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1835 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1836 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 75283bf | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1837 | } |
Courtney Goeltzenleuchter | e2aaad0 | 2015-04-13 16:16:04 -0600 | [diff] [blame] | 1838 | return result; |
| 1839 | } |
| 1840 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1841 | VK_LAYER_EXPORT VkResult VKAPI vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, VkSampler* pSampler) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1842 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1843 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1844 | VkResult result = dev_data->device_dispatch_table->CreateSampler(device, pCreateInfo, pSampler); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1845 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1846 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1847 | dev_data->sampleMap[pSampler->handle] = unique_ptr<SAMPLER_NODE>(new SAMPLER_NODE(pSampler, pCreateInfo)); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1848 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1849 | } |
| 1850 | return result; |
| 1851 | } |
| 1852 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1853 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayout* pSetLayout) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1854 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1855 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1856 | VkResult result = dev_data->device_dispatch_table->CreateDescriptorSetLayout(device, pCreateInfo, pSetLayout); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1857 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1858 | LAYOUT_NODE* pNewNode = new LAYOUT_NODE; |
| 1859 | if (NULL == pNewNode) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1860 | if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (*pSetLayout).handle, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1861 | "Out of memory while attempting to allocate LAYOUT_NODE in vkCreateDescriptorSetLayout()")) |
| 1862 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1863 | } |
| 1864 | memset(pNewNode, 0, sizeof(LAYOUT_NODE)); |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1865 | memcpy((void*)&pNewNode->createInfo, pCreateInfo, sizeof(VkDescriptorSetLayoutCreateInfo)); |
| 1866 | pNewNode->createInfo.pBinding = new VkDescriptorSetLayoutBinding[pCreateInfo->count]; |
| 1867 | memcpy((void*)pNewNode->createInfo.pBinding, pCreateInfo->pBinding, sizeof(VkDescriptorSetLayoutBinding)*pCreateInfo->count); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1868 | uint32_t totalCount = 0; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1869 | for (uint32_t i=0; i<pCreateInfo->count; i++) { |
Chia-I Wu | 712bb5d | 2015-05-25 16:22:52 +0800 | [diff] [blame] | 1870 | totalCount += pCreateInfo->pBinding[i].arraySize; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1871 | if (pCreateInfo->pBinding[i].pImmutableSamplers) { |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1872 | VkSampler** ppIS = (VkSampler**)&pNewNode->createInfo.pBinding[i].pImmutableSamplers; |
Chia-I Wu | 712bb5d | 2015-05-25 16:22:52 +0800 | [diff] [blame] | 1873 | *ppIS = new VkSampler[pCreateInfo->pBinding[i].arraySize]; |
| 1874 | memcpy(*ppIS, pCreateInfo->pBinding[i].pImmutableSamplers, pCreateInfo->pBinding[i].arraySize*sizeof(VkSampler)); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1875 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1876 | } |
| 1877 | if (totalCount > 0) { |
Tobin Ehlis | 644ff04 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 1878 | pNewNode->descriptorTypes.reserve(totalCount); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1879 | uint32_t offset = 0; |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1880 | uint32_t j = 0; |
| 1881 | for (uint32_t i=0; i<pCreateInfo->count; i++) { |
Chia-I Wu | 712bb5d | 2015-05-25 16:22:52 +0800 | [diff] [blame] | 1882 | for (j = 0; j < pCreateInfo->pBinding[i].arraySize; j++) { |
Tobin Ehlis | 644ff04 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 1883 | pNewNode->descriptorTypes[offset + j] = pCreateInfo->pBinding[i].descriptorType; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1884 | } |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1885 | offset += j; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1886 | } |
| 1887 | } |
| 1888 | pNewNode->layout = *pSetLayout; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1889 | pNewNode->startIndex = 0; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1890 | pNewNode->endIndex = pNewNode->startIndex + totalCount - 1; |
| 1891 | assert(pNewNode->endIndex >= pNewNode->startIndex); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1892 | // Put new node at Head of global Layer list |
| 1893 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1894 | dev_data->layoutMap[pSetLayout->handle] = pNewNode; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1895 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1896 | } |
| 1897 | return result; |
| 1898 | } |
| 1899 | |
Mark Lobodzinski | 0fadf5f | 2015-04-17 14:11:39 -0500 | [diff] [blame] | 1900 | VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, VkPipelineLayout* pPipelineLayout) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1901 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1902 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1903 | VkResult result = dev_data->device_dispatch_table->CreatePipelineLayout(device, pCreateInfo, pPipelineLayout); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1904 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 644ff04 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 1905 | PIPELINE_LAYOUT_NODE plNode = dev_data->pipelineLayoutMap[pPipelineLayout->handle]; |
| 1906 | plNode.descriptorSetLayouts.reserve(pCreateInfo->descriptorSetCount); |
| 1907 | uint32_t i = 0; |
| 1908 | for (i=0; i<pCreateInfo->descriptorSetCount; ++i) { |
| 1909 | plNode.descriptorSetLayouts[i] = pCreateInfo->pSetLayouts[i]; |
| 1910 | } |
| 1911 | plNode.pushConstantRanges.reserve(pCreateInfo->pushConstantRangeCount); |
| 1912 | for (i=0; i<pCreateInfo->pushConstantRangeCount; ++i) { |
| 1913 | plNode.pushConstantRanges[i] = pCreateInfo->pPushConstantRanges[i]; |
| 1914 | } |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1915 | } |
| 1916 | return result; |
| 1917 | } |
| 1918 | |
Courtney Goeltzenleuchter | fe908d3 | 2015-09-16 16:12:45 -0600 | [diff] [blame] | 1919 | VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1920 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1921 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 1922 | VkResult result = dev_data->device_dispatch_table->CreateDescriptorPool(device, pCreateInfo, pDescriptorPool); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1923 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1924 | // Insert this pool into Global Pool LL at head |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1925 | if (log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (*pDescriptorPool).handle, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1926 | "Created Descriptor Pool %#" PRIxLEAST64, (*pDescriptorPool).handle)) |
| 1927 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1928 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1929 | POOL_NODE* pNewNode = new POOL_NODE(*pDescriptorPool, pCreateInfo); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1930 | if (NULL == pNewNode) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1931 | if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (*pDescriptorPool).handle, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1932 | "Out of memory while attempting to allocate POOL_NODE in vkCreateDescriptorPool()")) |
| 1933 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1934 | } else { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1935 | dev_data->poolMap[pDescriptorPool->handle] = pNewNode; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1936 | } |
| 1937 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1938 | } else { |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1939 | // Need to do anything if pool create fails? |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1940 | } |
| 1941 | return result; |
| 1942 | } |
| 1943 | |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1944 | VK_LAYER_EXPORT VkResult VKAPI vkResetDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1945 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1946 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1947 | VkResult result = dev_data->device_dispatch_table->ResetDescriptorPool(device, descriptorPool, flags); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1948 | if (VK_SUCCESS == result) { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1949 | clearDescriptorPool(dev_data, device, descriptorPool, flags); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1950 | } |
| 1951 | return result; |
| 1952 | } |
| 1953 | |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1954 | VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, const VkDescriptorSetAllocInfo* pAllocInfo, VkDescriptorSet* pDescriptorSets) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1955 | { |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1956 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 1957 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1958 | // Verify that requested descriptorSets are available in pool |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1959 | POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocInfo->descriptorPool); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1960 | if (!pPoolNode) { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1961 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, pAllocInfo->descriptorPool.handle, 0, DRAWSTATE_INVALID_POOL, "DS", |
| 1962 | "Unable to find pool node for pool %#" PRIxLEAST64 " specified in vkAllocDescriptorSets() call", pAllocInfo->descriptorPool.handle); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1963 | } else { // Make sure pool has all the available descriptors before calling down chain |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1964 | skipCall |= validate_descriptor_availability_in_pool(dev_data, pPoolNode, pAllocInfo->count, pAllocInfo->pSetLayouts); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1965 | } |
| 1966 | if (skipCall) |
| 1967 | return VK_ERROR_VALIDATION_FAILED; |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1968 | VkResult result = dev_data->device_dispatch_table->AllocDescriptorSets(device, pAllocInfo, pDescriptorSets); |
Cody Northrop | 1e4f802 | 2015-08-03 12:47:29 -0600 | [diff] [blame] | 1969 | if (VK_SUCCESS == result) { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1970 | POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocInfo->descriptorPool); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 1971 | if (pPoolNode) { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1972 | if (pAllocInfo->count == 0) { |
| 1973 | log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pAllocInfo->count, 0, DRAWSTATE_NONE, "DS", |
Cody Northrop | 1e4f802 | 2015-08-03 12:47:29 -0600 | [diff] [blame] | 1974 | "AllocDescriptorSets called with 0 count"); |
| 1975 | } |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1976 | for (uint32_t i = 0; i < pAllocInfo->count; i++) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1977 | log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pDescriptorSets[i].handle, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1978 | "Created Descriptor Set %#" PRIxLEAST64, pDescriptorSets[i].handle); |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1979 | // Create new set node and add to head of pool nodes |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1980 | SET_NODE* pNewNode = new SET_NODE; |
| 1981 | if (NULL == pNewNode) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1982 | if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pDescriptorSets[i].handle, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1983 | "Out of memory while attempting to allocate SET_NODE in vkAllocDescriptorSets()")) |
| 1984 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 1985 | } else { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1986 | memset(pNewNode, 0, sizeof(SET_NODE)); |
Tobin Ehlis | 8b5b28c | 2015-10-19 12:09:13 -0600 | [diff] [blame] | 1987 | // TODO : Pool should store a total count of each type of Descriptor available |
| 1988 | // When descriptors are allocated, decrement the count and validate here |
| 1989 | // that the count doesn't go below 0. One reset/free need to bump count back up. |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1990 | // Insert set at head of Set LL for this pool |
| 1991 | pNewNode->pNext = pPoolNode->pSets; |
| 1992 | pPoolNode->pSets = pNewNode; |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1993 | LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pAllocInfo->pSetLayouts[i]); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1994 | if (NULL == pLayout) { |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 1995 | if (log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, pAllocInfo->pSetLayouts[i].handle, 0, DRAWSTATE_INVALID_LAYOUT, "DS", |
| 1996 | "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocDescriptorSets() call", pAllocInfo->pSetLayouts[i].handle)) |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1997 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1998 | } |
Tobin Ehlis | 793ad30 | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1999 | pNewNode->pLayout = pLayout; |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2000 | pNewNode->pool = pAllocInfo->descriptorPool; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2001 | pNewNode->set = pDescriptorSets[i]; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2002 | pNewNode->descriptorCount = pLayout->endIndex + 1; |
| 2003 | if (pNewNode->descriptorCount) { |
| 2004 | size_t descriptorArraySize = sizeof(GENERIC_HEADER*)*pNewNode->descriptorCount; |
| 2005 | pNewNode->ppDescriptors = new GENERIC_HEADER*[descriptorArraySize]; |
| 2006 | memset(pNewNode->ppDescriptors, 0, descriptorArraySize); |
| 2007 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2008 | dev_data->setMap[pDescriptorSets[i].handle] = pNewNode; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2009 | } |
| 2010 | } |
| 2011 | } |
| 2012 | } |
| 2013 | return result; |
| 2014 | } |
| 2015 | |
Tony Barbour | 34ec692 | 2015-07-10 10:50:45 -0600 | [diff] [blame] | 2016 | VK_LAYER_EXPORT VkResult VKAPI vkFreeDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets) |
| 2017 | { |
Tobin Ehlis | e735c69 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 2018 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2019 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | e735c69 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 2020 | POOL_NODE *pPoolNode = getPoolNode(dev_data, descriptorPool); |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2021 | if (pPoolNode && !(VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT & pPoolNode->createInfo.flags)) { |
| 2022 | // Can't Free from a NON_FREE pool |
| 2023 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, (uint64_t)device, 0, DRAWSTATE_CANT_FREE_FROM_NON_FREE_POOL, "DS", |
| 2024 | "It is invalid to call vkFreeDescriptorSets() with a pool created without setting VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT."); |
Tobin Ehlis | e735c69 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 2025 | } |
| 2026 | if (skipCall) |
| 2027 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2028 | VkResult result = dev_data->device_dispatch_table->FreeDescriptorSets(device, descriptorPool, count, pDescriptorSets); |
Tobin Ehlis | f93f1e3 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2029 | if (VK_SUCCESS == result) { |
| 2030 | // For each freed descriptor add it back into the pool as available |
| 2031 | for (uint32_t i=0; i<count; ++i) { |
| 2032 | SET_NODE* pSet = dev_data->setMap[pDescriptorSets[i].handle]; // getSetNode() without locking |
| 2033 | LAYOUT_NODE* pLayout = pSet->pLayout; |
| 2034 | uint32_t typeIndex = 0, typeCount = 0; |
| 2035 | for (uint32_t j=0; j<pLayout->createInfo.count; ++j) { |
| 2036 | typeIndex = static_cast<uint32_t>(pLayout->createInfo.pBinding[j].descriptorType); |
| 2037 | typeCount = pLayout->createInfo.pBinding[j].arraySize; |
| 2038 | pPoolNode->availableDescriptorTypeCount[typeIndex] += typeCount; |
| 2039 | } |
| 2040 | } |
| 2041 | } |
| 2042 | // TODO : Any other clean-up or book-keeping to do here? |
Tony Barbour | 34ec692 | 2015-07-10 10:50:45 -0600 | [diff] [blame] | 2043 | return result; |
| 2044 | } |
| 2045 | |
Mark Lobodzinski | 2141f65 | 2015-09-07 13:59:43 -0600 | [diff] [blame] | 2046 | VK_LAYER_EXPORT void VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2047 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2048 | // dsUpdate will return VK_TRUE only if a bailout error occurs, so we want to call down tree when both updates return VK_FALSE |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2049 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2050 | if (!dsUpdate(dev_data, device, VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, writeCount, pDescriptorWrites) && |
| 2051 | !dsUpdate(dev_data, device, VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET, copyCount, pDescriptorCopies)) { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2052 | dev_data->device_dispatch_table->UpdateDescriptorSets(device, writeCount, pDescriptorWrites, copyCount, pDescriptorCopies); |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2053 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2054 | } |
| 2055 | |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2056 | VK_LAYER_EXPORT VkResult VKAPI vkAllocCommandBuffers(VkDevice device, const VkCmdBufferAllocInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2057 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2058 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2059 | VkResult result = dev_data->device_dispatch_table->AllocCommandBuffers(device, pCreateInfo, pCmdBuffer); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2060 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2061 | loader_platform_thread_lock_mutex(&globalLock); |
| 2062 | GLOBAL_CB_NODE* pCB = new GLOBAL_CB_NODE; |
| 2063 | memset(pCB, 0, sizeof(GLOBAL_CB_NODE)); |
| 2064 | pCB->cmdBuffer = *pCmdBuffer; |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2065 | pCB->createInfo = *pCreateInfo; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2066 | pCB->lastVtxBinding = MAX_BINDING; |
Mark Lobodzinski | d9139a6 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 2067 | pCB->level = pCreateInfo->level; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2068 | dev_data->cmdBufferMap[*pCmdBuffer] = pCB; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2069 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2070 | updateCBTracking(pCB); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2071 | } |
| 2072 | return result; |
| 2073 | } |
| 2074 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2075 | VK_LAYER_EXPORT VkResult VKAPI vkBeginCommandBuffer(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2076 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2077 | VkBool32 skipCall = false; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2078 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Mark Lobodzinski | d9139a6 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 2079 | // Validate command buffer level |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2080 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Mark Lobodzinski | d9139a6 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 2081 | if (pCB) { |
| 2082 | if (pCB->level == VK_CMD_BUFFER_LEVEL_PRIMARY) { |
| 2083 | if (pBeginInfo->renderPass.handle || pBeginInfo->framebuffer.handle) { |
| 2084 | // These should be NULL for a Primary CB |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2085 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2086 | "vkAllocCommandBuffers(): Primary Command Buffer (%p) may not specify framebuffer or renderpass parameters", (void*)cmdBuffer); |
Mark Lobodzinski | d9139a6 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 2087 | } |
| 2088 | } else { |
| 2089 | if (!pBeginInfo->renderPass.handle || !pBeginInfo->framebuffer.handle) { |
| 2090 | // These should NOT be null for an Secondary CB |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2091 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2092 | "vkAllocCommandBuffers(): Secondary Command Buffers (%p) must specify framebuffer and renderpass parameters", (void*)cmdBuffer); |
Mark Lobodzinski | d9139a6 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 2093 | } |
| 2094 | } |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2095 | pCB->beginInfo = *pBeginInfo; |
| 2096 | } else { |
| 2097 | // TODO : Need to pass cmdBuffer as objType here |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2098 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_CMD_BUFFER, "DS", |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2099 | "In vkBeginCommandBuffer() and unable to find CmdBuffer Node for CB %p!", (void*)cmdBuffer); |
Mark Lobodzinski | d9139a6 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 2100 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2101 | if (skipCall) { |
| 2102 | return VK_ERROR_VALIDATION_FAILED; |
Courtney Goeltzenleuchter | 5fe086f | 2015-09-04 15:03:52 -0600 | [diff] [blame] | 2103 | } |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2104 | VkResult result = dev_data->device_dispatch_table->BeginCommandBuffer(cmdBuffer, pBeginInfo); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2105 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2106 | if (CB_NEW != pCB->state) |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2107 | resetCB(dev_data, cmdBuffer); |
Tobin Ehlis | 59278bf | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2108 | pCB->state = CB_UPDATE_ACTIVE; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2109 | updateCBTracking(pCB); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2110 | } |
| 2111 | return result; |
| 2112 | } |
| 2113 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2114 | VK_LAYER_EXPORT VkResult VKAPI vkEndCommandBuffer(VkCmdBuffer cmdBuffer) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2115 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2116 | VkBool32 skipCall = VK_FALSE; |
Courtney Goeltzenleuchter | ed89407 | 2015-09-04 13:39:59 -0600 | [diff] [blame] | 2117 | VkResult result = VK_SUCCESS; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2118 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 2119 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Courtney Goeltzenleuchter | ed89407 | 2015-09-04 13:39:59 -0600 | [diff] [blame] | 2120 | /* TODO: preference is to always call API function after reporting any validation errors */ |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2121 | if (pCB) { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2122 | if (pCB->state != CB_UPDATE_ACTIVE) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2123 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkEndCommandBuffer()"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2124 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2125 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2126 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2127 | result = dev_data->device_dispatch_table->EndCommandBuffer(cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2128 | if (VK_SUCCESS == result) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2129 | updateCBTracking(pCB); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2130 | pCB->state = CB_UPDATE_COMPLETE; |
| 2131 | // Reset CB status flags |
| 2132 | pCB->status = 0; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2133 | printCB(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2134 | } |
| 2135 | } else { |
| 2136 | result = VK_ERROR_VALIDATION_FAILED; |
| 2137 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2138 | return result; |
| 2139 | } |
| 2140 | |
Cody Northrop | e62183e | 2015-07-09 18:08:05 -0600 | [diff] [blame] | 2141 | VK_LAYER_EXPORT VkResult VKAPI vkResetCommandBuffer(VkCmdBuffer cmdBuffer, VkCmdBufferResetFlags flags) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2142 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2143 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 2144 | VkResult result = dev_data->device_dispatch_table->ResetCommandBuffer(cmdBuffer, flags); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 2145 | if (VK_SUCCESS == result) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2146 | resetCB(dev_data, cmdBuffer); |
| 2147 | updateCBTracking(getCBNode(dev_data, cmdBuffer)); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2148 | } |
| 2149 | return result; |
| 2150 | } |
| 2151 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2152 | VK_LAYER_EXPORT void VKAPI vkCmdBindPipeline(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2153 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2154 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2155 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2156 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2157 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2158 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2159 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2160 | skipCall |= addCmd(dev_data, pCB, CMD_BINDPIPELINE); |
Tobin Ehlis | 6d58e6d | 2015-06-23 08:46:18 -0600 | [diff] [blame] | 2161 | if ((VK_PIPELINE_BIND_POINT_COMPUTE == pipelineBindPoint) && (pCB->activeRenderPass)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2162 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline.handle, |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2163 | 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", |
| 2164 | "Incorrectly binding compute pipeline (%#" PRIxLEAST64 ") during active RenderPass (%#" PRIxLEAST64 ")", |
| 2165 | pipeline.handle, pCB->activeRenderPass.handle); |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2166 | } else if ((VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) && (!pCB->activeRenderPass)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2167 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline.handle, |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2168 | 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", "Incorrectly binding graphics pipeline " |
| 2169 | " (%#" PRIxLEAST64 ") without an active RenderPass", pipeline.handle); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2170 | } else { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2171 | PIPELINE_NODE* pPN = getPipeline(dev_data, pipeline); |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2172 | if (pPN) { |
| 2173 | pCB->lastBoundPipeline = pipeline; |
| 2174 | loader_platform_thread_lock_mutex(&globalLock); |
| 2175 | set_cb_pso_status(pCB, pPN); |
| 2176 | g_lastBoundPipeline = pPN; |
| 2177 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2178 | skipCall |= validatePipelineState(dev_data, pCB, pipelineBindPoint, pipeline); |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2179 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2180 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, pipeline.handle, |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2181 | 0, DRAWSTATE_INVALID_PIPELINE, "DS", |
| 2182 | "Attempt to bind Pipeline %#" PRIxLEAST64 " that doesn't exist!", (void*)pipeline.handle); |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2183 | } |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2184 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2185 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2186 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindPipeline()"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2187 | } |
| 2188 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2189 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2190 | dev_data->device_dispatch_table->CmdBindPipeline(cmdBuffer, pipelineBindPoint, pipeline); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2191 | } |
| 2192 | |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2193 | VK_LAYER_EXPORT void VKAPI vkCmdSetViewport( |
| 2194 | VkCmdBuffer cmdBuffer, |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2195 | uint32_t viewportCount, |
| 2196 | const VkViewport* pViewports) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2197 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2198 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2199 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2200 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2201 | if (pCB) { |
| 2202 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2203 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2204 | skipCall |= addCmd(dev_data, pCB, CMD_SETVIEWPORTSTATE); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2205 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2206 | pCB->status |= CBSTATUS_VIEWPORT_SET; |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2207 | pCB->viewports.resize(viewportCount); |
Tobin Ehlis | e68360f | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 2208 | memcpy(pCB->viewports.data(), pViewports, viewportCount * sizeof(VkViewport)); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2209 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2210 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2211 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetViewport()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2212 | } |
| 2213 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2214 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2215 | dev_data->device_dispatch_table->CmdSetViewport(cmdBuffer, viewportCount, pViewports); |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2216 | } |
| 2217 | |
| 2218 | VK_LAYER_EXPORT void VKAPI vkCmdSetScissor( |
| 2219 | VkCmdBuffer cmdBuffer, |
| 2220 | uint32_t scissorCount, |
| 2221 | const VkRect2D* pScissors) |
| 2222 | { |
| 2223 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2224 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2225 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2226 | if (pCB) { |
| 2227 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2228 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2229 | skipCall |= addCmd(dev_data, pCB, CMD_SETSCISSORSTATE); |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2230 | loader_platform_thread_lock_mutex(&globalLock); |
| 2231 | pCB->status |= CBSTATUS_SCISSOR_SET; |
| 2232 | pCB->scissors.resize(scissorCount); |
Tobin Ehlis | e68360f | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 2233 | memcpy(pCB->scissors.data(), pScissors, scissorCount * sizeof(VkRect2D)); |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2234 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2235 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2236 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetScissor()"); |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 2237 | } |
| 2238 | } |
| 2239 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2240 | dev_data->device_dispatch_table->CmdSetScissor(cmdBuffer, scissorCount, pScissors); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2241 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2242 | |
| 2243 | VK_LAYER_EXPORT void VKAPI vkCmdSetLineWidth(VkCmdBuffer cmdBuffer, float lineWidth) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2244 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2245 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2246 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2247 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2248 | if (pCB) { |
| 2249 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2250 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2251 | skipCall |= addCmd(dev_data, pCB, CMD_SETLINEWIDTHSTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2252 | /* TODO: Do we still need this lock? */ |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2253 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2254 | pCB->status |= CBSTATUS_LINE_WIDTH_SET; |
| 2255 | pCB->lineWidth = lineWidth; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2256 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2257 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2258 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindDynamicLineWidthState()"); |
Cody Northrop | 1236511 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 2259 | } |
| 2260 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2261 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2262 | dev_data->device_dispatch_table->CmdSetLineWidth(cmdBuffer, lineWidth); |
Cody Northrop | 1236511 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 2263 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2264 | |
| 2265 | VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBias( |
| 2266 | VkCmdBuffer cmdBuffer, |
| 2267 | float depthBias, |
| 2268 | float depthBiasClamp, |
| 2269 | float slopeScaledDepthBias) |
Cody Northrop | 1236511 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 2270 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2271 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2272 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2273 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Cody Northrop | 1236511 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 2274 | if (pCB) { |
| 2275 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2276 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2277 | skipCall |= addCmd(dev_data, pCB, CMD_SETDEPTHBIASSTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2278 | pCB->status |= CBSTATUS_DEPTH_BIAS_SET; |
| 2279 | pCB->depthBias = depthBias; |
| 2280 | pCB->depthBiasClamp = depthBiasClamp; |
| 2281 | pCB->slopeScaledDepthBias = slopeScaledDepthBias; |
Cody Northrop | 1236511 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 2282 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2283 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetDepthBias()"); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2284 | } |
| 2285 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2286 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2287 | dev_data->device_dispatch_table->CmdSetDepthBias(cmdBuffer, depthBias, depthBiasClamp, slopeScaledDepthBias); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2288 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2289 | |
| 2290 | VK_LAYER_EXPORT void VKAPI vkCmdSetBlendConstants(VkCmdBuffer cmdBuffer, const float blendConst[4]) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2291 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2292 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2293 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2294 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2295 | if (pCB) { |
| 2296 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2297 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2298 | skipCall |= addCmd(dev_data, pCB, CMD_SETBLENDSTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2299 | pCB->status |= CBSTATUS_BLEND_SET; |
| 2300 | memcpy(pCB->blendConst, blendConst, 4 * sizeof(float)); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2301 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2302 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetBlendConstants()"); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2303 | } |
| 2304 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2305 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2306 | dev_data->device_dispatch_table->CmdSetBlendConstants(cmdBuffer, blendConst); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2307 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2308 | |
| 2309 | VK_LAYER_EXPORT void VKAPI vkCmdSetDepthBounds( |
| 2310 | VkCmdBuffer cmdBuffer, |
| 2311 | float minDepthBounds, |
| 2312 | float maxDepthBounds) |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2313 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2314 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2315 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2316 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2317 | if (pCB) { |
| 2318 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2319 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2320 | skipCall |= addCmd(dev_data, pCB, CMD_SETDEPTHBOUNDSSTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2321 | pCB->status |= CBSTATUS_DEPTH_BOUNDS_SET; |
| 2322 | pCB->minDepthBounds = minDepthBounds; |
| 2323 | pCB->maxDepthBounds = maxDepthBounds; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2324 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2325 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetDepthBounds()"); |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2326 | } |
| 2327 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2328 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2329 | dev_data->device_dispatch_table->CmdSetDepthBounds(cmdBuffer, minDepthBounds, maxDepthBounds); |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2330 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2331 | |
| 2332 | VK_LAYER_EXPORT void VKAPI vkCmdSetStencilCompareMask( |
| 2333 | VkCmdBuffer cmdBuffer, |
| 2334 | VkStencilFaceFlags faceMask, |
| 2335 | uint32_t stencilCompareMask) |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2336 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2337 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2338 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2339 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2340 | if (pCB) { |
| 2341 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2342 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2343 | skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILREADMASKSTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2344 | if (faceMask & VK_STENCIL_FACE_FRONT_BIT) { |
| 2345 | pCB->front.stencilCompareMask = stencilCompareMask; |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2346 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2347 | if (faceMask & VK_STENCIL_FACE_BACK_BIT) { |
| 2348 | pCB->back.stencilCompareMask = stencilCompareMask; |
| 2349 | } |
| 2350 | /* TODO: Do we need to track front and back separately? */ |
| 2351 | /* TODO: We aren't capturing the faceMask, do we need to? */ |
| 2352 | pCB->status |= CBSTATUS_STENCIL_READ_MASK_SET; |
Cody Northrop | 82485a8 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2353 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2354 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetStencilCompareMask()"); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2355 | } |
| 2356 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2357 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2358 | dev_data->device_dispatch_table->CmdSetStencilCompareMask(cmdBuffer, faceMask, stencilCompareMask); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2359 | } |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2360 | |
| 2361 | VK_LAYER_EXPORT void VKAPI vkCmdSetStencilWriteMask( |
| 2362 | VkCmdBuffer cmdBuffer, |
| 2363 | VkStencilFaceFlags faceMask, |
| 2364 | uint32_t stencilWriteMask) |
| 2365 | { |
| 2366 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2367 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2368 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2369 | if (pCB) { |
| 2370 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2371 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2372 | skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILWRITEMASKSTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2373 | if (faceMask & VK_STENCIL_FACE_FRONT_BIT) { |
| 2374 | pCB->front.stencilWriteMask = stencilWriteMask; |
| 2375 | } |
| 2376 | if (faceMask & VK_STENCIL_FACE_BACK_BIT) { |
| 2377 | pCB->back.stencilWriteMask = stencilWriteMask; |
| 2378 | } |
| 2379 | pCB->status |= CBSTATUS_STENCIL_WRITE_MASK_SET; |
| 2380 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2381 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetStencilWriteMask()"); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2382 | } |
| 2383 | } |
| 2384 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2385 | dev_data->device_dispatch_table->CmdSetStencilWriteMask(cmdBuffer, faceMask, stencilWriteMask); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2386 | } |
| 2387 | |
| 2388 | VK_LAYER_EXPORT void VKAPI vkCmdSetStencilReference( |
| 2389 | VkCmdBuffer cmdBuffer, |
| 2390 | VkStencilFaceFlags faceMask, |
| 2391 | uint32_t stencilReference) |
| 2392 | { |
| 2393 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2394 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2395 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2396 | if (pCB) { |
| 2397 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2398 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2399 | skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILREFERENCESTATE); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2400 | if (faceMask & VK_STENCIL_FACE_FRONT_BIT) { |
| 2401 | pCB->front.stencilReference = stencilReference; |
| 2402 | } |
| 2403 | if (faceMask & VK_STENCIL_FACE_BACK_BIT) { |
| 2404 | pCB->back.stencilReference = stencilReference; |
| 2405 | } |
| 2406 | pCB->status |= CBSTATUS_STENCIL_REFERENCE_SET; |
| 2407 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2408 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetStencilReference()"); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2409 | } |
| 2410 | } |
| 2411 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2412 | dev_data->device_dispatch_table->CmdSetStencilReference(cmdBuffer, faceMask, stencilReference); |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 2413 | } |
| 2414 | |
Mark Lobodzinski | f2093b6 | 2015-06-15 13:21:21 -0600 | [diff] [blame] | 2415 | VK_LAYER_EXPORT void VKAPI vkCmdBindDescriptorSets(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2416 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2417 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2418 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2419 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 1a4b9e7 | 2015-10-20 09:13:54 -0600 | [diff] [blame] | 2420 | // TODO : Validate dynamic offsets |
| 2421 | // If any of the sets being bound include dynamic uniform or storage buffers, |
| 2422 | // then pDynamicOffsets must include one element for each array element |
| 2423 | // in each dynamic descriptor type binding in each set. |
| 2424 | // dynamicOffsetCount is the total number of dynamic offsets provided, and |
| 2425 | // must equal the total number of dynamic descriptors in the sets being bound |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2426 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2427 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2428 | if ((VK_PIPELINE_BIND_POINT_COMPUTE == pipelineBindPoint) && (pCB->activeRenderPass)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2429 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2430 | "Incorrectly binding compute DescriptorSets during active RenderPass (%#" PRIxLEAST64 ")", pCB->activeRenderPass.handle); |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2431 | } else if ((VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) && (!pCB->activeRenderPass)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2432 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2433 | "Incorrectly binding graphics DescriptorSets without an active RenderPass"); |
Tobin Ehlis | f7bf450 | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 2434 | } else { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2435 | for (uint32_t i=0; i<setCount; i++) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2436 | SET_NODE* pSet = getSetNode(dev_data, pDescriptorSets[i]); |
Tobin Ehlis | 3e75b2a | 2015-06-24 17:27:33 -0600 | [diff] [blame] | 2437 | if (pSet) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2438 | loader_platform_thread_lock_mutex(&globalLock); |
| 2439 | pCB->lastBoundDescriptorSet = pDescriptorSets[i]; |
Tobin Ehlis | 429b91d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 2440 | pCB->lastBoundPipelineLayout = layout; |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2441 | pCB->boundDescriptorSets.push_back(pDescriptorSets[i]); |
| 2442 | g_lastBoundDescriptorSet = pDescriptorSets[i]; |
| 2443 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2444 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pDescriptorSets[i].handle, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2445 | "DS %#" PRIxLEAST64 " bound on pipeline %s", pDescriptorSets[i].handle, string_VkPipelineBindPoint(pipelineBindPoint)); |
Tobin Ehlis | 3e75b2a | 2015-06-24 17:27:33 -0600 | [diff] [blame] | 2446 | if (!pSet->pUpdateStructs) |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2447 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pDescriptorSets[i].handle, 0, DRAWSTATE_DESCRIPTOR_SET_NOT_UPDATED, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2448 | "DS %#" PRIxLEAST64 " bound but it was never updated. You may want to either update it or not bind it.", pDescriptorSets[i].handle); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2449 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2450 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pDescriptorSets[i].handle, 0, DRAWSTATE_INVALID_SET, "DS", |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2451 | "Attempt to bind DS %#" PRIxLEAST64 " that doesn't exist!", pDescriptorSets[i].handle); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2452 | } |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 2453 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2454 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2455 | skipCall |= addCmd(dev_data, pCB, CMD_BINDDESCRIPTORSETS); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2456 | } |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2457 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2458 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindDescriptorSets()"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2459 | } |
| 2460 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2461 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2462 | dev_data->device_dispatch_table->CmdBindDescriptorSets(cmdBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2463 | } |
| 2464 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2465 | VK_LAYER_EXPORT void VKAPI vkCmdBindIndexBuffer(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2466 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2467 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2468 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2469 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2470 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2471 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | c4c2318 | 2015-09-17 12:24:13 -0600 | [diff] [blame] | 2472 | VkDeviceSize offset_align = 0; |
| 2473 | switch (indexType) { |
| 2474 | case VK_INDEX_TYPE_UINT16: |
| 2475 | offset_align = 2; |
| 2476 | break; |
| 2477 | case VK_INDEX_TYPE_UINT32: |
| 2478 | offset_align = 4; |
| 2479 | break; |
| 2480 | default: |
| 2481 | // ParamChecker should catch bad enum, we'll also throw alignment error below if offset_align stays 0 |
| 2482 | break; |
| 2483 | } |
| 2484 | if (!offset_align || (offset % offset_align)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2485 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_VTX_INDEX_ALIGNMENT_ERROR, "DS", |
Tobin Ehlis | c4c2318 | 2015-09-17 12:24:13 -0600 | [diff] [blame] | 2486 | "vkCmdBindIndexBuffer() offset (%#" PRIxLEAST64 ") does not fall on alignment (%s) boundary.", offset, string_VkIndexType(indexType)); |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 2487 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2488 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2489 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindIndexBuffer()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2490 | } |
Tobin Ehlis | c4c2318 | 2015-09-17 12:24:13 -0600 | [diff] [blame] | 2491 | pCB->status |= CBSTATUS_INDEX_BUFFER_BOUND; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2492 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2493 | skipCall |= addCmd(dev_data, pCB, CMD_BINDINDEXBUFFER); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2494 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2495 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2496 | dev_data->device_dispatch_table->CmdBindIndexBuffer(cmdBuffer, buffer, offset, indexType); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2497 | } |
| 2498 | |
Courtney Goeltzenleuchter | f68ad72 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 2499 | VK_LAYER_EXPORT void VKAPI vkCmdBindVertexBuffers( |
| 2500 | VkCmdBuffer cmdBuffer, |
| 2501 | uint32_t startBinding, |
| 2502 | uint32_t bindingCount, |
| 2503 | const VkBuffer* pBuffers, |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2504 | const VkDeviceSize* pOffsets) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2505 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2506 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2507 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2508 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2509 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2510 | if (pCB->state == CB_UPDATE_ACTIVE) { |
| 2511 | /* TODO: Need to track all the vertex buffers, not just last one */ |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2512 | pCB->lastVtxBinding = startBinding + bindingCount -1; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2513 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2514 | addCmd(dev_data, pCB, CMD_BINDVERTEXBUFFER); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2515 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2516 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBindVertexBuffer()"); |
Tobin Ehlis | 0174fed | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 2517 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2518 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2519 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2520 | dev_data->device_dispatch_table->CmdBindVertexBuffers(cmdBuffer, startBinding, bindingCount, pBuffers, pOffsets); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2521 | } |
| 2522 | |
Courtney Goeltzenleuchter | 08c2637 | 2015-09-23 12:31:50 -0600 | [diff] [blame] | 2523 | VK_LAYER_EXPORT void VKAPI vkCmdDraw(VkCmdBuffer cmdBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2524 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2525 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2526 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2527 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2528 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2529 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2530 | pCB->drawCount[DRAW]++; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2531 | skipCall |= validate_draw_state(dev_data, pCB, VK_FALSE); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2532 | // TODO : Need to pass cmdBuffer as srcObj here |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2533 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2534 | "vkCmdDraw() call #%lu, reporting DS state:", g_drawCount[DRAW]++); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2535 | skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2536 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2537 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2538 | skipCall |= addCmd(dev_data, pCB, CMD_DRAW); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2539 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2540 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2541 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDraw()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2542 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2543 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDraw"); |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2544 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2545 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2546 | dev_data->device_dispatch_table->CmdDraw(cmdBuffer, vertexCount, instanceCount, firstVertex, firstInstance); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2547 | } |
| 2548 | |
Courtney Goeltzenleuchter | 08c2637 | 2015-09-23 12:31:50 -0600 | [diff] [blame] | 2549 | VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexed(VkCmdBuffer cmdBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2550 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2551 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2552 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2553 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2554 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2555 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2556 | pCB->drawCount[DRAW_INDEXED]++; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2557 | skipCall |= validate_draw_state(dev_data, pCB, VK_TRUE); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2558 | // TODO : Need to pass cmdBuffer as srcObj here |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2559 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2560 | "vkCmdDrawIndexed() call #%lu, reporting DS state:", g_drawCount[DRAW_INDEXED]++); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2561 | skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2562 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2563 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2564 | skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDEXED); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2565 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2566 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2567 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDrawIndexed()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2568 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2569 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndexed"); |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2570 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2571 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2572 | dev_data->device_dispatch_table->CmdDrawIndexed(cmdBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2573 | } |
| 2574 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2575 | VK_LAYER_EXPORT void VKAPI vkCmdDrawIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2576 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2577 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2578 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2579 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2580 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2581 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2582 | pCB->drawCount[DRAW_INDIRECT]++; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2583 | skipCall |= validate_draw_state(dev_data, pCB, VK_FALSE); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2584 | // TODO : Need to pass cmdBuffer as srcObj here |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2585 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2586 | "vkCmdDrawIndirect() call #%lu, reporting DS state:", g_drawCount[DRAW_INDIRECT]++); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2587 | skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2588 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2589 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2590 | skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDIRECT); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2591 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2592 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2593 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDrawIndirect()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2594 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2595 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndirect"); |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2596 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2597 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2598 | dev_data->device_dispatch_table->CmdDrawIndirect(cmdBuffer, buffer, offset, count, stride); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2599 | } |
| 2600 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2601 | VK_LAYER_EXPORT void VKAPI vkCmdDrawIndexedIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2602 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2603 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2604 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2605 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2606 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2607 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2608 | pCB->drawCount[DRAW_INDEXED_INDIRECT]++; |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2609 | skipCall |= validate_draw_state(dev_data, pCB, VK_TRUE); |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2610 | // TODO : Need to pass cmdBuffer as srcObj here |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2611 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2612 | "vkCmdDrawIndexedIndirect() call #%lu, reporting DS state:", g_drawCount[DRAW_INDEXED_INDIRECT]++); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2613 | skipCall |= synchAndPrintDSConfig(dev_data, cmdBuffer); |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2614 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2615 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2616 | skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDEXEDINDIRECT); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2617 | } |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2618 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2619 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDrawIndexedIndirect()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2620 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2621 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndexedIndirect"); |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2622 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2623 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2624 | dev_data->device_dispatch_table->CmdDrawIndexedIndirect(cmdBuffer, buffer, offset, count, stride); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2625 | } |
| 2626 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2627 | VK_LAYER_EXPORT void VKAPI vkCmdDispatch(VkCmdBuffer cmdBuffer, uint32_t x, uint32_t y, uint32_t z) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2628 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2629 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2630 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2631 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2632 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2633 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2634 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2635 | skipCall |= addCmd(dev_data, pCB, CMD_DISPATCH); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2636 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2637 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDispatch()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2638 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2639 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdDispatch"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2640 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2641 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2642 | dev_data->device_dispatch_table->CmdDispatch(cmdBuffer, x, y, z); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2643 | } |
| 2644 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2645 | VK_LAYER_EXPORT void VKAPI vkCmdDispatchIndirect(VkCmdBuffer cmdBuffer, VkBuffer buffer, VkDeviceSize offset) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2646 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2647 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2648 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2649 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2650 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2651 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2652 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2653 | skipCall |= addCmd(dev_data, pCB, CMD_DISPATCHINDIRECT); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2654 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2655 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdDispatchIndirect()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2656 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2657 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdDispatchIndirect"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2658 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2659 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2660 | dev_data->device_dispatch_table->CmdDispatchIndirect(cmdBuffer, buffer, offset); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2661 | } |
| 2662 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2663 | VK_LAYER_EXPORT void VKAPI vkCmdCopyBuffer(VkCmdBuffer cmdBuffer, VkBuffer srcBuffer, VkBuffer destBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2664 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2665 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2666 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2667 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2668 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2669 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2670 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2671 | skipCall |= addCmd(dev_data, pCB, CMD_COPYBUFFER); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2672 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2673 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyBuffer()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2674 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2675 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyBuffer"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2676 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2677 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2678 | dev_data->device_dispatch_table->CmdCopyBuffer(cmdBuffer, srcBuffer, destBuffer, regionCount, pRegions); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2679 | } |
| 2680 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2681 | VK_LAYER_EXPORT void VKAPI vkCmdCopyImage(VkCmdBuffer cmdBuffer, |
| 2682 | VkImage srcImage, |
| 2683 | VkImageLayout srcImageLayout, |
| 2684 | VkImage destImage, |
| 2685 | VkImageLayout destImageLayout, |
| 2686 | uint32_t regionCount, const VkImageCopy* pRegions) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2687 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2688 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2689 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2690 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2691 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2692 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2693 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2694 | skipCall |= addCmd(dev_data, pCB, CMD_COPYIMAGE); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2695 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2696 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyImage()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2697 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2698 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyImage"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2699 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2700 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2701 | dev_data->device_dispatch_table->CmdCopyImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2702 | } |
| 2703 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2704 | VK_LAYER_EXPORT void VKAPI vkCmdBlitImage(VkCmdBuffer cmdBuffer, |
| 2705 | VkImage srcImage, VkImageLayout srcImageLayout, |
| 2706 | VkImage destImage, VkImageLayout destImageLayout, |
Mark Lobodzinski | ee5eef1 | 2015-05-22 14:43:25 -0500 | [diff] [blame] | 2707 | uint32_t regionCount, const VkImageBlit* pRegions, |
| 2708 | VkTexFilter filter) |
Courtney Goeltzenleuchter | 91f9cee | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 2709 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2710 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2711 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2712 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Courtney Goeltzenleuchter | 91f9cee | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 2713 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2714 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2715 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2716 | skipCall |= addCmd(dev_data, pCB, CMD_BLITIMAGE); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2717 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2718 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBlitImage()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2719 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2720 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdBlitImage"); |
Courtney Goeltzenleuchter | 91f9cee | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 2721 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2722 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2723 | dev_data->device_dispatch_table->CmdBlitImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions, filter); |
Courtney Goeltzenleuchter | 91f9cee | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 2724 | } |
| 2725 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2726 | VK_LAYER_EXPORT void VKAPI vkCmdCopyBufferToImage(VkCmdBuffer cmdBuffer, |
| 2727 | VkBuffer srcBuffer, |
| 2728 | VkImage destImage, VkImageLayout destImageLayout, |
| 2729 | uint32_t regionCount, const VkBufferImageCopy* pRegions) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2730 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2731 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2732 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2733 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2734 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2735 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2736 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2737 | skipCall |= addCmd(dev_data, pCB, CMD_COPYBUFFERTOIMAGE); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2738 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2739 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyBufferToImage()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2740 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2741 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyBufferToImage"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2742 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2743 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2744 | dev_data->device_dispatch_table->CmdCopyBufferToImage(cmdBuffer, srcBuffer, destImage, destImageLayout, regionCount, pRegions); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2745 | } |
| 2746 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2747 | VK_LAYER_EXPORT void VKAPI vkCmdCopyImageToBuffer(VkCmdBuffer cmdBuffer, |
| 2748 | VkImage srcImage, VkImageLayout srcImageLayout, |
| 2749 | VkBuffer destBuffer, |
| 2750 | uint32_t regionCount, const VkBufferImageCopy* pRegions) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2751 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2752 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2753 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2754 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2755 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2756 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2757 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2758 | skipCall |= addCmd(dev_data, pCB, CMD_COPYIMAGETOBUFFER); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2759 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2760 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyImageToBuffer()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2761 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2762 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyImageToBuffer"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2763 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2764 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2765 | dev_data->device_dispatch_table->CmdCopyImageToBuffer(cmdBuffer, srcImage, srcImageLayout, destBuffer, regionCount, pRegions); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2766 | } |
| 2767 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2768 | VK_LAYER_EXPORT void VKAPI vkCmdUpdateBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize dataSize, const uint32_t* pData) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2769 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2770 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2771 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2772 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2773 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2774 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2775 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2776 | skipCall |= addCmd(dev_data, pCB, CMD_UPDATEBUFFER); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2777 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2778 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdUpdateBuffer()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2779 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2780 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyUpdateBuffer"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2781 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2782 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2783 | dev_data->device_dispatch_table->CmdUpdateBuffer(cmdBuffer, destBuffer, destOffset, dataSize, pData); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2784 | } |
| 2785 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 2786 | VK_LAYER_EXPORT void VKAPI vkCmdFillBuffer(VkCmdBuffer cmdBuffer, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize fillSize, uint32_t data) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2787 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2788 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2789 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2790 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2791 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2792 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2793 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2794 | skipCall |= addCmd(dev_data, pCB, CMD_FILLBUFFER); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2795 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2796 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdFillBuffer()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2797 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2798 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyFillBuffer"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2799 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2800 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2801 | dev_data->device_dispatch_table->CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2802 | } |
| 2803 | |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2804 | VK_LAYER_EXPORT void VKAPI vkCmdClearAttachments( |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2805 | VkCmdBuffer cmdBuffer, |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2806 | uint32_t attachmentCount, |
| 2807 | const VkClearAttachment* pAttachments, |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2808 | uint32_t rectCount, |
Courtney Goeltzenleuchter | 4ca43f6 | 2015-10-15 18:22:08 -0600 | [diff] [blame] | 2809 | const VkClearRect* pRects) |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2810 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2811 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2812 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2813 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2814 | if (pCB) { |
| 2815 | if (pCB->state == CB_UPDATE_ACTIVE) { |
| 2816 | // Warn if this is issued prior to Draw Cmd |
| 2817 | if (!hasDrawCmd(pCB)) { |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2818 | // TODO : cmdBuffer should be srcObj |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2819 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_CLEAR_CMD_BEFORE_DRAW, "DS", |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2820 | "vkCmdClearAttachments() issued on CB object 0x%" PRIxLEAST64 " prior to any Draw Cmds." |
| 2821 | " It is recommended you use RenderPass LOAD_OP_CLEAR on Attachments prior to any Draw.", reinterpret_cast<uint64_t>(cmdBuffer)); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2822 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2823 | updateCBTracking(pCB); |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2824 | skipCall |= addCmd(dev_data, pCB, CMD_CLEARATTACHMENTS); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2825 | } else { |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2826 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdClearAttachments()"); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2827 | } |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2828 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdClearAttachments"); |
| 2829 | } |
| 2830 | |
| 2831 | // Validate that attachment is in reference list of active subpass |
| 2832 | if (pCB->activeRenderPass) { |
| 2833 | const VkRenderPassCreateInfo *pRPCI = dev_data->renderPassMap[pCB->activeRenderPass.handle]; |
| 2834 | const VkSubpassDescription *pSD = &pRPCI->pSubpasses[pCB->activeSubpass]; |
| 2835 | |
| 2836 | for (uint32_t attachment_idx = 0; attachment_idx < attachmentCount; attachment_idx++) { |
| 2837 | const VkClearAttachment *attachment = &pAttachments[attachment_idx]; |
| 2838 | if (attachment->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { |
| 2839 | VkBool32 found = VK_FALSE; |
| 2840 | for (uint32_t i = 0; i < pSD->colorCount; i++) { |
| 2841 | if (attachment->colorAttachment == pSD->pColorAttachments[i].attachment) { |
| 2842 | found = VK_TRUE; |
| 2843 | break; |
| 2844 | } |
| 2845 | } |
| 2846 | if (VK_FALSE == found) { |
| 2847 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
| 2848 | (uint64_t)cmdBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", |
| 2849 | "vkCmdClearAttachments() attachment index %d not found in attachment reference array of active subpass %d", |
| 2850 | attachment->colorAttachment, pCB->activeSubpass); |
| 2851 | } |
| 2852 | } else if (attachment->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { |
| 2853 | /* TODO: Is this a good test for depth/stencil? */ |
| 2854 | if (pSD->depthStencilAttachment.attachment != attachment->colorAttachment) { |
| 2855 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
| 2856 | (uint64_t)cmdBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", |
| 2857 | "vkCmdClearAttachments() attachment index %d does not match depthStencilAttachment.attachment (%d) found in active subpass %d", |
| 2858 | attachment->colorAttachment, pSD->depthStencilAttachment.attachment, pCB->activeSubpass); |
| 2859 | } |
| 2860 | } |
| 2861 | } |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2862 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2863 | if (VK_FALSE == skipCall) |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 2864 | dev_data->device_dispatch_table->CmdClearAttachments(cmdBuffer, attachmentCount, pAttachments, rectCount, pRects); |
Tobin Ehlis | 53eddda | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 2865 | } |
| 2866 | |
Courtney Goeltzenleuchter | d7a5cff | 2015-04-23 17:49:22 -0600 | [diff] [blame] | 2867 | VK_LAYER_EXPORT void VKAPI vkCmdClearColorImage( |
| 2868 | VkCmdBuffer cmdBuffer, |
| 2869 | VkImage image, VkImageLayout imageLayout, |
Chris Forbes | f0796e1 | 2015-06-24 14:34:53 +1200 | [diff] [blame] | 2870 | const VkClearColorValue *pColor, |
Courtney Goeltzenleuchter | d7a5cff | 2015-04-23 17:49:22 -0600 | [diff] [blame] | 2871 | uint32_t rangeCount, const VkImageSubresourceRange* pRanges) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2872 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2873 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2874 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2875 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2876 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2877 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2878 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2879 | skipCall |= addCmd(dev_data, pCB, CMD_CLEARCOLORIMAGE); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2880 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2881 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdClearColorImage()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2882 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2883 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdClearColorImage"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2884 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2885 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2886 | dev_data->device_dispatch_table->CmdClearColorImage(cmdBuffer, image, imageLayout, pColor, rangeCount, pRanges); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2887 | } |
| 2888 | |
Courtney Goeltzenleuchter | 45df9e1 | 2015-09-15 18:03:22 -0600 | [diff] [blame] | 2889 | VK_LAYER_EXPORT void VKAPI vkCmdClearDepthStencilImage( |
| 2890 | VkCmdBuffer cmdBuffer, |
| 2891 | VkImage image, VkImageLayout imageLayout, |
| 2892 | const VkClearDepthStencilValue *pDepthStencil, |
| 2893 | uint32_t rangeCount, |
| 2894 | const VkImageSubresourceRange* pRanges) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2895 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2896 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2897 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2898 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2899 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2900 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2901 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2902 | skipCall |= addCmd(dev_data, pCB, CMD_CLEARDEPTHSTENCILIMAGE); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2903 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2904 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdClearDepthStencilImage()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2905 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2906 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdClearDepthStencilImage"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2907 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2908 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2909 | dev_data->device_dispatch_table->CmdClearDepthStencilImage(cmdBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2910 | } |
| 2911 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2912 | VK_LAYER_EXPORT void VKAPI vkCmdResolveImage(VkCmdBuffer cmdBuffer, |
| 2913 | VkImage srcImage, VkImageLayout srcImageLayout, |
| 2914 | VkImage destImage, VkImageLayout destImageLayout, |
Tony Barbour | 6865d4a | 2015-04-13 15:02:52 -0600 | [diff] [blame] | 2915 | uint32_t regionCount, const VkImageResolve* pRegions) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2916 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2917 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2918 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2919 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2920 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2921 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2922 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2923 | skipCall |= addCmd(dev_data, pCB, CMD_RESOLVEIMAGE); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2924 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2925 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdResolveImage()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2926 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2927 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdResolveImage"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2928 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2929 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2930 | dev_data->device_dispatch_table->CmdResolveImage(cmdBuffer, srcImage, srcImageLayout, destImage, destImageLayout, regionCount, pRegions); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2931 | } |
| 2932 | |
Tony Barbour | 0b2cfb2 | 2015-06-29 16:20:35 -0600 | [diff] [blame] | 2933 | VK_LAYER_EXPORT void VKAPI vkCmdSetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2934 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2935 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2936 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2937 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2938 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2939 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2940 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2941 | skipCall |= addCmd(dev_data, pCB, CMD_SETEVENT); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2942 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2943 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdSetEvent()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2944 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2945 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdSetEvent"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2946 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2947 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2948 | dev_data->device_dispatch_table->CmdSetEvent(cmdBuffer, event, stageMask); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2949 | } |
| 2950 | |
Tony Barbour | 0b2cfb2 | 2015-06-29 16:20:35 -0600 | [diff] [blame] | 2951 | VK_LAYER_EXPORT void VKAPI vkCmdResetEvent(VkCmdBuffer cmdBuffer, VkEvent event, VkPipelineStageFlags stageMask) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2952 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2953 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2954 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2955 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2956 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2957 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2958 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2959 | skipCall |= addCmd(dev_data, pCB, CMD_RESETEVENT); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2960 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2961 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdResetEvent()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2962 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2963 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdResetEvent"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2964 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2965 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2966 | dev_data->device_dispatch_table->CmdResetEvent(cmdBuffer, event, stageMask); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2967 | } |
| 2968 | |
Courtney Goeltzenleuchter | dbd2032 | 2015-07-12 12:58:58 -0600 | [diff] [blame] | 2969 | VK_LAYER_EXPORT void VKAPI vkCmdWaitEvents(VkCmdBuffer cmdBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags destStageMask, uint32_t memBarrierCount, const void* const* ppMemBarriers) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2970 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2971 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2972 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2973 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2974 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2975 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2976 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2977 | skipCall |= addCmd(dev_data, pCB, CMD_WAITEVENTS); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2978 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2979 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdWaitEvents()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2980 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2981 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2982 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2983 | dev_data->device_dispatch_table->CmdWaitEvents(cmdBuffer, eventCount, pEvents, sourceStageMask, destStageMask, memBarrierCount, ppMemBarriers); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2984 | } |
| 2985 | |
Courtney Goeltzenleuchter | ceebbb1 | 2015-07-12 13:07:46 -0600 | [diff] [blame] | 2986 | VK_LAYER_EXPORT void VKAPI vkCmdPipelineBarrier(VkCmdBuffer cmdBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memBarrierCount, const void* const* ppMemBarriers) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2987 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2988 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2989 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2990 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2991 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2992 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2993 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2994 | skipCall |= addCmd(dev_data, pCB, CMD_PIPELINEBARRIER); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2995 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2996 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdPipelineBarrier()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2997 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2998 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2999 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3000 | dev_data->device_dispatch_table->CmdPipelineBarrier(cmdBuffer, srcStageMask, destStageMask, byRegion, memBarrierCount, ppMemBarriers); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3001 | } |
| 3002 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3003 | VK_LAYER_EXPORT void VKAPI vkCmdBeginQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3004 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3005 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3006 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3007 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3008 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3009 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3010 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3011 | skipCall |= addCmd(dev_data, pCB, CMD_BEGINQUERY); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3012 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3013 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdBeginQuery()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3014 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3015 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3016 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3017 | dev_data->device_dispatch_table->CmdBeginQuery(cmdBuffer, queryPool, slot, flags); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3018 | } |
| 3019 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3020 | VK_LAYER_EXPORT void VKAPI vkCmdEndQuery(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t slot) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3021 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3022 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3023 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3024 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3025 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3026 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3027 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3028 | skipCall |= addCmd(dev_data, pCB, CMD_ENDQUERY); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3029 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3030 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdEndQuery()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3031 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3032 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3033 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3034 | dev_data->device_dispatch_table->CmdEndQuery(cmdBuffer, queryPool, slot); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3035 | } |
| 3036 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3037 | VK_LAYER_EXPORT void VKAPI vkCmdResetQueryPool(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3038 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3039 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3040 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3041 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3042 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3043 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3044 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3045 | skipCall |= addCmd(dev_data, pCB, CMD_RESETQUERYPOOL); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3046 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3047 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdResetQueryPool()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3048 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3049 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdQueryPool"); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3050 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3051 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3052 | dev_data->device_dispatch_table->CmdResetQueryPool(cmdBuffer, queryPool, startQuery, queryCount); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3053 | } |
| 3054 | |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3055 | VK_LAYER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, |
| 3056 | uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, |
| 3057 | VkDeviceSize destStride, VkQueryResultFlags flags) |
| 3058 | { |
| 3059 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3060 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3061 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3062 | if (pCB) { |
| 3063 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3064 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3065 | skipCall |= addCmd(dev_data, pCB, CMD_COPYQUERYPOOLRESULTS); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3066 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3067 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdCopyQueryPoolResults()"); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3068 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3069 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyQueryPoolResults"); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3070 | } |
| 3071 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3072 | dev_data->device_dispatch_table->CmdCopyQueryPoolResults(cmdBuffer, queryPool, |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3073 | startQuery, queryCount, destBuffer, destOffset, destStride, flags); |
| 3074 | } |
| 3075 | |
Tony Barbour | d1c3572 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 3076 | VK_LAYER_EXPORT void VKAPI vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkTimestampType timestampType, VkBuffer destBuffer, VkDeviceSize destOffset) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3077 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3078 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3079 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3080 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3081 | if (pCB) { |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3082 | if (pCB->state == CB_UPDATE_ACTIVE) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3083 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3084 | skipCall |= addCmd(dev_data, pCB, CMD_WRITETIMESTAMP); |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3085 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3086 | skipCall |= report_error_no_cb_begin(dev_data, cmdBuffer, "vkCmdWriteTimestamp()"); |
Tobin Ehlis | 9c53644 | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3087 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3088 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3089 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3090 | dev_data->device_dispatch_table->CmdWriteTimestamp(cmdBuffer, timestampType, destBuffer, destOffset); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3091 | } |
| 3092 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3093 | VK_LAYER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer) |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3094 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3095 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 3096 | VkResult result = dev_data->device_dispatch_table->CreateFramebuffer(device, pCreateInfo, pFramebuffer); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3097 | if (VK_SUCCESS == result) { |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3098 | // Shadow create info and store in map |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3099 | VkFramebufferCreateInfo* localFBCI = new VkFramebufferCreateInfo(*pCreateInfo); |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3100 | if (pCreateInfo->pAttachments) { |
Courtney Goeltzenleuchter | 5861a1b | 2015-09-01 17:30:39 -0600 | [diff] [blame] | 3101 | localFBCI->pAttachments = new VkImageView[localFBCI->attachmentCount]; |
| 3102 | memcpy((void*)localFBCI->pAttachments, pCreateInfo->pAttachments, localFBCI->attachmentCount*sizeof(VkImageView)); |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3103 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3104 | dev_data->frameBufferMap[pFramebuffer->handle] = localFBCI; |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3105 | } |
| 3106 | return result; |
| 3107 | } |
| 3108 | |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3109 | // Store the DAG. |
| 3110 | struct DAGNode { |
| 3111 | uint32_t pass; |
| 3112 | std::vector<uint32_t> prev; |
| 3113 | std::vector<uint32_t> next; |
| 3114 | }; |
| 3115 | |
| 3116 | bool FindDependency(const int index, const int dependent, const std::vector<DAGNode>& subpass_to_node, std::unordered_set<uint32_t>& processed_nodes) { |
| 3117 | // If we have already checked this node we have not found a dependency path so return false. |
| 3118 | if (processed_nodes.count(index)) |
| 3119 | return false; |
| 3120 | processed_nodes.insert(index); |
| 3121 | const DAGNode& node = subpass_to_node[index]; |
| 3122 | // Look for a dependency path. If one exists return true else recurse on the previous nodes. |
| 3123 | if (std::find(node.prev.begin(), node.prev.end(), dependent) == node.prev.end()) { |
| 3124 | for (auto elem : node.prev) { |
| 3125 | if (FindDependency(elem, dependent, subpass_to_node, processed_nodes)) |
| 3126 | return true; |
| 3127 | } |
| 3128 | } else { |
| 3129 | return true; |
| 3130 | } |
| 3131 | return false; |
| 3132 | } |
| 3133 | |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3134 | bool CheckDependencyExists(const layer_data* my_data, VkDevice device, const int subpass, const std::vector<uint32_t>& dependent_subpasses, const std::vector<DAGNode>& subpass_to_node, bool& skip_call) { |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3135 | bool result = true; |
| 3136 | // Loop through all subpasses that share the same attachment and make sure a dependency exists |
| 3137 | for (uint32_t k = 0; k < dependent_subpasses.size(); ++k) { |
| 3138 | if (subpass == dependent_subpasses[k]) |
| 3139 | continue; |
| 3140 | const DAGNode& node = subpass_to_node[subpass]; |
| 3141 | // Check for a specified dependency between the two nodes. If one exists we are done. |
| 3142 | auto prev_elem = std::find(node.prev.begin(), node.prev.end(), dependent_subpasses[k]); |
| 3143 | auto next_elem = std::find(node.next.begin(), node.next.end(), dependent_subpasses[k]); |
| 3144 | if (prev_elem == node.prev.end() && next_elem == node.next.end()) { |
| 3145 | // If no dependency exits an implicit dependency still might. If so, warn and if not throw an error. |
| 3146 | std::unordered_set<uint32_t> processed_nodes; |
| 3147 | if (FindDependency(subpass, dependent_subpasses[k], subpass_to_node, processed_nodes) || |
| 3148 | FindDependency(dependent_subpasses[k], subpass, subpass_to_node, processed_nodes)) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3149 | skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3150 | "A dependency between subpasses %d and %d must exist but only an implicit one is specified.", |
| 3151 | subpass, dependent_subpasses[k]); |
| 3152 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3153 | skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3154 | "A dependency between subpasses %d and %d must exist but one is not specified.", |
| 3155 | subpass, dependent_subpasses[k]); |
| 3156 | result = false; |
| 3157 | } |
| 3158 | } |
| 3159 | } |
| 3160 | return result; |
| 3161 | } |
| 3162 | |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3163 | bool CheckPreserved(const layer_data* my_data, VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const int index, const int attachment, const std::vector<DAGNode>& subpass_to_node, int depth, bool& skip_call) { |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3164 | const DAGNode& node = subpass_to_node[index]; |
| 3165 | // If this node writes to the attachment return true as next nodes need to preserve the attachment. |
| 3166 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[index]; |
| 3167 | for (uint32_t j = 0; j < subpass.colorCount; ++j) { |
| 3168 | if (attachment == subpass.pColorAttachments[j].attachment) |
| 3169 | return true; |
| 3170 | } |
| 3171 | if (subpass.depthStencilAttachment.attachment != VK_ATTACHMENT_UNUSED) { |
| 3172 | if (attachment == subpass.depthStencilAttachment.attachment) |
| 3173 | return true; |
| 3174 | } |
| 3175 | bool result = false; |
| 3176 | // Loop through previous nodes and see if any of them write to the attachment. |
| 3177 | for (auto elem : node.prev) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3178 | result |= CheckPreserved(my_data, device, pCreateInfo, elem, attachment, subpass_to_node, depth + 1, skip_call); |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3179 | } |
| 3180 | // If the attachment was written to by a previous node than this node needs to preserve it. |
| 3181 | if (result && depth > 0) { |
| 3182 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[index]; |
| 3183 | bool has_preserved = false; |
| 3184 | for (uint32_t j = 0; j < subpass.preserveCount; ++j) { |
| 3185 | if (subpass.pPreserveAttachments[j].attachment == attachment) { |
| 3186 | has_preserved = true; |
| 3187 | break; |
| 3188 | } |
| 3189 | } |
| 3190 | if (!has_preserved) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3191 | skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3192 | "Attachment %d is used by a later subpass and must be preserved in subpass %d.", attachment, index); |
| 3193 | } |
| 3194 | } |
| 3195 | return result; |
| 3196 | } |
| 3197 | |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3198 | bool validateDependencies(const layer_data* my_data, VkDevice device, const VkRenderPassCreateInfo* pCreateInfo) { |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3199 | bool skip_call = false; |
| 3200 | std::vector<DAGNode> subpass_to_node(pCreateInfo->subpassCount); |
| 3201 | std::vector<std::vector<uint32_t>> output_attachment_to_subpass(pCreateInfo->attachmentCount); |
| 3202 | std::vector<std::vector<uint32_t>> input_attachment_to_subpass(pCreateInfo->attachmentCount); |
| 3203 | // Create DAG |
| 3204 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 3205 | DAGNode& subpass_node = subpass_to_node[i]; |
| 3206 | subpass_node.pass = i; |
| 3207 | } |
| 3208 | for (uint32_t i = 0; i < pCreateInfo->dependencyCount; ++i) { |
| 3209 | const VkSubpassDependency& dependency = pCreateInfo->pDependencies[i]; |
| 3210 | if (dependency.srcSubpass > dependency.destSubpass) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3211 | skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3212 | "Dependency graph must be specified such that an earlier pass cannot depend on a later pass."); |
| 3213 | } |
| 3214 | subpass_to_node[dependency.destSubpass].prev.push_back(dependency.srcSubpass); |
| 3215 | subpass_to_node[dependency.srcSubpass].next.push_back(dependency.destSubpass); |
| 3216 | } |
| 3217 | // Find for each attachment the subpasses that use them. |
| 3218 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 3219 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
| 3220 | for (uint32_t j = 0; j < subpass.inputCount; ++j) { |
| 3221 | input_attachment_to_subpass[subpass.pInputAttachments[j].attachment].push_back(i); |
| 3222 | } |
| 3223 | for (uint32_t j = 0; j < subpass.colorCount; ++j) { |
| 3224 | output_attachment_to_subpass[subpass.pColorAttachments[j].attachment].push_back(i); |
| 3225 | } |
| 3226 | if (subpass.depthStencilAttachment.attachment != VK_ATTACHMENT_UNUSED) { |
| 3227 | output_attachment_to_subpass[subpass.depthStencilAttachment.attachment].push_back(i); |
| 3228 | } |
| 3229 | } |
| 3230 | // If there is a dependency needed make sure one exists |
| 3231 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 3232 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
| 3233 | // If the attachment is an input then all subpasses that output must have a dependency relationship |
| 3234 | for (uint32_t j = 0; j < subpass.inputCount; ++j) { |
| 3235 | const uint32_t& attachment = subpass.pInputAttachments[j].attachment; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3236 | CheckDependencyExists(my_data, device, i, output_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3237 | } |
| 3238 | // If the attachment is an output then all subpasses that use the attachment must have a dependency relationship |
| 3239 | for (uint32_t j = 0; j < subpass.colorCount; ++j) { |
| 3240 | const uint32_t& attachment = subpass.pColorAttachments[j].attachment; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3241 | CheckDependencyExists(my_data, device, i, output_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
| 3242 | CheckDependencyExists(my_data, device, i, input_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3243 | } |
| 3244 | if (subpass.depthStencilAttachment.attachment != VK_ATTACHMENT_UNUSED) { |
| 3245 | const uint32_t& attachment = subpass.depthStencilAttachment.attachment; |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3246 | CheckDependencyExists(my_data, device, i, output_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
| 3247 | CheckDependencyExists(my_data, device, i, input_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3248 | } |
| 3249 | } |
| 3250 | // Loop through implicit dependencies, if this pass reads make sure the attachment is preserved for all passes after it was written. |
| 3251 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 3252 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
| 3253 | for (uint32_t j = 0; j < subpass.inputCount; ++j) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3254 | CheckPreserved(my_data, device, pCreateInfo, i, subpass.pInputAttachments[j].attachment, subpass_to_node, 0, skip_call); |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3255 | } |
| 3256 | } |
| 3257 | return skip_call; |
| 3258 | } |
| 3259 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3260 | VK_LAYER_EXPORT VkResult VKAPI vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass) |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3261 | { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3262 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 3263 | if (validateDependencies(dev_data, device, pCreateInfo)) { |
Michael Lentine | b698675 | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 3264 | return VK_ERROR_VALIDATION_FAILED; |
| 3265 | } |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3266 | VkResult result = dev_data->device_dispatch_table->CreateRenderPass(device, pCreateInfo, pRenderPass); |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3267 | if (VK_SUCCESS == result) { |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3268 | // Shadow create info and store in map |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3269 | VkRenderPassCreateInfo* localRPCI = new VkRenderPassCreateInfo(*pCreateInfo); |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3270 | if (pCreateInfo->pAttachments) { |
| 3271 | localRPCI->pAttachments = new VkAttachmentDescription[localRPCI->attachmentCount]; |
| 3272 | memcpy((void*)localRPCI->pAttachments, pCreateInfo->pAttachments, localRPCI->attachmentCount*sizeof(VkAttachmentDescription)); |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3273 | } |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3274 | if (pCreateInfo->pSubpasses) { |
| 3275 | localRPCI->pSubpasses = new VkSubpassDescription[localRPCI->subpassCount]; |
| 3276 | memcpy((void*)localRPCI->pSubpasses, pCreateInfo->pSubpasses, localRPCI->subpassCount*sizeof(VkSubpassDescription)); |
| 3277 | |
| 3278 | for (uint32_t i = 0; i < localRPCI->subpassCount; i++) { |
| 3279 | VkSubpassDescription *subpass = (VkSubpassDescription *) &localRPCI->pSubpasses[i]; |
| 3280 | const uint32_t attachmentCount = subpass->inputCount + |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3281 | subpass->colorCount * (1 + (subpass->pResolveAttachments?1:0)) + |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3282 | subpass->preserveCount; |
| 3283 | VkAttachmentReference *attachments = new VkAttachmentReference[attachmentCount]; |
| 3284 | |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3285 | memcpy(attachments, subpass->pInputAttachments, |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3286 | sizeof(attachments[0]) * subpass->inputCount); |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3287 | subpass->pInputAttachments = attachments; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3288 | attachments += subpass->inputCount; |
| 3289 | |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3290 | memcpy(attachments, subpass->pColorAttachments, |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3291 | sizeof(attachments[0]) * subpass->colorCount); |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3292 | subpass->pColorAttachments = attachments; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3293 | attachments += subpass->colorCount; |
| 3294 | |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3295 | if (subpass->pResolveAttachments) { |
| 3296 | memcpy(attachments, subpass->pResolveAttachments, |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3297 | sizeof(attachments[0]) * subpass->colorCount); |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3298 | subpass->pResolveAttachments = attachments; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3299 | attachments += subpass->colorCount; |
| 3300 | } |
| 3301 | |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3302 | memcpy(attachments, subpass->pPreserveAttachments, |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3303 | sizeof(attachments[0]) * subpass->preserveCount); |
Cody Northrop | a505dda | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 3304 | subpass->pPreserveAttachments = attachments; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3305 | } |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3306 | } |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3307 | if (pCreateInfo->pDependencies) { |
| 3308 | localRPCI->pDependencies = new VkSubpassDependency[localRPCI->dependencyCount]; |
| 3309 | memcpy((void*)localRPCI->pDependencies, pCreateInfo->pDependencies, localRPCI->dependencyCount*sizeof(VkSubpassDependency)); |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3310 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3311 | dev_data->renderPassMap[pRenderPass->handle] = localRPCI; |
Tobin Ehlis | eba312c | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 3312 | } |
| 3313 | return result; |
| 3314 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3315 | // Free the renderpass shadow |
| 3316 | static void deleteRenderPasses(layer_data* my_data) |
| 3317 | { |
| 3318 | if (my_data->renderPassMap.size() <= 0) |
| 3319 | return; |
| 3320 | for (auto ii=my_data->renderPassMap.begin(); ii!=my_data->renderPassMap.end(); ++ii) { |
| 3321 | if ((*ii).second->pAttachments) { |
| 3322 | delete[] (*ii).second->pAttachments; |
| 3323 | } |
| 3324 | if ((*ii).second->pSubpasses) { |
| 3325 | for (uint32_t i=0; i<(*ii).second->subpassCount; ++i) { |
| 3326 | // Attachements are all allocated in a block, so just need to |
| 3327 | // find the first non-null one to delete |
| 3328 | if ((*ii).second->pSubpasses[i].pInputAttachments) { |
| 3329 | delete[] (*ii).second->pSubpasses[i].pInputAttachments; |
| 3330 | } else if ((*ii).second->pSubpasses[i].pColorAttachments) { |
| 3331 | delete[] (*ii).second->pSubpasses[i].pColorAttachments; |
| 3332 | } else if ((*ii).second->pSubpasses[i].pResolveAttachments) { |
| 3333 | delete[] (*ii).second->pSubpasses[i].pResolveAttachments; |
| 3334 | } else if ((*ii).second->pSubpasses[i].pPreserveAttachments) { |
| 3335 | delete[] (*ii).second->pSubpasses[i].pPreserveAttachments; |
| 3336 | } |
| 3337 | } |
| 3338 | delete[] (*ii).second->pSubpasses; |
| 3339 | } |
| 3340 | if ((*ii).second->pDependencies) { |
| 3341 | delete[] (*ii).second->pDependencies; |
| 3342 | } |
| 3343 | } |
| 3344 | my_data->renderPassMap.clear(); |
| 3345 | } |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3346 | VK_LAYER_EXPORT void VKAPI vkCmdBeginRenderPass(VkCmdBuffer cmdBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkRenderPassContents contents) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3347 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3348 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3349 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3350 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3351 | if (pCB) { |
Tobin Ehlis | 259730a | 2015-06-23 16:13:03 -0600 | [diff] [blame] | 3352 | if (pRenderPassBegin && pRenderPassBegin->renderPass) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3353 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdBeginRenderPass"); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3354 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3355 | skipCall |= addCmd(dev_data, pCB, CMD_BEGINRENDERPASS); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3356 | pCB->activeRenderPass = pRenderPassBegin->renderPass; |
| 3357 | pCB->activeSubpass = 0; |
| 3358 | pCB->framebuffer = pRenderPassBegin->framebuffer; |
| 3359 | if (pCB->lastBoundPipeline) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3360 | skipCall |= validatePipelineState(dev_data, pCB, VK_PIPELINE_BIND_POINT_GRAPHICS, pCB->lastBoundPipeline); |
Tobin Ehlis | 259730a | 2015-06-23 16:13:03 -0600 | [diff] [blame] | 3361 | } |
Tobin Ehlis | 502480b | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3362 | } else { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3363 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Tobin Ehlis | 259730a | 2015-06-23 16:13:03 -0600 | [diff] [blame] | 3364 | "You cannot use a NULL RenderPass object in vkCmdBeginRenderPass()"); |
Tony Barbour | badda99 | 2015-04-06 11:09:26 -0600 | [diff] [blame] | 3365 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3366 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3367 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3368 | dev_data->device_dispatch_table->CmdBeginRenderPass(cmdBuffer, pRenderPassBegin, contents); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3369 | } |
| 3370 | |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3371 | VK_LAYER_EXPORT void VKAPI vkCmdNextSubpass(VkCmdBuffer cmdBuffer, VkRenderPassContents contents) |
| 3372 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3373 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3374 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3375 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3376 | if (pCB) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3377 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3378 | skipCall |= addCmd(dev_data, pCB, CMD_NEXTSUBPASS); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3379 | pCB->activeSubpass++; |
| 3380 | if (pCB->lastBoundPipeline) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3381 | skipCall |= validatePipelineState(dev_data, pCB, VK_PIPELINE_BIND_POINT_GRAPHICS, pCB->lastBoundPipeline); |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3382 | } |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3383 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdNextSubpass"); |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3384 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3385 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3386 | dev_data->device_dispatch_table->CmdNextSubpass(cmdBuffer, contents); |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3387 | } |
| 3388 | |
Chia-I Wu | 0b50a1c | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 3389 | VK_LAYER_EXPORT void VKAPI vkCmdEndRenderPass(VkCmdBuffer cmdBuffer) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3390 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3391 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3392 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3393 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3394 | if (pCB) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3395 | skipCall |= outsideRenderPass(dev_data, pCB, "vkEndRenderpass"); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3396 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3397 | skipCall |= addCmd(dev_data, pCB, CMD_ENDRENDERPASS); |
Mark Lobodzinski | 5495d13 | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3398 | pCB->activeRenderPass = 0; |
| 3399 | pCB->activeSubpass = 0; |
Chia-I Wu | 0b50a1c | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 3400 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3401 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3402 | dev_data->device_dispatch_table->CmdEndRenderPass(cmdBuffer); |
Chia-I Wu | 0b50a1c | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 3403 | } |
| 3404 | |
| 3405 | VK_LAYER_EXPORT void VKAPI vkCmdExecuteCommands(VkCmdBuffer cmdBuffer, uint32_t cmdBuffersCount, const VkCmdBuffer* pCmdBuffers) |
| 3406 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3407 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3408 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3409 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Chia-I Wu | 0b50a1c | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 3410 | if (pCB) { |
Tobin Ehlis | 4b34ddc | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 3411 | GLOBAL_CB_NODE* pSubCB = NULL; |
| 3412 | for (uint32_t i=0; i<cmdBuffersCount; i++) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3413 | pSubCB = getCBNode(dev_data, pCmdBuffers[i]); |
Tobin Ehlis | 4b34ddc | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 3414 | if (!pSubCB) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3415 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_CMD_BUFFER, "DS", |
Tobin Ehlis | 4b34ddc | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 3416 | "vkCmdExecuteCommands() called w/ invalid Cmd Buffer %p in element %u of pCmdBuffers array.", (void*)pCmdBuffers[i], i); |
| 3417 | } else if (VK_CMD_BUFFER_LEVEL_PRIMARY == pSubCB->createInfo.level) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3418 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_CMD_BUFFER, "DS", |
Tobin Ehlis | 4b34ddc | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 3419 | "vkCmdExecuteCommands() called w/ Primary Cmd Buffer %p in element %u of pCmdBuffers array. All cmd buffers in pCmdBuffers array must be secondary.", (void*)pCmdBuffers[i], i); |
| 3420 | } |
| 3421 | } |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3422 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3423 | skipCall |= addCmd(dev_data, pCB, CMD_EXECUTECOMMANDS); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3424 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3425 | if (VK_FALSE == skipCall) |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3426 | dev_data->device_dispatch_table->CmdExecuteCommands(cmdBuffer, cmdBuffersCount, pCmdBuffers); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3427 | } |
| 3428 | |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 3429 | VK_LAYER_EXPORT VkResult VKAPI vkDbgCreateMsgCallback( |
| 3430 | VkInstance instance, |
| 3431 | VkFlags msgFlags, |
| 3432 | const PFN_vkDbgMsgCallback pfnMsgCallback, |
| 3433 | void* pUserData, |
| 3434 | VkDbgMsgCallback* pMsgCallback) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3435 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3436 | layer_data* my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
| 3437 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Tobin Ehlis | c16c3e9 | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 3438 | VkResult res = pTable->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
| 3439 | if (VK_SUCCESS == res) { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3440 | //layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Tobin Ehlis | c16c3e9 | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 3441 | res = layer_create_msg_callback(my_data->report_data, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
| 3442 | } |
| 3443 | return res; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3444 | } |
| 3445 | |
Courtney Goeltzenleuchter | f579fa6 | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 3446 | VK_LAYER_EXPORT VkResult VKAPI vkDbgDestroyMsgCallback( |
| 3447 | VkInstance instance, |
| 3448 | VkDbgMsgCallback msgCallback) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3449 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3450 | layer_data* my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
| 3451 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Tobin Ehlis | c16c3e9 | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 3452 | VkResult res = pTable->DbgDestroyMsgCallback(instance, msgCallback); |
Tobin Ehlis | c16c3e9 | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 3453 | layer_destroy_msg_callback(my_data->report_data, msgCallback); |
| 3454 | return res; |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3455 | } |
| 3456 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3457 | VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerBegin(VkCmdBuffer cmdBuffer, const char* pMarker) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3458 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3459 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3460 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3461 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3462 | if (!dev_data->device_extensions.debug_marker_enabled) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3463 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 3464 | "Attempt to use CmdDbgMarkerBegin but extension disabled!"); |
Jon Ashburn | eab3449 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 3465 | return; |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3466 | } else if (pCB) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3467 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3468 | skipCall |= addCmd(dev_data, pCB, CMD_DBGMARKERBEGIN); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3469 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3470 | if (VK_FALSE == skipCall) |
| 3471 | debug_marker_dispatch_table(cmdBuffer)->CmdDbgMarkerBegin(cmdBuffer, pMarker); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3472 | } |
| 3473 | |
Courtney Goeltzenleuchter | fb4efc6 | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3474 | VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerEnd(VkCmdBuffer cmdBuffer) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3475 | { |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3476 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3477 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3478 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3479 | if (!dev_data->device_extensions.debug_marker_enabled) { |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3480 | skipCall |= log_msg(dev_data->report_data, VK_DBG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)cmdBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 3481 | "Attempt to use CmdDbgMarkerEnd but extension disabled!"); |
Jon Ashburn | eab3449 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 3482 | return; |
Tobin Ehlis | ce132d8 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3483 | } else if (pCB) { |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3484 | updateCBTracking(pCB); |
Tobin Ehlis | 432ef5c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3485 | skipCall |= addCmd(dev_data, pCB, CMD_DBGMARKEREND); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3486 | } |
Tobin Ehlis | 1cfb30a | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3487 | if (VK_FALSE == skipCall) |
| 3488 | debug_marker_dispatch_table(cmdBuffer)->CmdDbgMarkerEnd(cmdBuffer); |
Jon Ashburn | eab3449 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 3489 | } |
| 3490 | |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3491 | VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetDeviceProcAddr(VkDevice dev, const char* funcName) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3492 | { |
Jon Ashburn | 8d1b0b5 | 2015-05-18 13:20:15 -0600 | [diff] [blame] | 3493 | if (dev == NULL) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3494 | return NULL; |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 3495 | |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3496 | layer_data *dev_data; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3497 | /* loader uses this to force layer initialization; device object is wrapped */ |
| 3498 | if (!strcmp(funcName, "vkGetDeviceProcAddr")) { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3499 | VkBaseLayerObject* wrapped_dev = (VkBaseLayerObject*) dev; |
| 3500 | dev_data = get_my_data_ptr(get_dispatch_key(wrapped_dev->baseObject), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3501 | dev_data->device_dispatch_table = new VkLayerDispatchTable; |
| 3502 | layer_initialize_dispatch_table(dev_data->device_dispatch_table, wrapped_dev); |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3503 | return (PFN_vkVoidFunction) vkGetDeviceProcAddr; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3504 | } |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3505 | dev_data = get_my_data_ptr(get_dispatch_key(dev), layer_data_map); |
Courtney Goeltzenleuchter | ca173b8 | 2015-06-25 18:01:43 -0600 | [diff] [blame] | 3506 | if (!strcmp(funcName, "vkCreateDevice")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3507 | return (PFN_vkVoidFunction) vkCreateDevice; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3508 | if (!strcmp(funcName, "vkDestroyDevice")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3509 | return (PFN_vkVoidFunction) vkDestroyDevice; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3510 | if (!strcmp(funcName, "vkQueueSubmit")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3511 | return (PFN_vkVoidFunction) vkQueueSubmit; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3512 | if (!strcmp(funcName, "vkDestroyInstance")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3513 | return (PFN_vkVoidFunction) vkDestroyInstance; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3514 | if (!strcmp(funcName, "vkDestroyDevice")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3515 | return (PFN_vkVoidFunction) vkDestroyDevice; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3516 | if (!strcmp(funcName, "vkDestroyFence")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3517 | return (PFN_vkVoidFunction) vkDestroyFence; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3518 | if (!strcmp(funcName, "vkDestroySemaphore")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3519 | return (PFN_vkVoidFunction) vkDestroySemaphore; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3520 | if (!strcmp(funcName, "vkDestroyEvent")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3521 | return (PFN_vkVoidFunction) vkDestroyEvent; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3522 | if (!strcmp(funcName, "vkDestroyQueryPool")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3523 | return (PFN_vkVoidFunction) vkDestroyQueryPool; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3524 | if (!strcmp(funcName, "vkDestroyBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3525 | return (PFN_vkVoidFunction) vkDestroyBuffer; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3526 | if (!strcmp(funcName, "vkDestroyBufferView")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3527 | return (PFN_vkVoidFunction) vkDestroyBufferView; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3528 | if (!strcmp(funcName, "vkDestroyImage")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3529 | return (PFN_vkVoidFunction) vkDestroyImage; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3530 | if (!strcmp(funcName, "vkDestroyImageView")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3531 | return (PFN_vkVoidFunction) vkDestroyImageView; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3532 | if (!strcmp(funcName, "vkDestroyShaderModule")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3533 | return (PFN_vkVoidFunction) vkDestroyShaderModule; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3534 | if (!strcmp(funcName, "vkDestroyShader")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3535 | return (PFN_vkVoidFunction) vkDestroyShader; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3536 | if (!strcmp(funcName, "vkDestroyPipeline")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3537 | return (PFN_vkVoidFunction) vkDestroyPipeline; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3538 | if (!strcmp(funcName, "vkDestroyPipelineLayout")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3539 | return (PFN_vkVoidFunction) vkDestroyPipelineLayout; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3540 | if (!strcmp(funcName, "vkDestroySampler")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3541 | return (PFN_vkVoidFunction) vkDestroySampler; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3542 | if (!strcmp(funcName, "vkDestroyDescriptorSetLayout")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3543 | return (PFN_vkVoidFunction) vkDestroyDescriptorSetLayout; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3544 | if (!strcmp(funcName, "vkDestroyDescriptorPool")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3545 | return (PFN_vkVoidFunction) vkDestroyDescriptorPool; |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 3546 | if (!strcmp(funcName, "vkFreeCommandBuffers")) |
| 3547 | return (PFN_vkVoidFunction) vkFreeCommandBuffers; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3548 | if (!strcmp(funcName, "vkDestroyFramebuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3549 | return (PFN_vkVoidFunction) vkDestroyFramebuffer; |
Tobin Ehlis | 60a9b4f | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3550 | if (!strcmp(funcName, "vkDestroyRenderPass")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3551 | return (PFN_vkVoidFunction) vkDestroyRenderPass; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3552 | if (!strcmp(funcName, "vkCreateBufferView")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3553 | return (PFN_vkVoidFunction) vkCreateBufferView; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3554 | if (!strcmp(funcName, "vkCreateImageView")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3555 | return (PFN_vkVoidFunction) vkCreateImageView; |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3556 | if (!strcmp(funcName, "CreatePipelineCache")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3557 | return (PFN_vkVoidFunction) vkCreatePipelineCache; |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3558 | if (!strcmp(funcName, "DestroyPipelineCache")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3559 | return (PFN_vkVoidFunction) vkDestroyPipelineCache; |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3560 | if (!strcmp(funcName, "GetPipelineCacheSize")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3561 | return (PFN_vkVoidFunction) vkGetPipelineCacheSize; |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3562 | if (!strcmp(funcName, "GetPipelineCacheData")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3563 | return (PFN_vkVoidFunction) vkGetPipelineCacheData; |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3564 | if (!strcmp(funcName, "MergePipelineCaches")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3565 | return (PFN_vkVoidFunction) vkMergePipelineCaches; |
Jon Ashburn | c669cc6 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3566 | if (!strcmp(funcName, "vkCreateGraphicsPipelines")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3567 | return (PFN_vkVoidFunction) vkCreateGraphicsPipelines; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3568 | if (!strcmp(funcName, "vkCreateSampler")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3569 | return (PFN_vkVoidFunction) vkCreateSampler; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3570 | if (!strcmp(funcName, "vkCreateDescriptorSetLayout")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3571 | return (PFN_vkVoidFunction) vkCreateDescriptorSetLayout; |
Mark Lobodzinski | 0fadf5f | 2015-04-17 14:11:39 -0500 | [diff] [blame] | 3572 | if (!strcmp(funcName, "vkCreatePipelineLayout")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3573 | return (PFN_vkVoidFunction) vkCreatePipelineLayout; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3574 | if (!strcmp(funcName, "vkCreateDescriptorPool")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3575 | return (PFN_vkVoidFunction) vkCreateDescriptorPool; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3576 | if (!strcmp(funcName, "vkResetDescriptorPool")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3577 | return (PFN_vkVoidFunction) vkResetDescriptorPool; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3578 | if (!strcmp(funcName, "vkAllocDescriptorSets")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3579 | return (PFN_vkVoidFunction) vkAllocDescriptorSets; |
Tobin Ehlis | e735c69 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 3580 | if (!strcmp(funcName, "vkFreeDescriptorSets")) |
| 3581 | return (PFN_vkVoidFunction) vkFreeDescriptorSets; |
Chia-I Wu | 9d00ed7 | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 3582 | if (!strcmp(funcName, "vkUpdateDescriptorSets")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3583 | return (PFN_vkVoidFunction) vkUpdateDescriptorSets; |
Courtney Goeltzenleuchter | bee18a9 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 3584 | if (!strcmp(funcName, "vkAllocCommandBuffers")) |
| 3585 | return (PFN_vkVoidFunction) vkAllocCommandBuffers; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3586 | if (!strcmp(funcName, "vkBeginCommandBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3587 | return (PFN_vkVoidFunction) vkBeginCommandBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3588 | if (!strcmp(funcName, "vkEndCommandBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3589 | return (PFN_vkVoidFunction) vkEndCommandBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3590 | if (!strcmp(funcName, "vkResetCommandBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3591 | return (PFN_vkVoidFunction) vkResetCommandBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3592 | if (!strcmp(funcName, "vkCmdBindPipeline")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3593 | return (PFN_vkVoidFunction) vkCmdBindPipeline; |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3594 | if (!strcmp(funcName, "vkCmdSetViewport")) |
| 3595 | return (PFN_vkVoidFunction) vkCmdSetViewport; |
Courtney Goeltzenleuchter | 078f817 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3596 | if (!strcmp(funcName, "vkCmdSetScissor")) |
| 3597 | return (PFN_vkVoidFunction) vkCmdSetScissor; |
Courtney Goeltzenleuchter | 49c7308 | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3598 | if (!strcmp(funcName, "vkCmdSetLineWidth")) |
| 3599 | return (PFN_vkVoidFunction) vkCmdSetLineWidth; |
| 3600 | if (!strcmp(funcName, "vkCmdSetDepthBias")) |
| 3601 | return (PFN_vkVoidFunction) vkCmdSetDepthBias; |
| 3602 | if (!strcmp(funcName, "vkCmdSetBlendConstants")) |
| 3603 | return (PFN_vkVoidFunction) vkCmdSetBlendConstants; |
| 3604 | if (!strcmp(funcName, "vkCmdSetDepthBounds")) |
| 3605 | return (PFN_vkVoidFunction) vkCmdSetDepthBounds; |
| 3606 | if (!strcmp(funcName, "vkCmdSetStencilCompareMask")) |
| 3607 | return (PFN_vkVoidFunction) vkCmdSetStencilCompareMask; |
| 3608 | if (!strcmp(funcName, "vkCmdSetStencilWriteMask")) |
| 3609 | return (PFN_vkVoidFunction) vkCmdSetStencilWriteMask; |
| 3610 | if (!strcmp(funcName, "vkCmdSetStencilReference")) |
| 3611 | return (PFN_vkVoidFunction) vkCmdSetStencilReference; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3612 | if (!strcmp(funcName, "vkCmdBindDescriptorSets")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3613 | return (PFN_vkVoidFunction) vkCmdBindDescriptorSets; |
Courtney Goeltzenleuchter | f68ad72 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 3614 | if (!strcmp(funcName, "vkCmdBindVertexBuffers")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3615 | return (PFN_vkVoidFunction) vkCmdBindVertexBuffers; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3616 | if (!strcmp(funcName, "vkCmdBindIndexBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3617 | return (PFN_vkVoidFunction) vkCmdBindIndexBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3618 | if (!strcmp(funcName, "vkCmdDraw")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3619 | return (PFN_vkVoidFunction) vkCmdDraw; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3620 | if (!strcmp(funcName, "vkCmdDrawIndexed")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3621 | return (PFN_vkVoidFunction) vkCmdDrawIndexed; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3622 | if (!strcmp(funcName, "vkCmdDrawIndirect")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3623 | return (PFN_vkVoidFunction) vkCmdDrawIndirect; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3624 | if (!strcmp(funcName, "vkCmdDrawIndexedIndirect")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3625 | return (PFN_vkVoidFunction) vkCmdDrawIndexedIndirect; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3626 | if (!strcmp(funcName, "vkCmdDispatch")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3627 | return (PFN_vkVoidFunction) vkCmdDispatch; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3628 | if (!strcmp(funcName, "vkCmdDispatchIndirect")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3629 | return (PFN_vkVoidFunction) vkCmdDispatchIndirect; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3630 | if (!strcmp(funcName, "vkCmdCopyBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3631 | return (PFN_vkVoidFunction) vkCmdCopyBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3632 | if (!strcmp(funcName, "vkCmdCopyImage")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3633 | return (PFN_vkVoidFunction) vkCmdCopyImage; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3634 | if (!strcmp(funcName, "vkCmdCopyBufferToImage")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3635 | return (PFN_vkVoidFunction) vkCmdCopyBufferToImage; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3636 | if (!strcmp(funcName, "vkCmdCopyImageToBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3637 | return (PFN_vkVoidFunction) vkCmdCopyImageToBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3638 | if (!strcmp(funcName, "vkCmdUpdateBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3639 | return (PFN_vkVoidFunction) vkCmdUpdateBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3640 | if (!strcmp(funcName, "vkCmdFillBuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3641 | return (PFN_vkVoidFunction) vkCmdFillBuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3642 | if (!strcmp(funcName, "vkCmdClearColorImage")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3643 | return (PFN_vkVoidFunction) vkCmdClearColorImage; |
Chris Forbes | d9be82b | 2015-06-22 17:21:59 +1200 | [diff] [blame] | 3644 | if (!strcmp(funcName, "vkCmdClearDepthStencilImage")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3645 | return (PFN_vkVoidFunction) vkCmdClearDepthStencilImage; |
Courtney Goeltzenleuchter | c9323e0 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 3646 | if (!strcmp(funcName, "vkCmdClearAttachments")) |
| 3647 | return (PFN_vkVoidFunction) vkCmdClearAttachments; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3648 | if (!strcmp(funcName, "vkCmdResolveImage")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3649 | return (PFN_vkVoidFunction) vkCmdResolveImage; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3650 | if (!strcmp(funcName, "vkCmdSetEvent")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3651 | return (PFN_vkVoidFunction) vkCmdSetEvent; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3652 | if (!strcmp(funcName, "vkCmdResetEvent")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3653 | return (PFN_vkVoidFunction) vkCmdResetEvent; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3654 | if (!strcmp(funcName, "vkCmdWaitEvents")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3655 | return (PFN_vkVoidFunction) vkCmdWaitEvents; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3656 | if (!strcmp(funcName, "vkCmdPipelineBarrier")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3657 | return (PFN_vkVoidFunction) vkCmdPipelineBarrier; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3658 | if (!strcmp(funcName, "vkCmdBeginQuery")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3659 | return (PFN_vkVoidFunction) vkCmdBeginQuery; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3660 | if (!strcmp(funcName, "vkCmdEndQuery")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3661 | return (PFN_vkVoidFunction) vkCmdEndQuery; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3662 | if (!strcmp(funcName, "vkCmdResetQueryPool")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3663 | return (PFN_vkVoidFunction) vkCmdResetQueryPool; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3664 | if (!strcmp(funcName, "vkCmdWriteTimestamp")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3665 | return (PFN_vkVoidFunction) vkCmdWriteTimestamp; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3666 | if (!strcmp(funcName, "vkCreateFramebuffer")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3667 | return (PFN_vkVoidFunction) vkCreateFramebuffer; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3668 | if (!strcmp(funcName, "vkCreateRenderPass")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3669 | return (PFN_vkVoidFunction) vkCreateRenderPass; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3670 | if (!strcmp(funcName, "vkCmdBeginRenderPass")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3671 | return (PFN_vkVoidFunction) vkCmdBeginRenderPass; |
Chia-I Wu | 08accc6 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 3672 | if (!strcmp(funcName, "vkCmdNextSubpass")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3673 | return (PFN_vkVoidFunction) vkCmdNextSubpass; |
Courtney Goeltzenleuchter | d8e229c | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3674 | if (!strcmp(funcName, "vkCmdEndRenderPass")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3675 | return (PFN_vkVoidFunction) vkCmdEndRenderPass; |
Tobin Ehlis | 4b34ddc | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 3676 | if (!strcmp(funcName, "vkCmdExecuteCommands")) |
| 3677 | return (PFN_vkVoidFunction) vkCmdExecuteCommands; |
Jon Ashburn | eab3449 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 3678 | |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3679 | VkLayerDispatchTable* pTable = dev_data->device_dispatch_table; |
| 3680 | if (dev_data->device_extensions.debug_marker_enabled) |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3681 | { |
Jon Ashburn | 747f2b6 | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 3682 | if (!strcmp(funcName, "vkCmdDbgMarkerBegin")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3683 | return (PFN_vkVoidFunction) vkCmdDbgMarkerBegin; |
Jon Ashburn | 747f2b6 | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 3684 | if (!strcmp(funcName, "vkCmdDbgMarkerEnd")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3685 | return (PFN_vkVoidFunction) vkCmdDbgMarkerEnd; |
Jon Ashburn | eab3449 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 3686 | } |
| 3687 | { |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3688 | if (pTable->GetDeviceProcAddr == NULL) |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3689 | return NULL; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3690 | return pTable->GetDeviceProcAddr(dev, funcName); |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 3691 | } |
| 3692 | } |
| 3693 | |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3694 | VK_LAYER_EXPORT PFN_vkVoidFunction VKAPI vkGetInstanceProcAddr(VkInstance instance, const char* funcName) |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 3695 | { |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3696 | PFN_vkVoidFunction fptr; |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 3697 | if (instance == NULL) |
| 3698 | return NULL; |
| 3699 | |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3700 | layer_data* my_data; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3701 | /* loader uses this to force layer initialization; instance object is wrapped */ |
| 3702 | if (!strcmp(funcName, "vkGetInstanceProcAddr")) { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3703 | VkBaseLayerObject* wrapped_inst = (VkBaseLayerObject*) instance; |
| 3704 | my_data = get_my_data_ptr(get_dispatch_key(wrapped_inst->baseObject), layer_data_map); |
Tobin Ehlis | b212dfc | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3705 | my_data->instance_dispatch_table = new VkLayerInstanceDispatchTable; |
| 3706 | layer_init_instance_dispatch_table(my_data->instance_dispatch_table, wrapped_inst); |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3707 | return (PFN_vkVoidFunction) vkGetInstanceProcAddr; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3708 | } |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3709 | my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Courtney Goeltzenleuchter | abc035e | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 3710 | if (!strcmp(funcName, "vkCreateInstance")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3711 | return (PFN_vkVoidFunction) vkCreateInstance; |
Jon Ashburn | 3950e1b | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 3712 | if (!strcmp(funcName, "vkDestroyInstance")) |
Courtney Goeltzenleuchter | 2d3ba63 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 3713 | return (PFN_vkVoidFunction) vkDestroyInstance; |
Courtney Goeltzenleuchter | 35985f6 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 3714 | if (!strcmp(funcName, "vkEnumerateInstanceLayerProperties")) |
| 3715 | return (PFN_vkVoidFunction) vkEnumerateInstanceLayerProperties; |
| 3716 | if (!strcmp(funcName, "vkEnumerateInstanceExtensionProperties")) |
| 3717 | return (PFN_vkVoidFunction) vkEnumerateInstanceExtensionProperties; |
| 3718 | if (!strcmp(funcName, "vkEnumerateDeviceLayerProperties")) |
| 3719 | return (PFN_vkVoidFunction) vkEnumerateDeviceLayerProperties; |
| 3720 | if (!strcmp(funcName, "vkEnumerateDeviceExtensionProperties")) |
| 3721 | return (PFN_vkVoidFunction) vkEnumerateDeviceExtensionProperties; |
Courtney Goeltzenleuchter | ee56287 | 2015-06-01 14:33:14 -0600 | [diff] [blame] | 3722 | |
Tobin Ehlis | a16e892 | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 3723 | fptr = debug_report_get_instance_proc_addr(my_data->report_data, funcName); |
Courtney Goeltzenleuchter | ee56287 | 2015-06-01 14:33:14 -0600 | [diff] [blame] | 3724 | if (fptr) |
| 3725 | return fptr; |
| 3726 | |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3727 | { |
Tobin Ehlis | 0b63233 | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3728 | VkLayerInstanceDispatchTable* pTable = my_data->instance_dispatch_table; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3729 | if (pTable->GetInstanceProcAddr == NULL) |
Jon Ashburn | f6b33db | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 3730 | return NULL; |
Jon Ashburn | 8fd0825 | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 3731 | return pTable->GetInstanceProcAddr(instance, funcName); |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3732 | } |
Tobin Ehlis | 10ae8c1 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3733 | } |