Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1 | /* |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2 | * |
Courtney Goeltzenleuchter | 8a17da5 | 2015-10-29 13:50:34 -0600 | [diff] [blame] | 3 | * Copyright (C) 2015 Valve Corporation |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4 | * Copyright (C) 2015 Google, Inc. |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5 | * |
| 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
| 7 | * copy of this software and associated documentation files (the "Software"), |
| 8 | * to deal in the Software without restriction, including without limitation |
| 9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
| 10 | * and/or sell copies of the Software, and to permit persons to whom the |
| 11 | * Software is furnished to do so, subject to the following conditions: |
| 12 | * |
| 13 | * The above copyright notice and this permission notice shall be included |
| 14 | * in all copies or substantial portions of the Software. |
| 15 | * |
| 16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
| 17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
| 18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
| 19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
| 20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
| 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
| 22 | * DEALINGS IN THE SOFTWARE. |
Courtney Goeltzenleuchter | 96cd795 | 2015-10-30 11:14:30 -0600 | [diff] [blame] | 23 | * |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 24 | * Author: Cody Northrop <cnorthrop@google.com> |
Courtney Goeltzenleuchter | 96cd795 | 2015-10-30 11:14:30 -0600 | [diff] [blame] | 25 | * Author: Michael Lentine <mlentine@google.com> |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 26 | * Author: Tobin Ehlis <tobine@google.com> |
| 27 | * Author: Chia-I Wu <olv@google.com> |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 28 | * Author: Chris Forbes <chrisf@ijw.co.nz> |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 29 | */ |
| 30 | |
| 31 | #include <stdio.h> |
| 32 | #include <stdlib.h> |
| 33 | #include <string.h> |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 34 | #include <assert.h> |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 35 | #include <unordered_map> |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 36 | #include <unordered_set> |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 37 | #include <map> |
| 38 | #include <string> |
| 39 | #include <iostream> |
| 40 | #include <algorithm> |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 41 | #include <list> |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 42 | #include <spirv.hpp> |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 43 | #include <set> |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 44 | |
Tobin Ehlis | 7a51d90 | 2015-07-03 10:34:49 -0600 | [diff] [blame] | 45 | #include "vk_loader_platform.h" |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 46 | #include "vk_dispatch_table_helper.h" |
| 47 | #include "vk_struct_string_helper_cpp.h" |
Tony Barbour | a938abb | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 48 | #if defined(__GNUC__) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 49 | #pragma GCC diagnostic ignored "-Wwrite-strings" |
Tony Barbour | a938abb | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 50 | #endif |
Tony Barbour | a938abb | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 51 | #if defined(__GNUC__) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 52 | #pragma GCC diagnostic warning "-Wwrite-strings" |
Tony Barbour | a938abb | 2015-04-22 11:36:22 -0600 | [diff] [blame] | 53 | #endif |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 54 | #include "vk_struct_size_helper.h" |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 55 | #include "draw_state.h" |
Tobin Ehlis | 56d204a | 2015-07-03 10:15:26 -0600 | [diff] [blame] | 56 | #include "vk_layer_config.h" |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 57 | #include "vulkan/vk_debug_marker_layer.h" |
Tobin Ehlis | 56d204a | 2015-07-03 10:15:26 -0600 | [diff] [blame] | 58 | #include "vk_layer_table.h" |
| 59 | #include "vk_layer_debug_marker_table.h" |
| 60 | #include "vk_layer_data.h" |
| 61 | #include "vk_layer_logging.h" |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 62 | #include "vk_layer_extension_utils.h" |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 63 | #include "vk_layer_utils.h" |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 64 | |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 65 | // This definition controls whether image layout transitions are enabled/disabled. |
| 66 | // disable until corner cases are fixed |
| 67 | #define DISABLE_IMAGE_LAYOUT_VALIDATION |
| 68 | |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 69 | using std::unordered_map; |
| 70 | using std::unordered_set; |
| 71 | |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 72 | // Track command pools and their command buffers |
| 73 | struct CMD_POOL_INFO { |
| 74 | VkCommandPoolCreateFlags createFlags; |
| 75 | list<VkCommandBuffer> commandBuffers; // list container of cmd buffers allocated from this pool |
| 76 | }; |
| 77 | |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 78 | struct devExts { |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 79 | VkBool32 debug_marker_enabled; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 80 | VkBool32 wsi_enabled; |
| 81 | unordered_map<VkSwapchainKHR, SWAPCHAIN_NODE*> swapchainMap; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 82 | }; |
| 83 | |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 84 | // fwd decls |
| 85 | struct shader_module; |
| 86 | struct render_pass; |
| 87 | |
Cody Northrop | 73bb657 | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 88 | struct layer_data { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 89 | debug_report_data* report_data; |
Courtney Goeltzenleuchter | 1781b1c | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 90 | std::vector<VkDbgMsgCallback> logging_callback; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 91 | VkLayerDispatchTable* device_dispatch_table; |
| 92 | VkLayerInstanceDispatchTable* instance_dispatch_table; |
| 93 | devExts device_extensions; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 94 | // Layer specific data |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 95 | unordered_map<VkSampler, unique_ptr<SAMPLER_NODE>> sampleMap; |
| 96 | unordered_map<VkImageView, unique_ptr<VkImageViewCreateInfo>> imageViewMap; |
| 97 | unordered_map<VkImage, unique_ptr<VkImageCreateInfo>> imageMap; |
| 98 | unordered_map<VkBufferView, unique_ptr<VkBufferViewCreateInfo>> bufferViewMap; |
| 99 | unordered_map<VkBuffer, unique_ptr<VkBufferCreateInfo>> bufferMap; |
| 100 | unordered_map<VkPipeline, PIPELINE_NODE*> pipelineMap; |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 101 | unordered_map<VkCommandPool, CMD_POOL_INFO> commandPoolMap; |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 102 | unordered_map<VkDescriptorPool, DESCRIPTOR_POOL_NODE*> descriptorPoolMap; |
| 103 | unordered_map<VkDescriptorSet, SET_NODE*> setMap; |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 104 | unordered_map<VkDescriptorSetLayout, LAYOUT_NODE*> descriptorSetLayoutMap; |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 105 | unordered_map<VkPipelineLayout, PIPELINE_LAYOUT_NODE> pipelineLayoutMap; |
| 106 | unordered_map<VkDeviceMemory, VkImage> memImageMap; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 107 | // Map for layout chains |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 108 | unordered_map<void*, GLOBAL_CB_NODE*> commandBufferMap; |
| 109 | unordered_map<VkFramebuffer, VkFramebufferCreateInfo*> frameBufferMap; |
| 110 | unordered_map<VkImage, IMAGE_NODE*> imageLayoutMap; |
| 111 | unordered_map<VkRenderPass, RENDER_PASS_NODE*> renderPassMap; |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 112 | unordered_map<VkShaderModule, shader_module*> shaderModuleMap; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 113 | // Current render pass |
| 114 | VkRenderPassBeginInfo renderPassBeginInfo; |
| 115 | uint32_t currentSubpass; |
Cody Northrop | 73bb657 | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 116 | |
| 117 | layer_data() : |
| 118 | report_data(nullptr), |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 119 | device_dispatch_table(nullptr), |
| 120 | instance_dispatch_table(nullptr), |
| 121 | device_extensions() |
Cody Northrop | 73bb657 | 2015-09-28 15:09:32 -0600 | [diff] [blame] | 122 | {}; |
| 123 | }; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 124 | // Code imported from ShaderChecker |
| 125 | static void |
| 126 | build_type_def_index(std::vector<unsigned> const &words, std::unordered_map<unsigned, unsigned> &type_def_index); |
| 127 | |
| 128 | struct shader_module { |
| 129 | /* the spirv image itself */ |
| 130 | vector<uint32_t> words; |
| 131 | /* a mapping of <id> to the first word of its def. this is useful because walking type |
| 132 | * trees requires jumping all over the instruction stream. |
| 133 | */ |
| 134 | unordered_map<unsigned, unsigned> type_def_index; |
| 135 | |
| 136 | shader_module(VkShaderModuleCreateInfo const *pCreateInfo) : |
| 137 | words((uint32_t *)pCreateInfo->pCode, (uint32_t *)pCreateInfo->pCode + pCreateInfo->codeSize / sizeof(uint32_t)), |
| 138 | type_def_index() { |
| 139 | |
| 140 | build_type_def_index(words, type_def_index); |
| 141 | } |
| 142 | }; |
| 143 | |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 144 | // TODO : Do we need to guard access to layer_data_map w/ lock? |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 145 | static unordered_map<void*, layer_data*> layer_data_map; |
Courtney Goeltzenleuchter | c280adc | 2015-06-13 21:23:09 -0600 | [diff] [blame] | 146 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 147 | static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce); |
| 148 | // TODO : This can be much smarter, using separate locks for separate global data |
| 149 | static int globalLockInitialized = 0; |
| 150 | static loader_platform_thread_mutex globalLock; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 151 | #define MAX_TID 513 |
| 152 | static loader_platform_thread_id g_tidMapping[MAX_TID] = {0}; |
| 153 | static uint32_t g_maxTID = 0; |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 154 | |
| 155 | template layer_data *get_my_data_ptr<layer_data>( |
| 156 | void *data_key, |
| 157 | std::unordered_map<void *, layer_data *> &data_map); |
| 158 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 159 | // Map actual TID to an index value and return that index |
| 160 | // This keeps TIDs in range from 0-MAX_TID and simplifies compares between runs |
| 161 | static uint32_t getTIDIndex() { |
| 162 | loader_platform_thread_id tid = loader_platform_get_thread_id(); |
| 163 | for (uint32_t i = 0; i < g_maxTID; i++) { |
| 164 | if (tid == g_tidMapping[i]) |
| 165 | return i; |
| 166 | } |
| 167 | // Don't yet have mapping, set it and return newly set index |
| 168 | uint32_t retVal = (uint32_t) g_maxTID; |
| 169 | g_tidMapping[g_maxTID++] = tid; |
| 170 | assert(g_maxTID < MAX_TID); |
| 171 | return retVal; |
| 172 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 173 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 174 | // Return a string representation of CMD_TYPE enum |
| 175 | static string cmdTypeToString(CMD_TYPE cmd) |
| 176 | { |
| 177 | switch (cmd) |
| 178 | { |
| 179 | case CMD_BINDPIPELINE: |
| 180 | return "CMD_BINDPIPELINE"; |
| 181 | case CMD_BINDPIPELINEDELTA: |
| 182 | return "CMD_BINDPIPELINEDELTA"; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 183 | case CMD_SETVIEWPORTSTATE: |
| 184 | return "CMD_SETVIEWPORTSTATE"; |
| 185 | case CMD_SETLINEWIDTHSTATE: |
| 186 | return "CMD_SETLINEWIDTHSTATE"; |
| 187 | case CMD_SETDEPTHBIASSTATE: |
| 188 | return "CMD_SETDEPTHBIASSTATE"; |
| 189 | case CMD_SETBLENDSTATE: |
| 190 | return "CMD_SETBLENDSTATE"; |
| 191 | case CMD_SETDEPTHBOUNDSSTATE: |
| 192 | return "CMD_SETDEPTHBOUNDSSTATE"; |
| 193 | case CMD_SETSTENCILREADMASKSTATE: |
| 194 | return "CMD_SETSTENCILREADMASKSTATE"; |
| 195 | case CMD_SETSTENCILWRITEMASKSTATE: |
| 196 | return "CMD_SETSTENCILWRITEMASKSTATE"; |
| 197 | case CMD_SETSTENCILREFERENCESTATE: |
| 198 | return "CMD_SETSTENCILREFERENCESTATE"; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 199 | case CMD_BINDDESCRIPTORSETS: |
| 200 | return "CMD_BINDDESCRIPTORSETS"; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 201 | case CMD_BINDINDEXBUFFER: |
| 202 | return "CMD_BINDINDEXBUFFER"; |
| 203 | case CMD_BINDVERTEXBUFFER: |
| 204 | return "CMD_BINDVERTEXBUFFER"; |
| 205 | case CMD_DRAW: |
| 206 | return "CMD_DRAW"; |
| 207 | case CMD_DRAWINDEXED: |
| 208 | return "CMD_DRAWINDEXED"; |
| 209 | case CMD_DRAWINDIRECT: |
| 210 | return "CMD_DRAWINDIRECT"; |
| 211 | case CMD_DRAWINDEXEDINDIRECT: |
| 212 | return "CMD_DRAWINDEXEDINDIRECT"; |
| 213 | case CMD_DISPATCH: |
| 214 | return "CMD_DISPATCH"; |
| 215 | case CMD_DISPATCHINDIRECT: |
| 216 | return "CMD_DISPATCHINDIRECT"; |
| 217 | case CMD_COPYBUFFER: |
| 218 | return "CMD_COPYBUFFER"; |
| 219 | case CMD_COPYIMAGE: |
| 220 | return "CMD_COPYIMAGE"; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 221 | case CMD_BLITIMAGE: |
| 222 | return "CMD_BLITIMAGE"; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 223 | case CMD_COPYBUFFERTOIMAGE: |
| 224 | return "CMD_COPYBUFFERTOIMAGE"; |
| 225 | case CMD_COPYIMAGETOBUFFER: |
| 226 | return "CMD_COPYIMAGETOBUFFER"; |
| 227 | case CMD_CLONEIMAGEDATA: |
| 228 | return "CMD_CLONEIMAGEDATA"; |
| 229 | case CMD_UPDATEBUFFER: |
| 230 | return "CMD_UPDATEBUFFER"; |
| 231 | case CMD_FILLBUFFER: |
| 232 | return "CMD_FILLBUFFER"; |
| 233 | case CMD_CLEARCOLORIMAGE: |
| 234 | return "CMD_CLEARCOLORIMAGE"; |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 235 | case CMD_CLEARATTACHMENTS: |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 236 | return "CMD_CLEARCOLORATTACHMENT"; |
| 237 | case CMD_CLEARDEPTHSTENCILIMAGE: |
| 238 | return "CMD_CLEARDEPTHSTENCILIMAGE"; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 239 | case CMD_RESOLVEIMAGE: |
| 240 | return "CMD_RESOLVEIMAGE"; |
| 241 | case CMD_SETEVENT: |
| 242 | return "CMD_SETEVENT"; |
| 243 | case CMD_RESETEVENT: |
| 244 | return "CMD_RESETEVENT"; |
| 245 | case CMD_WAITEVENTS: |
| 246 | return "CMD_WAITEVENTS"; |
| 247 | case CMD_PIPELINEBARRIER: |
| 248 | return "CMD_PIPELINEBARRIER"; |
| 249 | case CMD_BEGINQUERY: |
| 250 | return "CMD_BEGINQUERY"; |
| 251 | case CMD_ENDQUERY: |
| 252 | return "CMD_ENDQUERY"; |
| 253 | case CMD_RESETQUERYPOOL: |
| 254 | return "CMD_RESETQUERYPOOL"; |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 255 | case CMD_COPYQUERYPOOLRESULTS: |
| 256 | return "CMD_COPYQUERYPOOLRESULTS"; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 257 | case CMD_WRITETIMESTAMP: |
| 258 | return "CMD_WRITETIMESTAMP"; |
| 259 | case CMD_INITATOMICCOUNTERS: |
| 260 | return "CMD_INITATOMICCOUNTERS"; |
| 261 | case CMD_LOADATOMICCOUNTERS: |
| 262 | return "CMD_LOADATOMICCOUNTERS"; |
| 263 | case CMD_SAVEATOMICCOUNTERS: |
| 264 | return "CMD_SAVEATOMICCOUNTERS"; |
| 265 | case CMD_BEGINRENDERPASS: |
| 266 | return "CMD_BEGINRENDERPASS"; |
| 267 | case CMD_ENDRENDERPASS: |
| 268 | return "CMD_ENDRENDERPASS"; |
| 269 | case CMD_DBGMARKERBEGIN: |
| 270 | return "CMD_DBGMARKERBEGIN"; |
| 271 | case CMD_DBGMARKEREND: |
| 272 | return "CMD_DBGMARKEREND"; |
| 273 | default: |
| 274 | return "UNKNOWN"; |
| 275 | } |
| 276 | } |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 277 | |
| 278 | // SPIRV utility functions |
| 279 | static void |
| 280 | build_type_def_index(std::vector<unsigned> const &words, std::unordered_map<unsigned, unsigned> &type_def_index) |
| 281 | { |
| 282 | unsigned int const *code = (unsigned int const *)&words[0]; |
| 283 | size_t size = words.size(); |
| 284 | |
| 285 | unsigned word = 5; |
| 286 | while (word < size) { |
| 287 | unsigned opcode = code[word] & 0x0ffffu; |
| 288 | unsigned oplen = (code[word] & 0xffff0000u) >> 16; |
| 289 | |
| 290 | switch (opcode) { |
| 291 | case spv::OpTypeVoid: |
| 292 | case spv::OpTypeBool: |
| 293 | case spv::OpTypeInt: |
| 294 | case spv::OpTypeFloat: |
| 295 | case spv::OpTypeVector: |
| 296 | case spv::OpTypeMatrix: |
| 297 | case spv::OpTypeImage: |
| 298 | case spv::OpTypeSampler: |
| 299 | case spv::OpTypeSampledImage: |
| 300 | case spv::OpTypeArray: |
| 301 | case spv::OpTypeRuntimeArray: |
| 302 | case spv::OpTypeStruct: |
| 303 | case spv::OpTypeOpaque: |
| 304 | case spv::OpTypePointer: |
| 305 | case spv::OpTypeFunction: |
| 306 | case spv::OpTypeEvent: |
| 307 | case spv::OpTypeDeviceEvent: |
| 308 | case spv::OpTypeReserveId: |
| 309 | case spv::OpTypeQueue: |
| 310 | case spv::OpTypePipe: |
| 311 | type_def_index[code[word+1]] = word; |
| 312 | break; |
| 313 | |
| 314 | default: |
| 315 | /* We only care about type definitions */ |
| 316 | break; |
| 317 | } |
| 318 | |
| 319 | word += oplen; |
| 320 | } |
| 321 | } |
| 322 | |
| 323 | bool |
| 324 | shader_is_spirv(VkShaderModuleCreateInfo const *pCreateInfo) |
| 325 | { |
| 326 | uint32_t *words = (uint32_t *)pCreateInfo->pCode; |
| 327 | size_t sizeInWords = pCreateInfo->codeSize / sizeof(uint32_t); |
| 328 | |
| 329 | /* Just validate that the header makes sense. */ |
| 330 | return sizeInWords >= 5 && words[0] == spv::MagicNumber && words[1] == spv::Version; |
| 331 | } |
| 332 | |
| 333 | static char const * |
| 334 | storage_class_name(unsigned sc) |
| 335 | { |
| 336 | switch (sc) { |
| 337 | case spv::StorageClassInput: return "input"; |
| 338 | case spv::StorageClassOutput: return "output"; |
| 339 | case spv::StorageClassUniformConstant: return "const uniform"; |
| 340 | case spv::StorageClassUniform: return "uniform"; |
| 341 | case spv::StorageClassWorkgroup: return "workgroup local"; |
| 342 | case spv::StorageClassCrossWorkgroup: return "workgroup global"; |
| 343 | case spv::StorageClassPrivate: return "private global"; |
| 344 | case spv::StorageClassFunction: return "function"; |
| 345 | case spv::StorageClassGeneric: return "generic"; |
| 346 | case spv::StorageClassAtomicCounter: return "atomic counter"; |
| 347 | case spv::StorageClassImage: return "image"; |
| 348 | default: return "unknown"; |
| 349 | } |
| 350 | } |
| 351 | |
| 352 | /* returns ptr to null terminator */ |
| 353 | static char * |
| 354 | describe_type(char *dst, shader_module const *src, unsigned type) |
| 355 | { |
| 356 | auto type_def_it = src->type_def_index.find(type); |
| 357 | |
| 358 | if (type_def_it == src->type_def_index.end()) { |
| 359 | return dst + sprintf(dst, "undef"); |
| 360 | } |
| 361 | |
| 362 | unsigned int const *code = (unsigned int const *)&src->words[type_def_it->second]; |
| 363 | unsigned opcode = code[0] & 0x0ffffu; |
| 364 | switch (opcode) { |
| 365 | case spv::OpTypeBool: |
| 366 | return dst + sprintf(dst, "bool"); |
| 367 | case spv::OpTypeInt: |
| 368 | return dst + sprintf(dst, "%cint%d", code[3] ? 's' : 'u', code[2]); |
| 369 | case spv::OpTypeFloat: |
| 370 | return dst + sprintf(dst, "float%d", code[2]); |
| 371 | case spv::OpTypeVector: |
| 372 | dst += sprintf(dst, "vec%d of ", code[3]); |
| 373 | return describe_type(dst, src, code[2]); |
| 374 | case spv::OpTypeMatrix: |
| 375 | dst += sprintf(dst, "mat%d of ", code[3]); |
| 376 | return describe_type(dst, src, code[2]); |
| 377 | case spv::OpTypeArray: |
| 378 | dst += sprintf(dst, "arr[%d] of ", code[3]); |
| 379 | return describe_type(dst, src, code[2]); |
| 380 | case spv::OpTypePointer: |
| 381 | dst += sprintf(dst, "ptr to %s ", storage_class_name(code[2])); |
| 382 | return describe_type(dst, src, code[3]); |
| 383 | case spv::OpTypeStruct: |
| 384 | { |
| 385 | unsigned oplen = code[0] >> 16; |
| 386 | dst += sprintf(dst, "struct of ("); |
| 387 | for (unsigned i = 2; i < oplen; i++) { |
| 388 | dst = describe_type(dst, src, code[i]); |
| 389 | dst += sprintf(dst, i == oplen-1 ? ")" : ", "); |
| 390 | } |
| 391 | return dst; |
| 392 | } |
| 393 | case spv::OpTypeSampler: |
| 394 | return dst + sprintf(dst, "sampler"); |
| 395 | default: |
| 396 | return dst + sprintf(dst, "oddtype"); |
| 397 | } |
| 398 | } |
| 399 | |
| 400 | static bool |
| 401 | types_match(shader_module const *a, shader_module const *b, unsigned a_type, unsigned b_type, bool b_arrayed) |
| 402 | { |
| 403 | auto a_type_def_it = a->type_def_index.find(a_type); |
| 404 | auto b_type_def_it = b->type_def_index.find(b_type); |
| 405 | |
| 406 | if (a_type_def_it == a->type_def_index.end()) { |
| 407 | return false; |
| 408 | } |
| 409 | |
| 410 | if (b_type_def_it == b->type_def_index.end()) { |
| 411 | return false; |
| 412 | } |
| 413 | |
| 414 | /* walk two type trees together, and complain about differences */ |
| 415 | unsigned int const *a_code = (unsigned int const *)&a->words[a_type_def_it->second]; |
| 416 | unsigned int const *b_code = (unsigned int const *)&b->words[b_type_def_it->second]; |
| 417 | |
| 418 | unsigned a_opcode = a_code[0] & 0x0ffffu; |
| 419 | unsigned b_opcode = b_code[0] & 0x0ffffu; |
| 420 | |
| 421 | if (b_arrayed && b_opcode == spv::OpTypeArray) { |
| 422 | /* we probably just found the extra level of arrayness in b_type: compare the type inside it to a_type */ |
| 423 | return types_match(a, b, a_type, b_code[2], false); |
| 424 | } |
| 425 | |
| 426 | if (a_opcode != b_opcode) { |
| 427 | return false; |
| 428 | } |
| 429 | |
| 430 | switch (a_opcode) { |
| 431 | /* if b_arrayed and we hit a leaf type, then we can't match -- there's nowhere for the extra OpTypeArray to be! */ |
| 432 | case spv::OpTypeBool: |
| 433 | return true && !b_arrayed; |
| 434 | case spv::OpTypeInt: |
| 435 | /* match on width, signedness */ |
| 436 | return a_code[2] == b_code[2] && a_code[3] == b_code[3] && !b_arrayed; |
| 437 | case spv::OpTypeFloat: |
| 438 | /* match on width */ |
| 439 | return a_code[2] == b_code[2] && !b_arrayed; |
| 440 | case spv::OpTypeVector: |
| 441 | case spv::OpTypeMatrix: |
| 442 | case spv::OpTypeArray: |
| 443 | /* match on element type, count. these all have the same layout. we don't get here if |
| 444 | * b_arrayed -- that is handled above. */ |
| 445 | return !b_arrayed && types_match(a, b, a_code[2], b_code[2], b_arrayed) && a_code[3] == b_code[3]; |
| 446 | case spv::OpTypeStruct: |
| 447 | /* match on all element types */ |
| 448 | { |
| 449 | if (b_arrayed) { |
| 450 | /* for the purposes of matching different levels of arrayness, structs are leaves. */ |
| 451 | return false; |
| 452 | } |
| 453 | |
| 454 | unsigned a_len = a_code[0] >> 16; |
| 455 | unsigned b_len = b_code[0] >> 16; |
| 456 | |
| 457 | if (a_len != b_len) { |
| 458 | return false; /* structs cannot match if member counts differ */ |
| 459 | } |
| 460 | |
| 461 | for (unsigned i = 2; i < a_len; i++) { |
| 462 | if (!types_match(a, b, a_code[i], b_code[i], b_arrayed)) { |
| 463 | return false; |
| 464 | } |
| 465 | } |
| 466 | |
| 467 | return true; |
| 468 | } |
| 469 | case spv::OpTypePointer: |
| 470 | /* match on pointee type. storage class is expected to differ */ |
| 471 | return types_match(a, b, a_code[3], b_code[3], b_arrayed); |
| 472 | |
| 473 | default: |
| 474 | /* remaining types are CLisms, or may not appear in the interfaces we |
| 475 | * are interested in. Just claim no match. |
| 476 | */ |
| 477 | return false; |
| 478 | |
| 479 | } |
| 480 | } |
| 481 | |
| 482 | static int |
| 483 | value_or_default(std::unordered_map<unsigned, unsigned> const &map, unsigned id, int def) |
| 484 | { |
| 485 | auto it = map.find(id); |
| 486 | if (it == map.end()) |
| 487 | return def; |
| 488 | else |
| 489 | return it->second; |
| 490 | } |
| 491 | |
| 492 | |
| 493 | static unsigned |
| 494 | get_locations_consumed_by_type(shader_module const *src, unsigned type, bool strip_array_level) |
| 495 | { |
| 496 | auto type_def_it = src->type_def_index.find(type); |
| 497 | |
| 498 | if (type_def_it == src->type_def_index.end()) { |
| 499 | return 1; /* This is actually broken SPIR-V... */ |
| 500 | } |
| 501 | |
| 502 | unsigned int const *code = (unsigned int const *)&src->words[type_def_it->second]; |
| 503 | unsigned opcode = code[0] & 0x0ffffu; |
| 504 | |
| 505 | switch (opcode) { |
| 506 | case spv::OpTypePointer: |
| 507 | /* see through the ptr -- this is only ever at the toplevel for graphics shaders; |
| 508 | * we're never actually passing pointers around. */ |
| 509 | return get_locations_consumed_by_type(src, code[3], strip_array_level); |
| 510 | case spv::OpTypeArray: |
| 511 | if (strip_array_level) { |
| 512 | return get_locations_consumed_by_type(src, code[2], false); |
| 513 | } |
| 514 | else { |
| 515 | return code[3] * get_locations_consumed_by_type(src, code[2], false); |
| 516 | } |
| 517 | case spv::OpTypeMatrix: |
| 518 | /* num locations is the dimension * element size */ |
| 519 | return code[3] * get_locations_consumed_by_type(src, code[2], false); |
| 520 | default: |
| 521 | /* everything else is just 1. */ |
| 522 | return 1; |
| 523 | |
| 524 | /* TODO: extend to handle 64bit scalar types, whose vectors may need |
| 525 | * multiple locations. */ |
| 526 | } |
| 527 | } |
| 528 | |
| 529 | |
| 530 | struct interface_var { |
| 531 | uint32_t id; |
| 532 | uint32_t type_id; |
| 533 | uint32_t offset; |
| 534 | /* TODO: collect the name, too? Isn't required to be present. */ |
| 535 | }; |
| 536 | |
| 537 | static void |
| 538 | collect_interface_by_location(layer_data *my_data, VkDevice dev, |
| 539 | shader_module const *src, spv::StorageClass sinterface, |
| 540 | std::map<uint32_t, interface_var> &out, |
| 541 | std::map<uint32_t, interface_var> &builtins_out, |
| 542 | bool is_array_of_verts) |
| 543 | { |
| 544 | unsigned int const *code = (unsigned int const *)&src->words[0]; |
| 545 | size_t size = src->words.size(); |
| 546 | |
| 547 | std::unordered_map<unsigned, unsigned> var_locations; |
| 548 | std::unordered_map<unsigned, unsigned> var_builtins; |
| 549 | |
| 550 | unsigned word = 5; |
| 551 | while (word < size) { |
| 552 | |
| 553 | unsigned opcode = code[word] & 0x0ffffu; |
| 554 | unsigned oplen = (code[word] & 0xffff0000u) >> 16; |
| 555 | |
| 556 | /* We consider two interface models: SSO rendezvous-by-location, and |
| 557 | * builtins. Complain about anything that fits neither model. |
| 558 | */ |
| 559 | if (opcode == spv::OpDecorate) { |
| 560 | if (code[word+2] == spv::DecorationLocation) { |
| 561 | var_locations[code[word+1]] = code[word+3]; |
| 562 | } |
| 563 | |
| 564 | if (code[word+2] == spv::DecorationBuiltIn) { |
| 565 | var_builtins[code[word+1]] = code[word+3]; |
| 566 | } |
| 567 | } |
| 568 | |
| 569 | /* TODO: handle grouped decorations */ |
| 570 | /* TODO: handle index=1 dual source outputs from FS -- two vars will |
| 571 | * have the same location, and we DONT want to clobber. */ |
| 572 | |
| 573 | if (opcode == spv::OpVariable && code[word+3] == sinterface) { |
| 574 | unsigned id = code[word+2]; |
| 575 | unsigned type = code[word+1]; |
| 576 | |
| 577 | int location = value_or_default(var_locations, code[word+2], -1); |
| 578 | int builtin = value_or_default(var_builtins, code[word+2], -1); |
| 579 | |
| 580 | if (location == -1 && builtin == -1) { |
| 581 | /* No location defined, and not bound to an API builtin. |
| 582 | * The spec says nothing about how this case works (or doesn't) |
| 583 | * for interface matching. |
| 584 | */ |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 585 | log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INCONSISTENT_SPIRV, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 586 | "var %d (type %d) in %s interface has no Location or Builtin decoration", |
| 587 | code[word+2], code[word+1], storage_class_name(sinterface)); |
| 588 | } |
| 589 | else if (location != -1) { |
| 590 | /* A user-defined interface variable, with a location. Where a variable |
| 591 | * occupied multiple locations, emit one result for each. */ |
| 592 | unsigned num_locations = get_locations_consumed_by_type(src, type, |
| 593 | is_array_of_verts); |
| 594 | for (int offset = 0; offset < num_locations; offset++) { |
| 595 | interface_var v; |
| 596 | v.id = id; |
| 597 | v.type_id = type; |
| 598 | v.offset = offset; |
| 599 | out[location + offset] = v; |
| 600 | } |
| 601 | } |
| 602 | else { |
| 603 | /* A builtin interface variable */ |
| 604 | /* Note that since builtin interface variables do not consume numbered |
| 605 | * locations, there is no larger-than-vec4 consideration as above |
| 606 | */ |
| 607 | interface_var v; |
| 608 | v.id = id; |
| 609 | v.type_id = type; |
| 610 | v.offset = 0; |
| 611 | builtins_out[builtin] = v; |
| 612 | } |
| 613 | } |
| 614 | |
| 615 | word += oplen; |
| 616 | } |
| 617 | } |
| 618 | |
| 619 | static void |
| 620 | collect_interface_by_descriptor_slot(layer_data *my_data, VkDevice dev, |
| 621 | shader_module const *src, spv::StorageClass sinterface, |
| 622 | std::map<std::pair<unsigned, unsigned>, interface_var> &out) |
| 623 | { |
| 624 | unsigned int const *code = (unsigned int const *)&src->words[0]; |
| 625 | size_t size = src->words.size(); |
| 626 | |
| 627 | std::unordered_map<unsigned, unsigned> var_sets; |
| 628 | std::unordered_map<unsigned, unsigned> var_bindings; |
| 629 | |
| 630 | unsigned word = 5; |
| 631 | while (word < size) { |
| 632 | |
| 633 | unsigned opcode = code[word] & 0x0ffffu; |
| 634 | unsigned oplen = (code[word] & 0xffff0000u) >> 16; |
| 635 | |
| 636 | /* All variables in the Uniform or UniformConstant storage classes are required to be decorated with both |
| 637 | * DecorationDescriptorSet and DecorationBinding. |
| 638 | */ |
| 639 | if (opcode == spv::OpDecorate) { |
| 640 | if (code[word+2] == spv::DecorationDescriptorSet) { |
| 641 | var_sets[code[word+1]] = code[word+3]; |
| 642 | } |
| 643 | |
| 644 | if (code[word+2] == spv::DecorationBinding) { |
| 645 | var_bindings[code[word+1]] = code[word+3]; |
| 646 | } |
| 647 | } |
| 648 | |
| 649 | if (opcode == spv::OpVariable && (code[word+3] == spv::StorageClassUniform || |
| 650 | code[word+3] == spv::StorageClassUniformConstant)) { |
| 651 | unsigned set = value_or_default(var_sets, code[word+2], 0); |
| 652 | unsigned binding = value_or_default(var_bindings, code[word+2], 0); |
| 653 | |
| 654 | auto existing_it = out.find(std::make_pair(set, binding)); |
| 655 | if (existing_it != out.end()) { |
| 656 | /* conflict within spv image */ |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 657 | log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 658 | SHADER_CHECKER_INCONSISTENT_SPIRV, "SC", |
| 659 | "var %d (type %d) in %s interface in descriptor slot (%u,%u) conflicts with existing definition", |
| 660 | code[word+2], code[word+1], storage_class_name(sinterface), |
| 661 | existing_it->first.first, existing_it->first.second); |
| 662 | } |
| 663 | |
| 664 | interface_var v; |
| 665 | v.id = code[word+2]; |
| 666 | v.type_id = code[word+1]; |
| 667 | out[std::make_pair(set, binding)] = v; |
| 668 | } |
| 669 | |
| 670 | word += oplen; |
| 671 | } |
| 672 | } |
| 673 | |
| 674 | static bool |
| 675 | validate_interface_between_stages(layer_data *my_data, VkDevice dev, |
| 676 | shader_module const *producer, char const *producer_name, |
| 677 | shader_module const *consumer, char const *consumer_name, |
| 678 | bool consumer_arrayed_input) |
| 679 | { |
| 680 | std::map<uint32_t, interface_var> outputs; |
| 681 | std::map<uint32_t, interface_var> inputs; |
| 682 | |
| 683 | std::map<uint32_t, interface_var> builtin_outputs; |
| 684 | std::map<uint32_t, interface_var> builtin_inputs; |
| 685 | |
| 686 | bool pass = true; |
| 687 | |
| 688 | collect_interface_by_location(my_data, dev, producer, spv::StorageClassOutput, outputs, builtin_outputs, false); |
| 689 | collect_interface_by_location(my_data, dev, consumer, spv::StorageClassInput, inputs, builtin_inputs, |
| 690 | consumer_arrayed_input); |
| 691 | |
| 692 | auto a_it = outputs.begin(); |
| 693 | auto b_it = inputs.begin(); |
| 694 | |
| 695 | /* maps sorted by key (location); walk them together to find mismatches */ |
| 696 | while ((outputs.size() > 0 && a_it != outputs.end()) || ( inputs.size() && b_it != inputs.end())) { |
| 697 | bool a_at_end = outputs.size() == 0 || a_it == outputs.end(); |
| 698 | bool b_at_end = inputs.size() == 0 || b_it == inputs.end(); |
| 699 | auto a_first = a_at_end ? 0 : a_it->first; |
| 700 | auto b_first = b_at_end ? 0 : b_it->first; |
| 701 | |
| 702 | if (b_at_end || ((!a_at_end) && (a_first < b_first))) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 703 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_PERF_WARN_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_OUTPUT_NOT_CONSUMED, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 704 | "%s writes to output location %d which is not consumed by %s", producer_name, a_first, consumer_name)) { |
| 705 | pass = false; |
| 706 | } |
| 707 | a_it++; |
| 708 | } |
| 709 | else if (a_at_end || a_first > b_first) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 710 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INPUT_NOT_PRODUCED, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 711 | "%s consumes input location %d which is not written by %s", consumer_name, b_first, producer_name)) { |
| 712 | pass = false; |
| 713 | } |
| 714 | b_it++; |
| 715 | } |
| 716 | else { |
| 717 | if (types_match(producer, consumer, a_it->second.type_id, b_it->second.type_id, consumer_arrayed_input)) { |
| 718 | /* OK! */ |
| 719 | } |
| 720 | else { |
| 721 | char producer_type[1024]; |
| 722 | char consumer_type[1024]; |
| 723 | describe_type(producer_type, producer, a_it->second.type_id); |
| 724 | describe_type(consumer_type, consumer, b_it->second.type_id); |
| 725 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 726 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INTERFACE_TYPE_MISMATCH, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 727 | "Type mismatch on location %d: '%s' vs '%s'", a_it->first, producer_type, consumer_type)) { |
| 728 | pass = false; |
| 729 | } |
| 730 | } |
| 731 | a_it++; |
| 732 | b_it++; |
| 733 | } |
| 734 | } |
| 735 | |
| 736 | return pass; |
| 737 | } |
| 738 | |
| 739 | enum FORMAT_TYPE { |
| 740 | FORMAT_TYPE_UNDEFINED, |
| 741 | FORMAT_TYPE_FLOAT, /* UNORM, SNORM, FLOAT, USCALED, SSCALED, SRGB -- anything we consider float in the shader */ |
| 742 | FORMAT_TYPE_SINT, |
| 743 | FORMAT_TYPE_UINT, |
| 744 | }; |
| 745 | |
| 746 | static unsigned |
| 747 | get_format_type(VkFormat fmt) { |
| 748 | switch (fmt) { |
| 749 | case VK_FORMAT_UNDEFINED: |
| 750 | return FORMAT_TYPE_UNDEFINED; |
| 751 | case VK_FORMAT_R8_SINT: |
| 752 | case VK_FORMAT_R8G8_SINT: |
| 753 | case VK_FORMAT_R8G8B8_SINT: |
| 754 | case VK_FORMAT_R8G8B8A8_SINT: |
| 755 | case VK_FORMAT_R16_SINT: |
| 756 | case VK_FORMAT_R16G16_SINT: |
| 757 | case VK_FORMAT_R16G16B16_SINT: |
| 758 | case VK_FORMAT_R16G16B16A16_SINT: |
| 759 | case VK_FORMAT_R32_SINT: |
| 760 | case VK_FORMAT_R32G32_SINT: |
| 761 | case VK_FORMAT_R32G32B32_SINT: |
| 762 | case VK_FORMAT_R32G32B32A32_SINT: |
| 763 | case VK_FORMAT_B8G8R8_SINT: |
| 764 | case VK_FORMAT_B8G8R8A8_SINT: |
| 765 | case VK_FORMAT_A2B10G10R10_SINT_PACK32: |
| 766 | case VK_FORMAT_A2R10G10B10_SINT_PACK32: |
| 767 | return FORMAT_TYPE_SINT; |
| 768 | case VK_FORMAT_R8_UINT: |
| 769 | case VK_FORMAT_R8G8_UINT: |
| 770 | case VK_FORMAT_R8G8B8_UINT: |
| 771 | case VK_FORMAT_R8G8B8A8_UINT: |
| 772 | case VK_FORMAT_R16_UINT: |
| 773 | case VK_FORMAT_R16G16_UINT: |
| 774 | case VK_FORMAT_R16G16B16_UINT: |
| 775 | case VK_FORMAT_R16G16B16A16_UINT: |
| 776 | case VK_FORMAT_R32_UINT: |
| 777 | case VK_FORMAT_R32G32_UINT: |
| 778 | case VK_FORMAT_R32G32B32_UINT: |
| 779 | case VK_FORMAT_R32G32B32A32_UINT: |
| 780 | case VK_FORMAT_B8G8R8_UINT: |
| 781 | case VK_FORMAT_B8G8R8A8_UINT: |
| 782 | case VK_FORMAT_A2B10G10R10_UINT_PACK32: |
| 783 | case VK_FORMAT_A2R10G10B10_UINT_PACK32: |
| 784 | return FORMAT_TYPE_UINT; |
| 785 | default: |
| 786 | return FORMAT_TYPE_FLOAT; |
| 787 | } |
| 788 | } |
| 789 | |
| 790 | /* characterizes a SPIR-V type appearing in an interface to a FF stage, |
| 791 | * for comparison to a VkFormat's characterization above. */ |
| 792 | static unsigned |
| 793 | get_fundamental_type(shader_module const *src, unsigned type) |
| 794 | { |
| 795 | auto type_def_it = src->type_def_index.find(type); |
| 796 | |
| 797 | if (type_def_it == src->type_def_index.end()) { |
| 798 | return FORMAT_TYPE_UNDEFINED; |
| 799 | } |
| 800 | |
| 801 | unsigned int const *code = (unsigned int const *)&src->words[type_def_it->second]; |
| 802 | unsigned opcode = code[0] & 0x0ffffu; |
| 803 | switch (opcode) { |
| 804 | case spv::OpTypeInt: |
| 805 | return code[3] ? FORMAT_TYPE_SINT : FORMAT_TYPE_UINT; |
| 806 | case spv::OpTypeFloat: |
| 807 | return FORMAT_TYPE_FLOAT; |
| 808 | case spv::OpTypeVector: |
| 809 | return get_fundamental_type(src, code[2]); |
| 810 | case spv::OpTypeMatrix: |
| 811 | return get_fundamental_type(src, code[2]); |
| 812 | case spv::OpTypeArray: |
| 813 | return get_fundamental_type(src, code[2]); |
| 814 | case spv::OpTypePointer: |
| 815 | return get_fundamental_type(src, code[3]); |
| 816 | default: |
| 817 | return FORMAT_TYPE_UNDEFINED; |
| 818 | } |
| 819 | } |
| 820 | |
| 821 | static bool |
| 822 | validate_vi_consistency(layer_data *my_data, VkDevice dev, VkPipelineVertexInputStateCreateInfo const *vi) |
| 823 | { |
| 824 | /* walk the binding descriptions, which describe the step rate and stride of each vertex buffer. |
| 825 | * each binding should be specified only once. |
| 826 | */ |
| 827 | std::unordered_map<uint32_t, VkVertexInputBindingDescription const *> bindings; |
| 828 | bool pass = true; |
| 829 | |
| 830 | for (unsigned i = 0; i < vi->vertexBindingDescriptionCount; i++) { |
| 831 | auto desc = &vi->pVertexBindingDescriptions[i]; |
| 832 | auto & binding = bindings[desc->binding]; |
| 833 | if (binding) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 834 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INCONSISTENT_VI, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 835 | "Duplicate vertex input binding descriptions for binding %d", desc->binding)) { |
| 836 | pass = false; |
| 837 | } |
| 838 | } |
| 839 | else { |
| 840 | binding = desc; |
| 841 | } |
| 842 | } |
| 843 | |
| 844 | return pass; |
| 845 | } |
| 846 | |
| 847 | static bool |
| 848 | validate_vi_against_vs_inputs(layer_data *my_data, VkDevice dev, VkPipelineVertexInputStateCreateInfo const *vi, shader_module const *vs) |
| 849 | { |
| 850 | std::map<uint32_t, interface_var> inputs; |
| 851 | /* we collect builtin inputs, but they will never appear in the VI state -- |
| 852 | * the vs builtin inputs are generated in the pipeline, not sourced from buffers (VertexID, etc) |
| 853 | */ |
| 854 | std::map<uint32_t, interface_var> builtin_inputs; |
| 855 | bool pass = true; |
| 856 | |
| 857 | collect_interface_by_location(my_data, dev, vs, spv::StorageClassInput, inputs, builtin_inputs, false); |
| 858 | |
| 859 | /* Build index by location */ |
| 860 | std::map<uint32_t, VkVertexInputAttributeDescription const *> attribs; |
| 861 | if (vi) { |
| 862 | for (unsigned i = 0; i < vi->vertexAttributeDescriptionCount; i++) |
| 863 | attribs[vi->pVertexAttributeDescriptions[i].location] = &vi->pVertexAttributeDescriptions[i]; |
| 864 | } |
| 865 | |
| 866 | auto it_a = attribs.begin(); |
| 867 | auto it_b = inputs.begin(); |
| 868 | |
| 869 | while ((attribs.size() > 0 && it_a != attribs.end()) || (inputs.size() > 0 && it_b != inputs.end())) { |
| 870 | bool a_at_end = attribs.size() == 0 || it_a == attribs.end(); |
| 871 | bool b_at_end = inputs.size() == 0 || it_b == inputs.end(); |
| 872 | auto a_first = a_at_end ? 0 : it_a->first; |
| 873 | auto b_first = b_at_end ? 0 : it_b->first; |
| 874 | if (b_at_end || a_first < b_first) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 875 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_PERF_WARN_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_OUTPUT_NOT_CONSUMED, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 876 | "Vertex attribute at location %d not consumed by VS", a_first)) { |
| 877 | pass = false; |
| 878 | } |
| 879 | it_a++; |
| 880 | } |
| 881 | else if (a_at_end || b_first < a_first) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 882 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INPUT_NOT_PRODUCED, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 883 | "VS consumes input at location %d but not provided", b_first)) { |
| 884 | pass = false; |
| 885 | } |
| 886 | it_b++; |
| 887 | } |
| 888 | else { |
| 889 | unsigned attrib_type = get_format_type(it_a->second->format); |
| 890 | unsigned input_type = get_fundamental_type(vs, it_b->second.type_id); |
| 891 | |
| 892 | /* type checking */ |
| 893 | if (attrib_type != FORMAT_TYPE_UNDEFINED && input_type != FORMAT_TYPE_UNDEFINED && attrib_type != input_type) { |
| 894 | char vs_type[1024]; |
| 895 | describe_type(vs_type, vs, it_b->second.type_id); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 896 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INTERFACE_TYPE_MISMATCH, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 897 | "Attribute type of `%s` at location %d does not match VS input type of `%s`", |
| 898 | string_VkFormat(it_a->second->format), a_first, vs_type)) { |
| 899 | pass = false; |
| 900 | } |
| 901 | } |
| 902 | |
| 903 | /* OK! */ |
| 904 | it_a++; |
| 905 | it_b++; |
| 906 | } |
| 907 | } |
| 908 | |
| 909 | return pass; |
| 910 | } |
| 911 | |
| 912 | static bool |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 913 | validate_fs_outputs_against_render_pass(layer_data *my_data, VkDevice dev, shader_module const *fs, RENDER_PASS_NODE const *rp, uint32_t subpass) |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 914 | { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 915 | const std::vector<VkFormat> &color_formats = rp->subpassColorFormats[subpass]; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 916 | std::map<uint32_t, interface_var> outputs; |
| 917 | std::map<uint32_t, interface_var> builtin_outputs; |
| 918 | bool pass = true; |
| 919 | |
| 920 | /* TODO: dual source blend index (spv::DecIndex, zero if not provided) */ |
| 921 | |
| 922 | collect_interface_by_location(my_data, dev, fs, spv::StorageClassOutput, outputs, builtin_outputs, false); |
| 923 | |
| 924 | auto it = outputs.begin(); |
| 925 | uint32_t attachment = 0; |
| 926 | |
| 927 | /* Walk attachment list and outputs together -- this is a little overpowered since attachments |
| 928 | * are currently dense, but the parallel with matching between shader stages is nice. |
| 929 | */ |
| 930 | |
| 931 | /* TODO: Figure out compile error with cb->attachmentCount */ |
| 932 | while ((outputs.size() > 0 && it != outputs.end()) || attachment < color_formats.size()) { |
| 933 | if (attachment == color_formats.size() || ( it != outputs.end() && it->first < attachment)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 934 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_OUTPUT_NOT_CONSUMED, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 935 | "FS writes to output location %d with no matching attachment", it->first)) { |
| 936 | pass = false; |
| 937 | } |
| 938 | it++; |
| 939 | } |
| 940 | else if (it == outputs.end() || it->first > attachment) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 941 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INPUT_NOT_PRODUCED, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 942 | "Attachment %d not written by FS", attachment)) { |
| 943 | pass = false; |
| 944 | } |
| 945 | attachment++; |
| 946 | } |
| 947 | else { |
| 948 | unsigned output_type = get_fundamental_type(fs, it->second.type_id); |
| 949 | unsigned att_type = get_format_type(color_formats[attachment]); |
| 950 | |
| 951 | /* type checking */ |
| 952 | if (att_type != FORMAT_TYPE_UNDEFINED && output_type != FORMAT_TYPE_UNDEFINED && att_type != output_type) { |
| 953 | char fs_type[1024]; |
| 954 | describe_type(fs_type, fs, it->second.type_id); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 955 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_INTERFACE_TYPE_MISMATCH, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 956 | "Attachment %d of type `%s` does not match FS output type of `%s`", |
| 957 | attachment, string_VkFormat(color_formats[attachment]), fs_type)) { |
| 958 | pass = false; |
| 959 | } |
| 960 | } |
| 961 | |
| 962 | /* OK! */ |
| 963 | it++; |
| 964 | attachment++; |
| 965 | } |
| 966 | } |
| 967 | |
| 968 | return pass; |
| 969 | } |
| 970 | |
| 971 | |
| 972 | struct shader_stage_attributes { |
| 973 | char const * const name; |
| 974 | bool arrayed_input; |
| 975 | }; |
| 976 | |
| 977 | |
| 978 | static shader_stage_attributes |
| 979 | shader_stage_attribs[] = { |
| 980 | { "vertex shader", false }, |
| 981 | { "tessellation control shader", true }, |
| 982 | { "tessellation evaluation shader", false }, |
| 983 | { "geometry shader", true }, |
| 984 | { "fragment shader", false }, |
| 985 | }; |
| 986 | |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 987 | // For given pipelineLayout verify that the setLayout at slot.first |
| 988 | // has the requested binding at slot.second |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 989 | static bool |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 990 | has_descriptor_binding(layer_data* my_data, |
| 991 | vector<VkDescriptorSetLayout>* pipelineLayout, |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 992 | std::pair<unsigned, unsigned> slot) |
| 993 | { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 994 | if (!pipelineLayout) |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 995 | return false; |
| 996 | |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 997 | if (slot.first >= pipelineLayout->size()) |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 998 | return false; |
| 999 | |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1000 | auto set = my_data->descriptorSetLayoutMap[(*pipelineLayout)[slot.first]]->bindings; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1001 | |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1002 | return (set.find(slot.second) != set.end()); |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1003 | } |
| 1004 | |
| 1005 | static uint32_t get_shader_stage_id(VkShaderStageFlagBits stage) |
| 1006 | { |
| 1007 | uint32_t bit_pos = u_ffs(stage); |
| 1008 | return bit_pos-1; |
| 1009 | } |
| 1010 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1011 | // Block of code at start here for managing/tracking Pipeline state that this layer cares about |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1012 | |
| 1013 | static uint64_t g_drawCount[NUM_DRAW_TYPES] = {0, 0, 0, 0}; |
| 1014 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1015 | // TODO : Should be tracking lastBound per commandBuffer and when draws occur, report based on that cmd buffer lastBound |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1016 | // Then need to synchronize the accesses based on cmd buffer so that if I'm reading state on one cmd buffer, updates |
| 1017 | // to that same cmd buffer by separate thread are not changing state from underneath us |
| 1018 | // Track the last cmd buffer touched by this thread |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1019 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1020 | // Track the last global DrawState of interest touched by any thread |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1021 | static PIPELINE_NODE* g_lastBoundPipeline = NULL; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1022 | #define MAX_BINDING 0xFFFFFFFF // Default vtxBinding value in CB Node to identify if no vtxBinding set |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1023 | // prototype |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1024 | static GLOBAL_CB_NODE* getCBNode(layer_data*, const VkCommandBuffer); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1025 | |
Courtney Goeltzenleuchter | 1f41f54 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 1026 | static VkBool32 hasDrawCmd(GLOBAL_CB_NODE* pCB) |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 1027 | { |
| 1028 | for (uint32_t i=0; i<NUM_DRAW_TYPES; i++) { |
| 1029 | if (pCB->drawCount[i]) |
| 1030 | return VK_TRUE; |
| 1031 | } |
| 1032 | return VK_FALSE; |
| 1033 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1034 | |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1035 | // Check object status for selected flag state |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1036 | 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 | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 1037 | { |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1038 | // If non-zero enable mask is present, check it against status but if enable_mask |
| 1039 | // is 0 then no enable required so we should always just check status |
| 1040 | if ((!enable_mask) || (enable_mask & pNode->status)) { |
| 1041 | if ((pNode->status & status_mask) != status_flag) { |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 1042 | // TODO : How to pass dispatchable objects as srcObject? Here src obj should be cmd buffer |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1043 | return log_msg(my_data->report_data, msg_flags, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, error_code, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1044 | "CB object %#" PRIxLEAST64 ": %s", reinterpret_cast<uint64_t>(pNode->commandBuffer), fail_msg); |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1045 | } |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1046 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1047 | return VK_FALSE; |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 1048 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1049 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1050 | // Retrieve pipeline node ptr for given pipeline object |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1051 | static PIPELINE_NODE* getPipeline(layer_data* my_data, const VkPipeline pipeline) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1052 | { |
| 1053 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1054 | if (my_data->pipelineMap.find(pipeline) == my_data->pipelineMap.end()) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1055 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1056 | return NULL; |
| 1057 | } |
| 1058 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1059 | return my_data->pipelineMap[pipeline]; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1060 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1061 | |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1062 | // Return VK_TRUE if for a given PSO, the given state enum is dynamic, else return VK_FALSE |
| 1063 | static VkBool32 isDynamic(const PIPELINE_NODE* pPipeline, const VkDynamicState state) |
| 1064 | { |
| 1065 | if (pPipeline && pPipeline->graphicsPipelineCI.pDynamicState) { |
| 1066 | for (uint32_t i=0; i<pPipeline->graphicsPipelineCI.pDynamicState->dynamicStateCount; i++) { |
| 1067 | if (state == pPipeline->graphicsPipelineCI.pDynamicState->pDynamicStates[i]) |
| 1068 | return VK_TRUE; |
| 1069 | } |
| 1070 | } |
| 1071 | return VK_FALSE; |
| 1072 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1073 | |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1074 | // Validate state stored as flags at time of draw call |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1075 | static VkBool32 validate_draw_state_flags(layer_data* my_data, GLOBAL_CB_NODE* pCB, VkBool32 indexedDraw) { |
Courtney Goeltzenleuchter | 1f41f54 | 2015-07-09 11:44:38 -0600 | [diff] [blame] | 1076 | VkBool32 result; |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1077 | result = validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_VIEWPORT_SET, CBSTATUS_VIEWPORT_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_VIEWPORT_NOT_BOUND, "Dynamic viewport state not set for this command buffer"); |
| 1078 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_SCISSOR_SET, CBSTATUS_SCISSOR_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_SCISSOR_NOT_BOUND, "Dynamic scissor state not set for this command buffer"); |
| 1079 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_LINE_WIDTH_SET, CBSTATUS_LINE_WIDTH_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_LINE_WIDTH_NOT_BOUND, "Dynamic line width state not set for this command buffer"); |
| 1080 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_DEPTH_BIAS_SET, CBSTATUS_DEPTH_BIAS_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_DEPTH_BIAS_NOT_BOUND, "Dynamic depth bias state not set for this command buffer"); |
| 1081 | result |= validate_status(my_data, pCB, CBSTATUS_COLOR_BLEND_WRITE_ENABLE, CBSTATUS_BLEND_SET, CBSTATUS_BLEND_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_BLEND_NOT_BOUND, "Dynamic blend object state not set for this command buffer"); |
| 1082 | result |= validate_status(my_data, pCB, CBSTATUS_DEPTH_WRITE_ENABLE, CBSTATUS_DEPTH_BOUNDS_SET, CBSTATUS_DEPTH_BOUNDS_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_DEPTH_BOUNDS_NOT_BOUND, "Dynamic depth bounds state not set for this command buffer"); |
| 1083 | result |= validate_status(my_data, pCB, CBSTATUS_STENCIL_TEST_ENABLE, CBSTATUS_STENCIL_READ_MASK_SET, CBSTATUS_STENCIL_READ_MASK_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic stencil read mask state not set for this command buffer"); |
| 1084 | result |= validate_status(my_data, pCB, CBSTATUS_STENCIL_TEST_ENABLE, CBSTATUS_STENCIL_WRITE_MASK_SET, CBSTATUS_STENCIL_WRITE_MASK_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic stencil write mask state not set for this command buffer"); |
| 1085 | result |= validate_status(my_data, pCB, CBSTATUS_STENCIL_TEST_ENABLE, CBSTATUS_STENCIL_REFERENCE_SET, CBSTATUS_STENCIL_REFERENCE_SET, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_STENCIL_NOT_BOUND, "Dynamic stencil reference state not set for this command buffer"); |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1086 | if (indexedDraw) |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1087 | result |= validate_status(my_data, pCB, CBSTATUS_NONE, CBSTATUS_INDEX_BUFFER_BOUND, CBSTATUS_INDEX_BUFFER_BOUND, VK_DEBUG_REPORT_ERROR_BIT, DRAWSTATE_INDEX_BUFFER_NOT_BOUND, "Index buffer object not bound to this command buffer when Indexed Draw attempted"); |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1088 | return result; |
| 1089 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1090 | |
| 1091 | // For give SET_NODE, verify that its Set is compatible w/ the setLayout corresponding to pipelineLayout[layoutIndex] |
| 1092 | static bool verify_set_layout_compatibility(layer_data* my_data, const SET_NODE* pSet, const VkPipelineLayout layout, const uint32_t layoutIndex, string& errorMsg) |
| 1093 | { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1094 | stringstream errorStr; |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1095 | if (my_data->pipelineLayoutMap.find(layout) == my_data->pipelineLayoutMap.end()) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1096 | errorStr << "invalid VkPipelineLayout (" << layout << ")"; |
| 1097 | errorMsg = errorStr.str(); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1098 | return false; |
| 1099 | } |
| 1100 | PIPELINE_LAYOUT_NODE pl = my_data->pipelineLayoutMap[layout]; |
| 1101 | if (layoutIndex >= pl.descriptorSetLayouts.size()) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1102 | errorStr << "VkPipelineLayout (" << layout << ") only contains " << pl.descriptorSetLayouts.size() << " setLayouts corresponding to sets 0-" << pl.descriptorSetLayouts.size()-1 << ", but you're attempting to bind set to index " << layoutIndex; |
| 1103 | errorMsg = errorStr.str(); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1104 | return false; |
| 1105 | } |
| 1106 | // Get the specific setLayout from PipelineLayout that overlaps this set |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1107 | LAYOUT_NODE* pLayoutNode = my_data->descriptorSetLayoutMap[pl.descriptorSetLayouts[layoutIndex]]; |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1108 | if (pLayoutNode->layout == pSet->pLayout->layout) { // trivial pass case |
| 1109 | return true; |
| 1110 | } |
| 1111 | uint32_t descriptorCount = pLayoutNode->descriptorTypes.size(); |
| 1112 | if (descriptorCount != pSet->pLayout->descriptorTypes.size()) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1113 | errorStr << "setLayout " << layoutIndex << " from pipelineLayout " << layout << " has " << descriptorCount << " descriptors, but corresponding set being bound has " << pSet->pLayout->descriptorTypes.size() << " descriptors."; |
| 1114 | errorMsg = errorStr.str(); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1115 | return false; // trivial fail case |
| 1116 | } |
| 1117 | // Now need to check set against corresponding pipelineLayout to verify compatibility |
| 1118 | for (uint32_t i=0; i<descriptorCount; ++i) { |
| 1119 | // Need to verify that layouts are identically defined |
| 1120 | // TODO : Is below sufficient? Making sure that types & stageFlags match per descriptor |
| 1121 | // do we also need to check immutable samplers? |
| 1122 | if (pLayoutNode->descriptorTypes[i] != pSet->pLayout->descriptorTypes[i]) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1123 | errorStr << "descriptor " << i << " for descriptorSet being bound is type '" << string_VkDescriptorType(pSet->pLayout->descriptorTypes[i]) << "' but corresponding descriptor from pipelineLayout is type '" << string_VkDescriptorType(pLayoutNode->descriptorTypes[i]) << "'"; |
| 1124 | errorMsg = errorStr.str(); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1125 | return false; |
| 1126 | } |
| 1127 | if (pLayoutNode->stageFlags[i] != pSet->pLayout->stageFlags[i]) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1128 | errorStr << "stageFlags " << i << " for descriptorSet being bound is " << pSet->pLayout->stageFlags[i] << "' but corresponding descriptor from pipelineLayout has stageFlags " << pLayoutNode->stageFlags[i]; |
| 1129 | errorMsg = errorStr.str(); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1130 | return false; |
| 1131 | } |
| 1132 | } |
| 1133 | return true; |
| 1134 | } |
| 1135 | |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1136 | // Validate that the shaders used by the given pipeline |
| 1137 | // As a side effect this function also records the sets that are actually used by the pipeline |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1138 | static bool |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1139 | validate_pipeline_shaders(layer_data *my_data, VkDevice dev, PIPELINE_NODE* pPipeline) |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1140 | { |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1141 | VkGraphicsPipelineCreateInfo const *pCreateInfo = &pPipeline->graphicsPipelineCI; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1142 | /* We seem to allow pipeline stages to be specified out of order, so collect and identify them |
| 1143 | * before trying to do anything more: */ |
| 1144 | int vertex_stage = get_shader_stage_id(VK_SHADER_STAGE_VERTEX_BIT); |
| 1145 | int geometry_stage = get_shader_stage_id(VK_SHADER_STAGE_GEOMETRY_BIT); |
| 1146 | int fragment_stage = get_shader_stage_id(VK_SHADER_STAGE_FRAGMENT_BIT); |
| 1147 | |
| 1148 | shader_module **shaders = new shader_module*[fragment_stage + 1]; /* exclude CS */ |
| 1149 | memset(shaders, 0, sizeof(shader_module *) * (fragment_stage +1)); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1150 | RENDER_PASS_NODE const *rp = 0; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1151 | VkPipelineVertexInputStateCreateInfo const *vi = 0; |
| 1152 | bool pass = true; |
| 1153 | |
| 1154 | for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { |
| 1155 | VkPipelineShaderStageCreateInfo const *pStage = &pCreateInfo->pStages[i]; |
| 1156 | if (pStage->sType == VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO) { |
| 1157 | |
| 1158 | if ((pStage->stage & (VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT | VK_SHADER_STAGE_FRAGMENT_BIT |
| 1159 | | VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT)) == 0) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1160 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_UNKNOWN_STAGE, "SC", |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1161 | "Unknown shader stage %d", pStage->stage)) { |
| 1162 | pass = false; |
| 1163 | } |
| 1164 | } |
| 1165 | else { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1166 | shader_module *module = my_data->shaderModuleMap[pStage->module]; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1167 | shaders[get_shader_stage_id(pStage->stage)] = module; |
| 1168 | |
| 1169 | /* validate descriptor set layout against what the spirv module actually uses */ |
| 1170 | std::map<std::pair<unsigned, unsigned>, interface_var> descriptor_uses; |
| 1171 | collect_interface_by_descriptor_slot(my_data, dev, module, spv::StorageClassUniform, |
| 1172 | descriptor_uses); |
| 1173 | |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1174 | auto layouts = pCreateInfo->layout != VK_NULL_HANDLE ? |
| 1175 | &(my_data->pipelineLayoutMap[pCreateInfo->layout].descriptorSetLayouts) : nullptr; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1176 | |
| 1177 | for (auto it = descriptor_uses.begin(); it != descriptor_uses.end(); it++) { |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1178 | // As a side-effect of this function, capture which sets are used by the pipeline |
| 1179 | pPipeline->active_sets.insert(it->first.first); |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1180 | |
| 1181 | /* find the matching binding */ |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1182 | auto found = has_descriptor_binding(my_data, layouts, it->first); |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1183 | |
| 1184 | if (!found) { |
| 1185 | char type_name[1024]; |
| 1186 | describe_type(type_name, module, it->second.type_id); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1187 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1188 | SHADER_CHECKER_MISSING_DESCRIPTOR, "SC", |
| 1189 | "Shader uses descriptor slot %u.%u (used as type `%s`) but not declared in pipeline layout", |
| 1190 | it->first.first, it->first.second, type_name)) { |
| 1191 | pass = false; |
| 1192 | } |
| 1193 | } |
| 1194 | } |
| 1195 | } |
| 1196 | } |
| 1197 | } |
| 1198 | |
| 1199 | if (pCreateInfo->renderPass != VK_NULL_HANDLE) |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1200 | rp = my_data->renderPassMap[pCreateInfo->renderPass]; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 1201 | |
| 1202 | vi = pCreateInfo->pVertexInputState; |
| 1203 | |
| 1204 | if (vi) { |
| 1205 | pass = validate_vi_consistency(my_data, dev, vi) && pass; |
| 1206 | } |
| 1207 | |
| 1208 | if (shaders[vertex_stage]) { |
| 1209 | pass = validate_vi_against_vs_inputs(my_data, dev, vi, shaders[vertex_stage]) && pass; |
| 1210 | } |
| 1211 | |
| 1212 | /* TODO: enforce rules about present combinations of shaders */ |
| 1213 | int producer = get_shader_stage_id(VK_SHADER_STAGE_VERTEX_BIT); |
| 1214 | int consumer = get_shader_stage_id(VK_SHADER_STAGE_GEOMETRY_BIT); |
| 1215 | |
| 1216 | while (!shaders[producer] && producer != fragment_stage) { |
| 1217 | producer++; |
| 1218 | consumer++; |
| 1219 | } |
| 1220 | |
| 1221 | for (; producer != fragment_stage && consumer <= fragment_stage; consumer++) { |
| 1222 | assert(shaders[producer]); |
| 1223 | if (shaders[consumer]) { |
| 1224 | pass = validate_interface_between_stages(my_data, dev, |
| 1225 | shaders[producer], shader_stage_attribs[producer].name, |
| 1226 | shaders[consumer], shader_stage_attribs[consumer].name, |
| 1227 | shader_stage_attribs[consumer].arrayed_input) && pass; |
| 1228 | |
| 1229 | producer = consumer; |
| 1230 | } |
| 1231 | } |
| 1232 | |
| 1233 | if (shaders[fragment_stage] && rp) { |
| 1234 | pass = validate_fs_outputs_against_render_pass(my_data, dev, shaders[fragment_stage], rp, pCreateInfo->subpass) && pass; |
| 1235 | } |
| 1236 | |
| 1237 | delete shaders; |
| 1238 | |
| 1239 | return pass; |
| 1240 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1241 | |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1242 | // Validate overall state at the time of a draw call |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1243 | static VkBool32 validate_draw_state(layer_data* my_data, GLOBAL_CB_NODE* pCB, VkBool32 indexedDraw) { |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1244 | // First check flag states |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1245 | VkBool32 result = validate_draw_state_flags(my_data, pCB, indexedDraw); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1246 | PIPELINE_NODE* pPipe = getPipeline(my_data, pCB->lastBoundPipeline); |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1247 | // Now complete other state checks |
Tobin Ehlis | 12ab7dc | 2015-09-09 13:31:01 -0600 | [diff] [blame] | 1248 | // TODO : Currently only performing next check if *something* was bound (non-zero last bound) |
| 1249 | // There is probably a better way to gate when this check happens, and to know if something *should* have been bound |
| 1250 | // We should have that check separately and then gate this check based on that check |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1251 | if (pPipe && (pCB->lastBoundPipelineLayout)) { |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1252 | string errorString; |
| 1253 | for (auto setIndex : pPipe->active_sets) { |
| 1254 | // If valid set is not bound throw an error |
| 1255 | if ((pCB->boundDescriptorSets.size() <= setIndex) || (!pCB->boundDescriptorSets[setIndex])) { |
Jon Ashburn | 56b015e | 2015-12-15 09:07:26 -0700 | [diff] [blame] | 1256 | result |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_DESCRIPTOR_SET_NOT_BOUND, "DS", |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1257 | "VkPipeline %#" PRIxLEAST64 " uses set #%u but that set is not bound.", (uint64_t)pPipe->pipeline, setIndex); |
| 1258 | } else if (!verify_set_layout_compatibility(my_data, my_data->setMap[pCB->boundDescriptorSets[setIndex]], pPipe->graphicsPipelineCI.layout, setIndex, errorString)) { |
| 1259 | // Set is bound but not compatible w/ overlapping pipelineLayout from PSO |
| 1260 | VkDescriptorSet setHandle = my_data->setMap[pCB->boundDescriptorSets[setIndex]]->set; |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1261 | result |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t)setHandle, 0, DRAWSTATE_PIPELINE_LAYOUTS_INCOMPATIBLE, "DS", |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1262 | "VkDescriptorSet (%#" PRIxLEAST64 ") bound as set #%u is not compatible with overlapping VkPipelineLayout %#" PRIxLEAST64 " due to: %s", (uint64_t)setHandle, setIndex, (uint64_t)pPipe->graphicsPipelineCI.layout, errorString.c_str()); |
| 1263 | } |
| 1264 | } |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1265 | } |
Tobin Ehlis | d28acef | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 1266 | // Verify Vtx binding |
| 1267 | if (MAX_BINDING != pCB->lastVtxBinding) { |
| 1268 | if (pCB->lastVtxBinding >= pPipe->vtxBindingCount) { |
| 1269 | if (0 == pPipe->vtxBindingCount) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1270 | result |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | d28acef | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 1271 | "Vtx Buffer Index %u was bound, but no vtx buffers are attached to PSO.", pCB->lastVtxBinding); |
Tobin Ehlis | d28acef | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 1272 | } |
| 1273 | else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1274 | result |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | d28acef | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 1275 | "Vtx binding Index of %u exceeds PSO pVertexBindingDescriptions max array index of %u.", pCB->lastVtxBinding, (pPipe->vtxBindingCount - 1)); |
Tobin Ehlis | d28acef | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 1276 | } |
| 1277 | } |
| 1278 | } |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1279 | // If Viewport or scissors are dynamic, verify that dynamic count matches PSO count |
| 1280 | VkBool32 dynViewport = isDynamic(pPipe, VK_DYNAMIC_STATE_VIEWPORT); |
| 1281 | VkBool32 dynScissor = isDynamic(pPipe, VK_DYNAMIC_STATE_SCISSOR); |
| 1282 | if (dynViewport) { |
| 1283 | if (pCB->viewports.size() != pPipe->graphicsPipelineCI.pViewportState->viewportCount) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1284 | result |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
| 1285 | "Dynamic viewportCount from vkCmdSetViewport() is " PRINTF_SIZE_T_SPECIFIER ", but PSO viewportCount is %u. These counts must match.", pCB->viewports.size(), pPipe->graphicsPipelineCI.pViewportState->viewportCount); |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1286 | } |
| 1287 | } |
| 1288 | if (dynScissor) { |
| 1289 | if (pCB->scissors.size() != pPipe->graphicsPipelineCI.pViewportState->scissorCount) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1290 | result |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
| 1291 | "Dynamic scissorCount from vkCmdSetScissor() is " PRINTF_SIZE_T_SPECIFIER ", but PSO scissorCount is %u. These counts must match.", pCB->scissors.size(), pPipe->graphicsPipelineCI.pViewportState->scissorCount); |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1292 | } |
| 1293 | } |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 1294 | return result; |
| 1295 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1296 | |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1297 | // Verify that create state for a pipeline is valid |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1298 | static VkBool32 verifyPipelineCreateState(layer_data* my_data, const VkDevice device, PIPELINE_NODE* pPipeline) |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1299 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1300 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1301 | //if (!validate_pipeline_shaders(my_data, device, &(pPipeline->graphicsPipelineCI))) { |
| 1302 | if (!validate_pipeline_shaders(my_data, device, pPipeline)) { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1303 | skipCall = VK_TRUE; |
| 1304 | } |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1305 | // VS is required |
| 1306 | if (!(pPipeline->active_shaders & VK_SHADER_STAGE_VERTEX_BIT)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1307 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1308 | "Invalid Pipeline CreateInfo State: Vtx Shader required"); |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1309 | } |
| 1310 | // Either both or neither TC/TE shaders should be defined |
Courtney Goeltzenleuchter | c6fd226 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 1311 | if (((pPipeline->active_shaders & VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT) == 0) != |
| 1312 | ((pPipeline->active_shaders & VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT) == 0) ) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1313 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1314 | "Invalid Pipeline CreateInfo State: TE and TC shaders must be included or excluded as a pair"); |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1315 | } |
| 1316 | // Compute shaders should be specified independent of Gfx shaders |
| 1317 | if ((pPipeline->active_shaders & VK_SHADER_STAGE_COMPUTE_BIT) && |
Courtney Goeltzenleuchter | c6fd226 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 1318 | (pPipeline->active_shaders & (VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | |
| 1319 | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT | VK_SHADER_STAGE_GEOMETRY_BIT | |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1320 | VK_SHADER_STAGE_FRAGMENT_BIT))) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1321 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1322 | "Invalid Pipeline CreateInfo State: Do not specify Compute Shader for Gfx Pipeline"); |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1323 | } |
Chia-I Wu | 99ba2bb | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1324 | // VK_PRIMITIVE_TOPOLOGY_PATCH_LIST primitive topology is only valid for tessellation pipelines. |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1325 | // Mismatching primitive topology and tessellation fails graphics pipeline creation. |
Courtney Goeltzenleuchter | c6fd226 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 1326 | if (pPipeline->active_shaders & (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT) && |
Chia-I Wu | 99ba2bb | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1327 | (pPipeline->iaStateCI.topology != VK_PRIMITIVE_TOPOLOGY_PATCH_LIST)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1328 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Chia-I Wu | 99ba2bb | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1329 | "Invalid Pipeline CreateInfo State: VK_PRIMITIVE_TOPOLOGY_PATCH_LIST must be set as IA topology for tessellation pipelines"); |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1330 | } |
Chia-I Wu | 99ba2bb | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1331 | if (pPipeline->iaStateCI.topology == VK_PRIMITIVE_TOPOLOGY_PATCH_LIST) { |
Courtney Goeltzenleuchter | c6fd226 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 1332 | if (~pPipeline->active_shaders & VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1333 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Chia-I Wu | 99ba2bb | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1334 | "Invalid Pipeline CreateInfo State: VK_PRIMITIVE_TOPOLOGY_PATCH_LIST primitive topology is only valid for tessellation pipelines"); |
Tobin Ehlis | 2069317 | 2015-09-17 08:46:18 -0600 | [diff] [blame] | 1335 | } |
| 1336 | if (!pPipeline->tessStateCI.patchControlPoints || (pPipeline->tessStateCI.patchControlPoints > 32)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1337 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_PIPELINE_CREATE_STATE, "DS", |
Chia-I Wu | 99ba2bb | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1338 | "Invalid Pipeline CreateInfo State: VK_PRIMITIVE_TOPOLOGY_PATCH_LIST primitive topology used with patchControlPoints value %u." |
Tobin Ehlis | 2069317 | 2015-09-17 08:46:18 -0600 | [diff] [blame] | 1339 | " patchControlPoints should be >0 and <=32.", pPipeline->tessStateCI.patchControlPoints); |
| 1340 | } |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1341 | } |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1342 | // Viewport state must be included and viewport and scissor counts should always match |
Tobin Ehlis | 9e839e5 | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 1343 | // NOTE : Even if these are flagged as dynamic, counts need to be set correctly for shader compiler |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1344 | if (!pPipeline->graphicsPipelineCI.pViewportState) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1345 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1346 | "Gfx Pipeline pViewportState is null. Even if viewport and scissors are dynamic PSO must include viewportCount and scissorCount in pViewportState."); |
| 1347 | } else if (pPipeline->graphicsPipelineCI.pViewportState->scissorCount != pPipeline->graphicsPipelineCI.pViewportState->viewportCount) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1348 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
Tobin Ehlis | 9e839e5 | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 1349 | "Gfx Pipeline viewport count (%u) must match scissor count (%u).", pPipeline->vpStateCI.viewportCount, pPipeline->vpStateCI.scissorCount); |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1350 | } else { |
| 1351 | // If viewport or scissor are not dynamic, then verify that data is appropriate for count |
| 1352 | VkBool32 dynViewport = isDynamic(pPipeline, VK_DYNAMIC_STATE_VIEWPORT); |
| 1353 | VkBool32 dynScissor = isDynamic(pPipeline, VK_DYNAMIC_STATE_SCISSOR); |
| 1354 | if (!dynViewport) { |
| 1355 | if (pPipeline->graphicsPipelineCI.pViewportState->viewportCount && !pPipeline->graphicsPipelineCI.pViewportState->pViewports) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1356 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
| 1357 | "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 | 9e839e5 | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 1358 | } |
| 1359 | } |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1360 | if (!dynScissor) { |
| 1361 | if (pPipeline->graphicsPipelineCI.pViewportState->scissorCount && !pPipeline->graphicsPipelineCI.pViewportState->pScissors) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1362 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VIEWPORT_SCISSOR_MISMATCH, "DS", |
| 1363 | "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); |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 1364 | } |
Tobin Ehlis | 9e839e5 | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 1365 | } |
| 1366 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1367 | return skipCall; |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1368 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1369 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1370 | // Init the pipeline mapping info based on pipeline create info LL tree |
| 1371 | // Threading note : Calls to this function should wrapped in mutex |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1372 | // TODO : this should really just be in the constructor for PIPELINE_NODE |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 1373 | static PIPELINE_NODE* initGraphicsPipeline(layer_data* dev_data, const VkGraphicsPipelineCreateInfo* pCreateInfo, PIPELINE_NODE* pBasePipeline) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1374 | { |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1375 | PIPELINE_NODE* pPipeline = new PIPELINE_NODE; |
Mark Lobodzinski | e443d2b | 2015-12-11 11:56:07 -0700 | [diff] [blame] | 1376 | |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1377 | if (pBasePipeline) { |
Mark Lobodzinski | e443d2b | 2015-12-11 11:56:07 -0700 | [diff] [blame] | 1378 | *pPipeline = *pBasePipeline; |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1379 | } |
Mark Lobodzinski | e443d2b | 2015-12-11 11:56:07 -0700 | [diff] [blame] | 1380 | |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1381 | // First init create info |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1382 | memcpy(&pPipeline->graphicsPipelineCI, pCreateInfo, sizeof(VkGraphicsPipelineCreateInfo)); |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1383 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1384 | size_t bufferSize = 0; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1385 | const VkPipelineVertexInputStateCreateInfo* pVICI = NULL; |
Tobin Ehlis | 59db571 | 2015-07-13 13:14:24 -0600 | [diff] [blame] | 1386 | const VkPipelineColorBlendStateCreateInfo* pCBCI = NULL; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1387 | |
| 1388 | for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { |
| 1389 | const VkPipelineShaderStageCreateInfo *pPSSCI = &pCreateInfo->pStages[i]; |
| 1390 | |
Chia-I Wu | 062ad15 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1391 | switch (pPSSCI->stage) { |
Courtney Goeltzenleuchter | 8e2f097 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 1392 | case VK_SHADER_STAGE_VERTEX_BIT: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1393 | memcpy(&pPipeline->vsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
| 1394 | pPipeline->active_shaders |= VK_SHADER_STAGE_VERTEX_BIT; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1395 | break; |
Courtney Goeltzenleuchter | 8e2f097 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 1396 | case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1397 | memcpy(&pPipeline->tcsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
Courtney Goeltzenleuchter | c6fd226 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 1398 | pPipeline->active_shaders |= VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1399 | break; |
Courtney Goeltzenleuchter | 8e2f097 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 1400 | case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1401 | memcpy(&pPipeline->tesCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
Courtney Goeltzenleuchter | c6fd226 | 2015-10-15 17:35:38 -0600 | [diff] [blame] | 1402 | pPipeline->active_shaders |= VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1403 | break; |
Courtney Goeltzenleuchter | 8e2f097 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 1404 | case VK_SHADER_STAGE_GEOMETRY_BIT: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1405 | memcpy(&pPipeline->gsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
| 1406 | pPipeline->active_shaders |= VK_SHADER_STAGE_GEOMETRY_BIT; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1407 | break; |
Courtney Goeltzenleuchter | 8e2f097 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 1408 | case VK_SHADER_STAGE_FRAGMENT_BIT: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1409 | memcpy(&pPipeline->fsCI, pPSSCI, sizeof(VkPipelineShaderStageCreateInfo)); |
| 1410 | pPipeline->active_shaders |= VK_SHADER_STAGE_FRAGMENT_BIT; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1411 | break; |
Courtney Goeltzenleuchter | 8e2f097 | 2015-10-21 17:08:06 -0600 | [diff] [blame] | 1412 | case VK_SHADER_STAGE_COMPUTE_BIT: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1413 | // TODO : Flag error, CS is specified through VkComputePipelineCreateInfo |
| 1414 | pPipeline->active_shaders |= VK_SHADER_STAGE_COMPUTE_BIT; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1415 | break; |
| 1416 | default: |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1417 | // TODO : Flag error |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1418 | break; |
| 1419 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1420 | } |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1421 | // Copy over GraphicsPipelineCreateInfo structure embedded pointers |
| 1422 | if (pCreateInfo->stageCount != 0) { |
| 1423 | pPipeline->graphicsPipelineCI.pStages = new VkPipelineShaderStageCreateInfo[pCreateInfo->stageCount]; |
| 1424 | bufferSize = pCreateInfo->stageCount * sizeof(VkPipelineShaderStageCreateInfo); |
| 1425 | memcpy((void*)pPipeline->graphicsPipelineCI.pStages, pCreateInfo->pStages, bufferSize); |
| 1426 | } |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1427 | if (pCreateInfo->pVertexInputState != NULL) { |
| 1428 | memcpy((void*)&pPipeline->vertexInputCI, pCreateInfo->pVertexInputState , sizeof(VkPipelineVertexInputStateCreateInfo)); |
| 1429 | // Copy embedded ptrs |
| 1430 | pVICI = pCreateInfo->pVertexInputState; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1431 | pPipeline->vtxBindingCount = pVICI->vertexBindingDescriptionCount; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1432 | if (pPipeline->vtxBindingCount) { |
| 1433 | pPipeline->pVertexBindingDescriptions = new VkVertexInputBindingDescription[pPipeline->vtxBindingCount]; |
| 1434 | bufferSize = pPipeline->vtxBindingCount * sizeof(VkVertexInputBindingDescription); |
| 1435 | memcpy((void*)pPipeline->pVertexBindingDescriptions, pVICI->pVertexBindingDescriptions, bufferSize); |
| 1436 | } |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1437 | pPipeline->vtxAttributeCount = pVICI->vertexAttributeDescriptionCount; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1438 | if (pPipeline->vtxAttributeCount) { |
| 1439 | pPipeline->pVertexAttributeDescriptions = new VkVertexInputAttributeDescription[pPipeline->vtxAttributeCount]; |
| 1440 | bufferSize = pPipeline->vtxAttributeCount * sizeof(VkVertexInputAttributeDescription); |
| 1441 | memcpy((void*)pPipeline->pVertexAttributeDescriptions, pVICI->pVertexAttributeDescriptions, bufferSize); |
| 1442 | } |
| 1443 | pPipeline->graphicsPipelineCI.pVertexInputState = &pPipeline->vertexInputCI; |
| 1444 | } |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1445 | if (pCreateInfo->pInputAssemblyState != NULL) { |
| 1446 | memcpy((void*)&pPipeline->iaStateCI, pCreateInfo->pInputAssemblyState, sizeof(VkPipelineInputAssemblyStateCreateInfo)); |
| 1447 | pPipeline->graphicsPipelineCI.pInputAssemblyState = &pPipeline->iaStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1448 | } |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1449 | if (pCreateInfo->pTessellationState != NULL) { |
| 1450 | memcpy((void*)&pPipeline->tessStateCI, pCreateInfo->pTessellationState, sizeof(VkPipelineTessellationStateCreateInfo)); |
| 1451 | pPipeline->graphicsPipelineCI.pTessellationState = &pPipeline->tessStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1452 | } |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1453 | if (pCreateInfo->pViewportState != NULL) { |
| 1454 | memcpy((void*)&pPipeline->vpStateCI, pCreateInfo->pViewportState, sizeof(VkPipelineViewportStateCreateInfo)); |
| 1455 | pPipeline->graphicsPipelineCI.pViewportState = &pPipeline->vpStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1456 | } |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1457 | if (pCreateInfo->pRasterizationState != NULL) { |
| 1458 | memcpy((void*)&pPipeline->rsStateCI, pCreateInfo->pRasterizationState, sizeof(VkPipelineRasterizationStateCreateInfo)); |
| 1459 | pPipeline->graphicsPipelineCI.pRasterizationState = &pPipeline->rsStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1460 | } |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1461 | if (pCreateInfo->pMultisampleState != NULL) { |
| 1462 | memcpy((void*)&pPipeline->msStateCI, pCreateInfo->pMultisampleState, sizeof(VkPipelineMultisampleStateCreateInfo)); |
| 1463 | pPipeline->graphicsPipelineCI.pMultisampleState = &pPipeline->msStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1464 | } |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1465 | if (pCreateInfo->pDepthStencilState != NULL) { |
| 1466 | memcpy((void*)&pPipeline->dsStateCI, pCreateInfo->pDepthStencilState, sizeof(VkPipelineDepthStencilStateCreateInfo)); |
| 1467 | pPipeline->graphicsPipelineCI.pDepthStencilState = &pPipeline->dsStateCI; |
| 1468 | } |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1469 | if (pCreateInfo->pColorBlendState != NULL) { |
| 1470 | memcpy((void*)&pPipeline->cbStateCI, pCreateInfo->pColorBlendState, sizeof(VkPipelineColorBlendStateCreateInfo)); |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1471 | // Copy embedded ptrs |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1472 | pCBCI = pCreateInfo->pColorBlendState; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1473 | pPipeline->attachmentCount = pCBCI->attachmentCount; |
| 1474 | if (pPipeline->attachmentCount) { |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1475 | pPipeline->pAttachments = new VkPipelineColorBlendAttachmentState[pPipeline->attachmentCount]; |
| 1476 | bufferSize = pPipeline->attachmentCount * sizeof(VkPipelineColorBlendAttachmentState); |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1477 | memcpy((void*)pPipeline->pAttachments, pCBCI->pAttachments, bufferSize); |
| 1478 | } |
Tony Barbour | e307f58 | 2015-07-10 15:29:03 -0600 | [diff] [blame] | 1479 | pPipeline->graphicsPipelineCI.pColorBlendState = &pPipeline->cbStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1480 | } |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1481 | if (pCreateInfo->pDynamicState != NULL) { |
| 1482 | memcpy((void*)&pPipeline->dynStateCI, pCreateInfo->pDynamicState, sizeof(VkPipelineDynamicStateCreateInfo)); |
| 1483 | if (pPipeline->dynStateCI.dynamicStateCount) { |
| 1484 | pPipeline->dynStateCI.pDynamicStates = new VkDynamicState[pPipeline->dynStateCI.dynamicStateCount]; |
| 1485 | bufferSize = pPipeline->dynStateCI.dynamicStateCount * sizeof(VkDynamicState); |
| 1486 | memcpy((void*)pPipeline->dynStateCI.pDynamicStates, pCreateInfo->pDynamicState->pDynamicStates, bufferSize); |
| 1487 | } |
| 1488 | pPipeline->graphicsPipelineCI.pDynamicState = &pPipeline->dynStateCI; |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1489 | } |
Tobin Ehlis | d17c28c | 2015-12-03 09:40:56 -0700 | [diff] [blame] | 1490 | pPipeline->active_sets.clear(); |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 1491 | return pPipeline; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1492 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1493 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1494 | // Free the Pipeline nodes |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1495 | static void deletePipelines(layer_data* my_data) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1496 | { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1497 | if (my_data->pipelineMap.size() <= 0) |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 1498 | return; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1499 | for (auto ii=my_data->pipelineMap.begin(); ii!=my_data->pipelineMap.end(); ++ii) { |
Mark Lobodzinski | 0e0fb5c | 2015-06-23 15:11:57 -0600 | [diff] [blame] | 1500 | if ((*ii).second->graphicsPipelineCI.stageCount != 0) { |
| 1501 | delete[] (*ii).second->graphicsPipelineCI.pStages; |
| 1502 | } |
Tobin Ehlis | cd3109e | 2015-04-01 11:59:08 -0600 | [diff] [blame] | 1503 | if ((*ii).second->pVertexBindingDescriptions) { |
| 1504 | delete[] (*ii).second->pVertexBindingDescriptions; |
| 1505 | } |
| 1506 | if ((*ii).second->pVertexAttributeDescriptions) { |
| 1507 | delete[] (*ii).second->pVertexAttributeDescriptions; |
| 1508 | } |
| 1509 | if ((*ii).second->pAttachments) { |
| 1510 | delete[] (*ii).second->pAttachments; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1511 | } |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 1512 | if ((*ii).second->dynStateCI.dynamicStateCount != 0) { |
| 1513 | delete[] (*ii).second->dynStateCI.pDynamicStates; |
| 1514 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1515 | delete (*ii).second; |
| 1516 | } |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1517 | my_data->pipelineMap.clear(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1518 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1519 | |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1520 | // For given pipeline, return number of MSAA samples, or one if MSAA disabled |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1521 | static VkSampleCountFlagBits getNumSamples(layer_data* my_data, const VkPipeline pipeline) |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1522 | { |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1523 | PIPELINE_NODE* pPipe = my_data->pipelineMap[pipeline]; |
Tobin Ehlis | b3a506f | 2015-07-13 14:51:15 -0600 | [diff] [blame] | 1524 | if (VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO == pPipe->msStateCI.sType) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1525 | return pPipe->msStateCI.rasterizationSamples; |
Tobin Ehlis | b3a506f | 2015-07-13 14:51:15 -0600 | [diff] [blame] | 1526 | } |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1527 | return VK_SAMPLE_COUNT_1_BIT; |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1528 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1529 | |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1530 | // Validate state related to the PSO |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1531 | static VkBool32 validatePipelineState(layer_data* my_data, const GLOBAL_CB_NODE* pCB, const VkPipelineBindPoint pipelineBindPoint, const VkPipeline pipeline) |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1532 | { |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 1533 | if (VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) { |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1534 | // Verify that any MSAA request in PSO matches sample# in bound FB |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1535 | VkSampleCountFlagBits psoNumSamples = getNumSamples(my_data, pipeline); |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1536 | if (pCB->activeRenderPass) { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1537 | const VkRenderPassCreateInfo* pRPCI = my_data->renderPassMap[pCB->activeRenderPass]->pCreateInfo; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1538 | const VkSubpassDescription* pSD = &pRPCI->pSubpasses[pCB->activeSubpass]; |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1539 | VkSampleCountFlagBits subpassNumSamples = (VkSampleCountFlagBits) 0; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1540 | uint32_t i; |
| 1541 | |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1542 | for (i = 0; i < pSD->colorAttachmentCount; i++) { |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1543 | VkSampleCountFlagBits samples; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1544 | |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 1545 | if (pSD->pColorAttachments[i].attachment == VK_ATTACHMENT_UNUSED) |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1546 | continue; |
| 1547 | |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 1548 | samples = pRPCI->pAttachments[pSD->pColorAttachments[i].attachment].samples; |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1549 | if (subpassNumSamples == (VkSampleCountFlagBits) 0) { |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1550 | subpassNumSamples = samples; |
| 1551 | } else if (subpassNumSamples != samples) { |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1552 | subpassNumSamples = (VkSampleCountFlagBits) -1; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1553 | break; |
| 1554 | } |
| 1555 | } |
Chia-I Wu | ce532f7 | 2015-10-26 17:32:47 +0800 | [diff] [blame] | 1556 | if (pSD->pDepthStencilAttachment && pSD->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1557 | const VkSampleCountFlagBits samples = pRPCI->pAttachments[pSD->pDepthStencilAttachment->attachment].samples; |
| 1558 | if (subpassNumSamples == (VkSampleCountFlagBits) 0) |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1559 | subpassNumSamples = samples; |
| 1560 | else if (subpassNumSamples != samples) |
Chia-I Wu | 3138d6a | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1561 | subpassNumSamples = (VkSampleCountFlagBits) -1; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 1562 | } |
| 1563 | |
| 1564 | if (psoNumSamples != subpassNumSamples) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1565 | return log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, (uint64_t) pipeline, 0, DRAWSTATE_NUM_SAMPLES_MISMATCH, "DS", |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 1566 | "Num samples mismatch! Binding PSO (%#" PRIxLEAST64 ") with %u samples while current RenderPass (%#" PRIxLEAST64 ") w/ %u samples!", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1567 | (uint64_t) pipeline, psoNumSamples, (uint64_t) pCB->activeRenderPass, subpassNumSamples); |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1568 | } |
| 1569 | } else { |
| 1570 | // TODO : I believe it's an error if we reach this point and don't have an activeRenderPass |
| 1571 | // Verify and flag error as appropriate |
| 1572 | } |
| 1573 | // TODO : Add more checks here |
| 1574 | } else { |
| 1575 | // TODO : Validate non-gfx pipeline updates |
| 1576 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1577 | return VK_FALSE; |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 1578 | } |
| 1579 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1580 | // Block of code at start here specifically for managing/tracking DSs |
| 1581 | |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1582 | // Return Pool node ptr for specified pool or else NULL |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 1583 | static DESCRIPTOR_POOL_NODE* getPoolNode(layer_data* my_data, const VkDescriptorPool pool) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1584 | { |
| 1585 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 1586 | if (my_data->descriptorPoolMap.find(pool) == my_data->descriptorPoolMap.end()) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1587 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1588 | return NULL; |
| 1589 | } |
| 1590 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 1591 | return my_data->descriptorPoolMap[pool]; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1592 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1593 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1594 | // Return Set node ptr for specified set or else NULL |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1595 | static SET_NODE* getSetNode(layer_data* my_data, const VkDescriptorSet set) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1596 | { |
| 1597 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1598 | if (my_data->setMap.find(set) == my_data->setMap.end()) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1599 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1600 | return NULL; |
| 1601 | } |
| 1602 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1603 | return my_data->setMap[set]; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1604 | } |
| 1605 | |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 1606 | static LAYOUT_NODE* getLayoutNode(layer_data* my_data, const VkDescriptorSetLayout layout) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1607 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1608 | if (my_data->descriptorSetLayoutMap.find(layout) == my_data->descriptorSetLayoutMap.end()) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1609 | loader_platform_thread_unlock_mutex(&globalLock); |
| 1610 | return NULL; |
| 1611 | } |
| 1612 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 1613 | return my_data->descriptorSetLayoutMap[layout]; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1614 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1615 | |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1616 | // Return VK_FALSE if update struct is of valid type, otherwise flag error and return code from callback |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1617 | static VkBool32 validUpdateStruct(layer_data* my_data, const VkDevice device, const GENERIC_HEADER* pUpdateStruct) |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 1618 | { |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 1619 | switch (pUpdateStruct->sType) |
| 1620 | { |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1621 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 1622 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1623 | return VK_FALSE; |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 1624 | default: |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1625 | return log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1626 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 1627 | } |
| 1628 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1629 | |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1630 | // Set count for given update struct in the last parameter |
| 1631 | // Return value of skipCall, which is only VK_TRUE is error occurs and callback signals execution to cease |
Tobin Ehlis | e66ec96 | 2015-10-27 12:54:50 -0600 | [diff] [blame] | 1632 | static uint32_t getUpdateCount(layer_data* my_data, const VkDevice device, const GENERIC_HEADER* pUpdateStruct) |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1633 | { |
| 1634 | switch (pUpdateStruct->sType) |
| 1635 | { |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1636 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1637 | return ((VkWriteDescriptorSet*)pUpdateStruct)->descriptorCount; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1638 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1639 | // TODO : Need to understand this case better and make sure code is correct |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1640 | return ((VkCopyDescriptorSet*)pUpdateStruct)->descriptorCount; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1641 | } |
| 1642 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1643 | |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1644 | // For given Layout Node and binding, return index where that binding begins |
| 1645 | static uint32_t getBindingStartIndex(const LAYOUT_NODE* pLayout, const uint32_t binding) |
| 1646 | { |
| 1647 | uint32_t offsetIndex = 0; |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1648 | for (uint32_t i = 0; i < pLayout->createInfo.bindingCount; i++) { |
| 1649 | if (pLayout->createInfo.pBinding[i].binding == binding) |
| 1650 | break; |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1651 | offsetIndex += pLayout->createInfo.pBinding[i].descriptorCount; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1652 | } |
| 1653 | return offsetIndex; |
| 1654 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1655 | |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1656 | // For given layout node and binding, return last index that is updated |
| 1657 | static uint32_t getBindingEndIndex(const LAYOUT_NODE* pLayout, const uint32_t binding) |
| 1658 | { |
| 1659 | uint32_t offsetIndex = 0; |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1660 | for (uint32_t i = 0; i < pLayout->createInfo.bindingCount; i++) { |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 1661 | offsetIndex += pLayout->createInfo.pBinding[i].descriptorCount; |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1662 | if (pLayout->createInfo.pBinding[i].binding == binding) |
| 1663 | break; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1664 | } |
| 1665 | return offsetIndex-1; |
| 1666 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1667 | |
Tobin Ehlis | e66ec96 | 2015-10-27 12:54:50 -0600 | [diff] [blame] | 1668 | // For given layout and update, return the first overall index of the layout that is updated |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 1669 | static uint32_t getUpdateStartIndex(layer_data* my_data, const VkDevice device, const LAYOUT_NODE* pLayout, const uint32_t binding, const uint32_t arrayIndex, const GENERIC_HEADER* pUpdateStruct) |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1670 | { |
Tobin Ehlis | e66ec96 | 2015-10-27 12:54:50 -0600 | [diff] [blame] | 1671 | return getBindingStartIndex(pLayout, binding)+arrayIndex; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1672 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1673 | |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 1674 | // For given layout and update, return the last overall index of the layout that is updated |
| 1675 | static uint32_t getUpdateEndIndex(layer_data* my_data, const VkDevice device, const LAYOUT_NODE* pLayout, const uint32_t binding, const uint32_t arrayIndex, const GENERIC_HEADER* pUpdateStruct) |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1676 | { |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 1677 | uint32_t count = getUpdateCount(my_data, device, pUpdateStruct); |
Tobin Ehlis | e66ec96 | 2015-10-27 12:54:50 -0600 | [diff] [blame] | 1678 | return getBindingStartIndex(pLayout, binding)+arrayIndex+count-1; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1679 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1680 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1681 | // Verify that the descriptor type in the update struct matches what's expected by the layout |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1682 | static VkBool32 validateUpdateConsistency(layer_data* my_data, const VkDevice device, const LAYOUT_NODE* pLayout, const GENERIC_HEADER* pUpdateStruct, uint32_t startIndex, uint32_t endIndex) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1683 | { |
| 1684 | // First get actual type of update |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1685 | VkBool32 skipCall = VK_FALSE; |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1686 | VkDescriptorType actualType; |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1687 | uint32_t i = 0; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1688 | switch (pUpdateStruct->sType) |
| 1689 | { |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1690 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 1691 | actualType = ((VkWriteDescriptorSet*)pUpdateStruct)->descriptorType; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1692 | break; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1693 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
| 1694 | /* no need to validate */ |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1695 | return VK_FALSE; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1696 | break; |
| 1697 | default: |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1698 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 1699 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdateStruct->sType), pUpdateStruct->sType); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1700 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1701 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1702 | // Set first stageFlags as reference and verify that all other updates match it |
| 1703 | VkShaderStageFlags refStageFlags = pLayout->stageFlags[startIndex]; |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1704 | for (i = startIndex; i <= endIndex; i++) { |
Tobin Ehlis | 91423d2 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 1705 | if (pLayout->descriptorTypes[i] != actualType) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1706 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH, "DS", |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1707 | "Write descriptor update has descriptor type %s that does not match overlapping binding descriptor type of %s!", |
| 1708 | string_VkDescriptorType(actualType), string_VkDescriptorType(pLayout->descriptorTypes[i])); |
| 1709 | } |
| 1710 | if (pLayout->stageFlags[i] != refStageFlags) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1711 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_DESCRIPTOR_STAGEFLAGS_MISMATCH, "DS", |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1712 | "Write descriptor update has stageFlags %x that do not match overlapping binding descriptor stageFlags of %x!", |
| 1713 | refStageFlags, pLayout->stageFlags[i]); |
Tobin Ehlis | 3b34109 | 2015-09-30 08:30:20 -0600 | [diff] [blame] | 1714 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1715 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1716 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1717 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1718 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1719 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1720 | // Determine the update type, allocate a new struct of that type, shadow the given pUpdate |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1721 | // struct into the pNewNode param. Return VK_TRUE if error condition encountered and callback signals early exit. |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1722 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1723 | static VkBool32 shadowUpdateNode(layer_data* my_data, const VkDevice device, GENERIC_HEADER* pUpdate, GENERIC_HEADER** pNewNode) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1724 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1725 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1726 | VkWriteDescriptorSet* pWDS = NULL; |
| 1727 | VkCopyDescriptorSet* pCDS = NULL; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1728 | size_t array_size = 0; |
| 1729 | size_t base_array_size = 0; |
| 1730 | size_t total_array_size = 0; |
| 1731 | size_t baseBuffAddr = 0; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1732 | switch (pUpdate->sType) |
| 1733 | { |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1734 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 1735 | pWDS = new VkWriteDescriptorSet; |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1736 | *pNewNode = (GENERIC_HEADER*)pWDS; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1737 | memcpy(pWDS, pUpdate, sizeof(VkWriteDescriptorSet)); |
Courtney Goeltzenleuchter | 34aa5c8 | 2015-10-23 13:38:14 -0600 | [diff] [blame] | 1738 | |
| 1739 | switch (pWDS->descriptorType) { |
| 1740 | case VK_DESCRIPTOR_TYPE_SAMPLER: |
| 1741 | case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: |
| 1742 | case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: |
| 1743 | case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: |
| 1744 | { |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1745 | VkDescriptorImageInfo *info = new VkDescriptorImageInfo[pWDS->descriptorCount]; |
| 1746 | memcpy(info, pWDS->pImageInfo, pWDS->descriptorCount * sizeof(VkDescriptorImageInfo)); |
Courtney Goeltzenleuchter | 34aa5c8 | 2015-10-23 13:38:14 -0600 | [diff] [blame] | 1747 | pWDS->pImageInfo = info; |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 1748 | } |
Courtney Goeltzenleuchter | 34aa5c8 | 2015-10-23 13:38:14 -0600 | [diff] [blame] | 1749 | break; |
| 1750 | case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: |
| 1751 | case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: |
| 1752 | { |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1753 | VkBufferView *info = new VkBufferView[pWDS->descriptorCount]; |
| 1754 | memcpy(info, pWDS->pTexelBufferView, pWDS->descriptorCount * sizeof(VkBufferView)); |
Courtney Goeltzenleuchter | 34aa5c8 | 2015-10-23 13:38:14 -0600 | [diff] [blame] | 1755 | pWDS->pTexelBufferView = info; |
| 1756 | } |
| 1757 | break; |
| 1758 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: |
| 1759 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: |
| 1760 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: |
| 1761 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: |
| 1762 | { |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1763 | VkDescriptorBufferInfo *info = new VkDescriptorBufferInfo[pWDS->descriptorCount]; |
| 1764 | memcpy(info, pWDS->pBufferInfo, pWDS->descriptorCount * sizeof(VkDescriptorBufferInfo)); |
Courtney Goeltzenleuchter | 34aa5c8 | 2015-10-23 13:38:14 -0600 | [diff] [blame] | 1765 | pWDS->pBufferInfo = info; |
| 1766 | } |
| 1767 | break; |
| 1768 | default: |
| 1769 | return VK_ERROR_VALIDATION_FAILED; |
| 1770 | break; |
| 1771 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1772 | break; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1773 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
| 1774 | pCDS = new VkCopyDescriptorSet; |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1775 | *pNewNode = (GENERIC_HEADER*)pCDS; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1776 | memcpy(pCDS, pUpdate, sizeof(VkCopyDescriptorSet)); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1777 | break; |
| 1778 | default: |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 1779 | if (log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_UPDATE_STRUCT, "DS", |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1780 | "Unexpected UPDATE struct of type %s (value %u) in vkUpdateDescriptors() struct tree", string_VkStructureType(pUpdate->sType), pUpdate->sType)) |
| 1781 | return VK_TRUE; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1782 | } |
| 1783 | // Make sure that pNext for the end of shadow copy is NULL |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1784 | (*pNewNode)->pNext = NULL; |
| 1785 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1786 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1787 | |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1788 | // Verify that given sampler is valid |
| 1789 | static VkBool32 validateSampler(const layer_data* my_data, const VkSampler* pSampler, const VkBool32 immutable) |
| 1790 | { |
| 1791 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1792 | auto sampIt = my_data->sampleMap.find(*pSampler); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1793 | if (sampIt == my_data->sampleMap.end()) { |
| 1794 | if (!immutable) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1795 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SAMPLER, (uint64_t) *pSampler, 0, DRAWSTATE_SAMPLER_DESCRIPTOR_ERROR, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1796 | "vkUpdateDescriptorSets: Attempt to update descriptor with invalid sampler %#" PRIxLEAST64, (uint64_t) *pSampler); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1797 | } else { // immutable |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1798 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SAMPLER, (uint64_t) *pSampler, 0, DRAWSTATE_SAMPLER_DESCRIPTOR_ERROR, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1799 | "vkUpdateDescriptorSets: Attempt to update descriptor whose binding has an invalid immutable sampler %#" PRIxLEAST64, (uint64_t) *pSampler); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1800 | } |
| 1801 | } else { |
| 1802 | // TODO : Any further checks we want to do on the sampler? |
| 1803 | } |
| 1804 | return skipCall; |
| 1805 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1806 | |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1807 | // Verify that given imageView is valid |
| 1808 | static VkBool32 validateImageView(const layer_data* my_data, const VkImageView* pImageView, const VkImageLayout imageLayout) |
| 1809 | { |
| 1810 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1811 | auto ivIt = my_data->imageViewMap.find(*pImageView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1812 | if (ivIt == my_data->imageViewMap.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1813 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t) *pImageView, 0, DRAWSTATE_IMAGEVIEW_DESCRIPTOR_ERROR, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1814 | "vkUpdateDescriptorSets: Attempt to update descriptor with invalid imageView %#" PRIxLEAST64, (uint64_t) *pImageView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1815 | } else { |
| 1816 | // Validate that imageLayout is compatible with aspectMask and image format |
| 1817 | VkImageAspectFlags aspectMask = ivIt->second->subresourceRange.aspectMask; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1818 | VkImage image = ivIt->second->image; |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 1819 | // TODO : Check here in case we have a bad image |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1820 | auto imgIt = my_data->imageMap.find(image); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1821 | if (imgIt == my_data->imageMap.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1822 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE, (uint64_t) image, 0, DRAWSTATE_IMAGEVIEW_DESCRIPTOR_ERROR, "DS", |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 1823 | "vkUpdateDescriptorSets: Attempt to update descriptor with invalid image %#" PRIxLEAST64 " in imageView %#" PRIxLEAST64, (uint64_t) image, (uint64_t) *pImageView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1824 | } else { |
| 1825 | VkFormat format = (*imgIt).second->format; |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 1826 | VkBool32 ds = vk_format_is_depth_or_stencil(format); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1827 | switch (imageLayout) { |
| 1828 | case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: |
| 1829 | // Only Color bit must be set |
| 1830 | if ((aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != VK_IMAGE_ASPECT_COLOR_BIT) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1831 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t) *pImageView, 0, |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1832 | DRAWSTATE_INVALID_IMAGE_ASPECT, "DS", "vkUpdateDescriptorSets: Updating descriptor with layout VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL and imageView %#" PRIxLEAST64 "" |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1833 | " that does not have VK_IMAGE_ASPECT_COLOR_BIT set.", (uint64_t) *pImageView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1834 | } |
| 1835 | // format must NOT be DS |
| 1836 | if (ds) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1837 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t) *pImageView, 0, |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1838 | DRAWSTATE_IMAGEVIEW_DESCRIPTOR_ERROR, "DS", "vkUpdateDescriptorSets: Updating descriptor with layout VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL and imageView %#" PRIxLEAST64 "" |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1839 | " but the image format is %s which is not a color format.", (uint64_t) *pImageView, string_VkFormat(format)); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1840 | } |
| 1841 | break; |
| 1842 | case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: |
| 1843 | case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL: |
| 1844 | // Depth or stencil bit must be set, but both must NOT be set |
| 1845 | if (aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) { |
| 1846 | if (aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) { |
| 1847 | // both must NOT be set |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1848 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t) *pImageView, 0, |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1849 | DRAWSTATE_INVALID_IMAGE_ASPECT, "DS", "vkUpdateDescriptorSets: Updating descriptor with imageView %#" PRIxLEAST64 "" |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1850 | " that has both STENCIL and DEPTH aspects set", (uint64_t) *pImageView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1851 | } |
| 1852 | } else if (!(aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT)) { |
| 1853 | // Neither were set |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1854 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t) *pImageView, 0, |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1855 | DRAWSTATE_INVALID_IMAGE_ASPECT, "DS", "vkUpdateDescriptorSets: Updating descriptor with layout %s and imageView %#" PRIxLEAST64 "" |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1856 | " that does not have STENCIL or DEPTH aspect set.", string_VkImageLayout(imageLayout), (uint64_t) *pImageView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1857 | } |
| 1858 | // format must be DS |
| 1859 | if (!ds) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1860 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_IMAGE_VIEW, (uint64_t) *pImageView, 0, |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1861 | DRAWSTATE_IMAGEVIEW_DESCRIPTOR_ERROR, "DS", "vkUpdateDescriptorSets: Updating descriptor with layout %s and imageView %#" PRIxLEAST64 "" |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1862 | " but the image format is %s which is not a depth/stencil format.", string_VkImageLayout(imageLayout), (uint64_t) *pImageView, string_VkFormat(format)); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1863 | } |
| 1864 | break; |
| 1865 | default: |
| 1866 | // anything to check for other layouts? |
| 1867 | break; |
| 1868 | } |
| 1869 | } |
| 1870 | } |
| 1871 | return skipCall; |
| 1872 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1873 | |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1874 | // Verify that given bufferView is valid |
| 1875 | static VkBool32 validateBufferView(const layer_data* my_data, const VkBufferView* pBufferView) |
| 1876 | { |
| 1877 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1878 | auto sampIt = my_data->bufferViewMap.find(*pBufferView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1879 | if (sampIt == my_data->bufferViewMap.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1880 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_BUFFER_VIEW, (uint64_t) *pBufferView, 0, DRAWSTATE_BUFFERVIEW_DESCRIPTOR_ERROR, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1881 | "vkUpdateDescriptorSets: Attempt to update descriptor with invalid bufferView %#" PRIxLEAST64, (uint64_t) *pBufferView); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1882 | } else { |
| 1883 | // TODO : Any further checks we want to do on the bufferView? |
| 1884 | } |
| 1885 | return skipCall; |
| 1886 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1887 | |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1888 | // Verify that given bufferInfo is valid |
| 1889 | static VkBool32 validateBufferInfo(const layer_data* my_data, const VkDescriptorBufferInfo* pBufferInfo) |
| 1890 | { |
| 1891 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1892 | auto sampIt = my_data->bufferMap.find(pBufferInfo->buffer); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1893 | if (sampIt == my_data->bufferMap.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1894 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_BUFFER, (uint64_t) pBufferInfo->buffer, 0, DRAWSTATE_BUFFERINFO_DESCRIPTOR_ERROR, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1895 | "vkUpdateDescriptorSets: Attempt to update descriptor where bufferInfo has invalid buffer %#" PRIxLEAST64, (uint64_t) pBufferInfo->buffer); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1896 | } else { |
| 1897 | // TODO : Any further checks we want to do on the bufferView? |
| 1898 | } |
| 1899 | return skipCall; |
| 1900 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1901 | |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1902 | static VkBool32 validateUpdateContents(const layer_data* my_data, const VkWriteDescriptorSet *pWDS, const VkDescriptorSetLayoutBinding* pLayoutBinding) |
| 1903 | { |
| 1904 | VkBool32 skipCall = VK_FALSE; |
| 1905 | // First verify that for the given Descriptor type, the correct DescriptorInfo data is supplied |
| 1906 | VkBufferView* pBufferView = NULL; |
| 1907 | const VkSampler* pSampler = NULL; |
| 1908 | VkImageView* pImageView = NULL; |
| 1909 | VkImageLayout* pImageLayout = NULL; |
| 1910 | VkDescriptorBufferInfo* pBufferInfo = NULL; |
| 1911 | VkBool32 immutable = VK_FALSE; |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1912 | uint32_t i = 0; |
| 1913 | // For given update type, verify that update contents are correct |
| 1914 | switch (pWDS->descriptorType) { |
| 1915 | case VK_DESCRIPTOR_TYPE_SAMPLER: |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1916 | for (i=0; i<pWDS->descriptorCount; ++i) { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1917 | skipCall |= validateSampler(my_data, &(pWDS->pImageInfo[i].sampler), immutable); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1918 | } |
| 1919 | break; |
| 1920 | case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1921 | for (i=0; i<pWDS->descriptorCount; ++i) { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1922 | if (NULL == pLayoutBinding->pImmutableSamplers) { |
| 1923 | pSampler = &(pWDS->pImageInfo[i].sampler); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1924 | if (immutable) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1925 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SAMPLER, (uint64_t) *pSampler, 0, DRAWSTATE_INCONSISTENT_IMMUTABLE_SAMPLER_UPDATE, "DS", |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1926 | "vkUpdateDescriptorSets: Update #%u is not an immutable sampler %#" PRIxLEAST64 ", but previous update(s) from this " |
| 1927 | "VkWriteDescriptorSet struct used an immutable sampler. All updates from a single struct must either " |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1928 | "use immutable or non-immutable samplers.", i, (uint64_t) *pSampler); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1929 | } |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1930 | } else { |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1931 | if (i>0 && !immutable) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1932 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_SAMPLER, (uint64_t) *pSampler, 0, DRAWSTATE_INCONSISTENT_IMMUTABLE_SAMPLER_UPDATE, "DS", |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1933 | "vkUpdateDescriptorSets: Update #%u is an immutable sampler, but previous update(s) from this " |
| 1934 | "VkWriteDescriptorSet struct used a non-immutable sampler. All updates from a single struct must either " |
| 1935 | "use immutable or non-immutable samplers.", i); |
| 1936 | } |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1937 | immutable = VK_TRUE; |
| 1938 | pSampler = &(pLayoutBinding->pImmutableSamplers[i]); |
| 1939 | } |
| 1940 | skipCall |= validateSampler(my_data, pSampler, immutable); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1941 | } |
| 1942 | // Intentionally fall through here to also validate image stuff |
| 1943 | case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: |
| 1944 | case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: |
| 1945 | case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1946 | for (i=0; i<pWDS->descriptorCount; ++i) { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1947 | skipCall |= validateImageView(my_data, &(pWDS->pImageInfo[i].imageView), pWDS->pImageInfo[i].imageLayout); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1948 | } |
| 1949 | break; |
| 1950 | case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: |
| 1951 | case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1952 | for (i=0; i<pWDS->descriptorCount; ++i) { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1953 | skipCall |= validateBufferView(my_data, &(pWDS->pTexelBufferView[i])); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1954 | } |
| 1955 | break; |
| 1956 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: |
| 1957 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: |
| 1958 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: |
| 1959 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 1960 | for (i=0; i<pWDS->descriptorCount; ++i) { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1961 | skipCall |= validateBufferInfo(my_data, &(pWDS->pBufferInfo[i])); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1962 | } |
| 1963 | break; |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1964 | } |
| 1965 | return skipCall; |
| 1966 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 1967 | |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1968 | // update DS mappings based on write and copy update arrays |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 1969 | static VkBool32 dsUpdate(layer_data* my_data, VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pWDS, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pCDS) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1970 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1971 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 1972 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1973 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 1974 | LAYOUT_NODE* pLayout = NULL; |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1975 | VkDescriptorSetLayoutCreateInfo* pLayoutCI = NULL; |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1976 | // Validate Write updates |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 1977 | uint32_t i = 0; |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 1978 | for (i=0; i < descriptorWriteCount; i++) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1979 | VkDescriptorSet ds = pWDS[i].dstSet; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 1980 | SET_NODE* pSet = my_data->setMap[ds]; |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 1981 | GENERIC_HEADER* pUpdate = (GENERIC_HEADER*) &pWDS[i]; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1982 | pLayout = pSet->pLayout; |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 1983 | // First verify valid update struct |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 1984 | if ((skipCall = validUpdateStruct(my_data, device, pUpdate)) == VK_TRUE) { |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 1985 | break; |
| 1986 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1987 | uint32_t binding = 0, endIndex = 0; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1988 | binding = pWDS[i].dstBinding; |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 1989 | // Make sure that layout being updated has the binding being updated |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 1990 | if (pLayout->bindings.find(binding) == pLayout->bindings.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1991 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) ds, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 1992 | "Descriptor Set %" PRIu64 " does not have binding to match update binding %u for update type %s!", reinterpret_cast<uint64_t>(ds), binding, string_VkStructureType(pUpdate->sType)); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 1993 | } else { |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1994 | // Next verify that update falls within size of given binding |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 1995 | endIndex = getUpdateEndIndex(my_data, device, pLayout, binding, pWDS[i].dstArrayElement, pUpdate); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 1996 | if (getBindingEndIndex(pLayout, binding) < endIndex) { |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 1997 | pLayoutCI = &pLayout->createInfo; |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 1998 | string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 1999 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) ds, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2000 | "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 | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2001 | } else { // TODO : should we skip update on a type mismatch or force it? |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 2002 | uint32_t startIndex; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2003 | startIndex = getUpdateStartIndex(my_data, device, pLayout, binding, pWDS[i].dstArrayElement, pUpdate); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 2004 | // Layout bindings match w/ update, now verify that update type & stageFlags are the same for entire update |
| 2005 | if ((skipCall = validateUpdateConsistency(my_data, device, pLayout, pUpdate, startIndex, endIndex)) == VK_FALSE) { |
| 2006 | // The update is within bounds and consistent, but need to make sure contents make sense as well |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2007 | if ((skipCall = validateUpdateContents(my_data, &pWDS[i], &pLayout->createInfo.pBinding[binding])) == VK_FALSE) { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2008 | // Update is good. Save the update info |
| 2009 | // Create new update struct for this set's shadow copy |
| 2010 | GENERIC_HEADER* pNewNode = NULL; |
| 2011 | skipCall |= shadowUpdateNode(my_data, device, pUpdate, &pNewNode); |
| 2012 | if (NULL == pNewNode) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2013 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) ds, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2014 | "Out of memory while attempting to allocate UPDATE struct in vkUpdateDescriptors()"); |
| 2015 | } else { |
| 2016 | // Insert shadow node into LL of updates for this set |
| 2017 | pNewNode->pNext = pSet->pUpdateStructs; |
| 2018 | pSet->pUpdateStructs = pNewNode; |
| 2019 | // Now update appropriate descriptor(s) to point to new Update node |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2020 | for (uint32_t j = startIndex; j <= endIndex; j++) { |
| 2021 | assert(j<pSet->descriptorCount); |
| 2022 | pSet->ppDescriptors[j] = pNewNode; |
| 2023 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2024 | } |
| 2025 | } |
| 2026 | } |
| 2027 | } |
| 2028 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2029 | } |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2030 | // Now validate copy updates |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 2031 | for (i=0; i < descriptorCopyCount; ++i) { |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2032 | SET_NODE *pSrcSet = NULL, *pDstSet = NULL; |
| 2033 | LAYOUT_NODE *pSrcLayout = NULL, *pDstLayout = NULL; |
| 2034 | uint32_t srcStartIndex = 0, srcEndIndex = 0, dstStartIndex = 0, dstEndIndex = 0; |
| 2035 | // For each copy make sure that update falls within given layout and that types match |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2036 | pSrcSet = my_data->setMap[pCDS[i].srcSet]; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2037 | pDstSet = my_data->setMap[pCDS[i].dstSet]; |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2038 | pSrcLayout = pSrcSet->pLayout; |
| 2039 | pDstLayout = pDstSet->pLayout; |
| 2040 | // Validate that src binding is valid for src set layout |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2041 | if (pSrcLayout->bindings.find(pCDS[i].srcBinding) == pSrcLayout->bindings.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2042 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pSrcSet->set, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2043 | "Copy descriptor update %u has srcBinding %u which is out of bounds for underlying SetLayout %#" PRIxLEAST64 " which only has bindings 0-%u.", |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2044 | i, pCDS[i].srcBinding, (uint64_t) pSrcLayout->layout, pSrcLayout->createInfo.bindingCount-1); |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2045 | } else if (pDstLayout->bindings.find(pCDS[i].dstBinding) == pDstLayout->bindings.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2046 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDstSet->set, 0, DRAWSTATE_INVALID_UPDATE_INDEX, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2047 | "Copy descriptor update %u has dstBinding %u which is out of bounds for underlying SetLayout %#" PRIxLEAST64 " which only has bindings 0-%u.", |
| 2048 | i, pCDS[i].dstBinding, (uint64_t) pDstLayout->layout, pDstLayout->createInfo.bindingCount-1); |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2049 | } else { |
| 2050 | // Proceed with validation. Bindings are ok, but make sure update is within bounds of given layout |
| 2051 | srcEndIndex = getUpdateEndIndex(my_data, device, pSrcLayout, pCDS[i].srcBinding, pCDS[i].srcArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2052 | dstEndIndex = getUpdateEndIndex(my_data, device, pDstLayout, pCDS[i].dstBinding, pCDS[i].dstArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2053 | if (getBindingEndIndex(pSrcLayout, pCDS[i].srcBinding) < srcEndIndex) { |
| 2054 | pLayoutCI = &pSrcLayout->createInfo; |
| 2055 | string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2056 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pSrcSet->set, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2057 | "Copy descriptor src update is out of bounds for matching binding %u in Layout w/ CI:\n%s!", pCDS[i].srcBinding, DSstr.c_str()); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2058 | } else if (getBindingEndIndex(pDstLayout, pCDS[i].dstBinding) < dstEndIndex) { |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2059 | pLayoutCI = &pDstLayout->createInfo; |
| 2060 | string DSstr = vk_print_vkdescriptorsetlayoutcreateinfo(pLayoutCI, "{DS} "); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2061 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDstSet->set, 0, DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2062 | "Copy descriptor dest update is out of bounds for matching binding %u in Layout w/ CI:\n%s!", pCDS[i].dstBinding, DSstr.c_str()); |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2063 | } else { |
| 2064 | srcStartIndex = getUpdateStartIndex(my_data, device, pSrcLayout, pCDS[i].srcBinding, pCDS[i].srcArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2065 | dstStartIndex = getUpdateStartIndex(my_data, device, pDstLayout, pCDS[i].dstBinding, pCDS[i].dstArrayElement, (const GENERIC_HEADER*)&(pCDS[i])); |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2066 | for (uint32_t j=0; j<pCDS[i].descriptorCount; ++j) { |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2067 | // For copy just make sure that the types match and then perform the update |
| 2068 | if (pSrcLayout->descriptorTypes[srcStartIndex+j] != pDstLayout->descriptorTypes[dstStartIndex+j]) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2069 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH, "DS", |
Tobin Ehlis | d2e246e | 2015-10-27 15:43:38 -0600 | [diff] [blame] | 2070 | "Copy descriptor update index %u, update count #%u, has src update descriptor type %s that does not match overlapping dest descriptor type of %s!", |
| 2071 | i, j+1, string_VkDescriptorType(pSrcLayout->descriptorTypes[srcStartIndex+j]), string_VkDescriptorType(pDstLayout->descriptorTypes[dstStartIndex+j])); |
| 2072 | } else { |
| 2073 | // point dst descriptor at corresponding src descriptor |
| 2074 | pDstSet->ppDescriptors[j+dstStartIndex] = pSrcSet->ppDescriptors[j+srcStartIndex]; |
| 2075 | } |
| 2076 | } |
| 2077 | } |
| 2078 | } |
| 2079 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2080 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2081 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2082 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2083 | |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2084 | // Verify that given pool has descriptors that are being requested for allocation |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2085 | static VkBool32 validate_descriptor_availability_in_pool(layer_data* dev_data, DESCRIPTOR_POOL_NODE* pPoolNode, uint32_t count, const VkDescriptorSetLayout* pSetLayouts) |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2086 | { |
| 2087 | VkBool32 skipCall = VK_FALSE; |
| 2088 | uint32_t i = 0, j = 0; |
| 2089 | for (i=0; i<count; ++i) { |
| 2090 | LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pSetLayouts[i]); |
| 2091 | if (NULL == pLayout) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2092 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2093 | "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pSetLayouts[i]); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2094 | } else { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2095 | uint32_t typeIndex = 0, poolSizeCount = 0; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2096 | for (j=0; j<pLayout->createInfo.bindingCount; ++j) { |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2097 | typeIndex = static_cast<uint32_t>(pLayout->createInfo.pBinding[j].descriptorType); |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2098 | poolSizeCount = pLayout->createInfo.pBinding[j].descriptorCount; |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2099 | if (poolSizeCount > pPoolNode->availableDescriptorTypeCount[typeIndex]) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2100 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pLayout->layout, 0, DRAWSTATE_DESCRIPTOR_POOL_EMPTY, "DS", |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2101 | "Unable to allocate %u descriptors of type %s from pool %#" PRIxLEAST64 ". This pool only has %u descriptors of this type remaining.", |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2102 | poolSizeCount, string_VkDescriptorType(pLayout->createInfo.pBinding[j].descriptorType), (uint64_t) pPoolNode->pool, pPoolNode->availableDescriptorTypeCount[typeIndex]); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2103 | } else { // Decrement available descriptors of this type |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2104 | pPoolNode->availableDescriptorTypeCount[typeIndex] -= poolSizeCount; |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2105 | } |
| 2106 | } |
| 2107 | } |
| 2108 | } |
| 2109 | return skipCall; |
| 2110 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2111 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2112 | // Free the shadowed update node for this Set |
| 2113 | // NOTE : Calls to this function should be wrapped in mutex |
| 2114 | static void freeShadowUpdateTree(SET_NODE* pSet) |
| 2115 | { |
| 2116 | GENERIC_HEADER* pShadowUpdate = pSet->pUpdateStructs; |
| 2117 | pSet->pUpdateStructs = NULL; |
| 2118 | GENERIC_HEADER* pFreeUpdate = pShadowUpdate; |
| 2119 | // Clear the descriptor mappings as they will now be invalid |
| 2120 | memset(pSet->ppDescriptors, 0, pSet->descriptorCount*sizeof(GENERIC_HEADER*)); |
| 2121 | while(pShadowUpdate) { |
| 2122 | pFreeUpdate = pShadowUpdate; |
| 2123 | pShadowUpdate = (GENERIC_HEADER*)pShadowUpdate->pNext; |
| 2124 | uint32_t index = 0; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 2125 | VkWriteDescriptorSet * pWDS = NULL; |
| 2126 | VkCopyDescriptorSet * pCDS = NULL; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2127 | void** ppToFree = NULL; |
| 2128 | switch (pFreeUpdate->sType) |
| 2129 | { |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 2130 | case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET: |
| 2131 | pWDS = (VkWriteDescriptorSet*)pFreeUpdate; |
Tony Barbour | f740f90 | 2015-11-02 11:46:29 -0700 | [diff] [blame] | 2132 | switch (pWDS->descriptorType) { |
| 2133 | case VK_DESCRIPTOR_TYPE_SAMPLER: |
| 2134 | case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: |
| 2135 | case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: |
| 2136 | case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: |
| 2137 | { |
| 2138 | delete[] pWDS->pImageInfo; |
| 2139 | } |
| 2140 | break; |
| 2141 | case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: |
| 2142 | case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: |
| 2143 | { |
| 2144 | delete[] pWDS->pTexelBufferView; |
| 2145 | } |
| 2146 | break; |
| 2147 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: |
| 2148 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: |
| 2149 | case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: |
| 2150 | case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: |
| 2151 | { |
| 2152 | delete[] pWDS->pBufferInfo; |
| 2153 | } |
| 2154 | break; |
| 2155 | default: |
| 2156 | break; |
Courtney Goeltzenleuchter | e409974 | 2015-10-22 15:31:56 -0600 | [diff] [blame] | 2157 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2158 | break; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 2159 | case VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET: |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2160 | break; |
| 2161 | default: |
| 2162 | assert(0); |
| 2163 | break; |
| 2164 | } |
Tobin Ehlis | eaf2866 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 2165 | delete pFreeUpdate; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2166 | } |
| 2167 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2168 | |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2169 | // Free all DS Pools including their Sets & related sub-structs |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2170 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2171 | static void deletePools(layer_data* my_data) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2172 | { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2173 | if (my_data->descriptorPoolMap.size() <= 0) |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2174 | return; |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2175 | for (auto ii=my_data->descriptorPoolMap.begin(); ii!=my_data->descriptorPoolMap.end(); ++ii) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2176 | SET_NODE* pSet = (*ii).second->pSets; |
| 2177 | SET_NODE* pFreeSet = pSet; |
| 2178 | while (pSet) { |
| 2179 | pFreeSet = pSet; |
| 2180 | pSet = pSet->pNext; |
Tobin Ehlis | eaf2866 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 2181 | // Freeing layouts handled in deleteLayouts() function |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2182 | // Free Update shadow struct tree |
| 2183 | freeShadowUpdateTree(pFreeSet); |
| 2184 | if (pFreeSet->ppDescriptors) { |
Chris Forbes | 4506d3f | 2015-06-04 10:49:27 +1200 | [diff] [blame] | 2185 | delete[] pFreeSet->ppDescriptors; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2186 | } |
| 2187 | delete pFreeSet; |
| 2188 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2189 | delete (*ii).second; |
| 2190 | } |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2191 | my_data->descriptorPoolMap.clear(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2192 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2193 | |
Tobin Ehlis | eaf2866 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 2194 | // WARN : Once deleteLayouts() called, any layout ptrs in Pool/Set data structure will be invalid |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2195 | // NOTE : Calls to this function should be wrapped in mutex |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2196 | static void deleteLayouts(layer_data* my_data) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2197 | { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 2198 | if (my_data->descriptorSetLayoutMap.size() <= 0) |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2199 | return; |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 2200 | for (auto ii=my_data->descriptorSetLayoutMap.begin(); ii!=my_data->descriptorSetLayoutMap.end(); ++ii) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2201 | LAYOUT_NODE* pLayout = (*ii).second; |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2202 | if (pLayout->createInfo.pBinding) { |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2203 | for (uint32_t i=0; i<pLayout->createInfo.bindingCount; i++) { |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2204 | if (pLayout->createInfo.pBinding[i].pImmutableSamplers) |
| 2205 | delete[] pLayout->createInfo.pBinding[i].pImmutableSamplers; |
Tobin Ehlis | eaf2866 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 2206 | } |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 2207 | delete[] pLayout->createInfo.pBinding; |
Tobin Ehlis | eaf2866 | 2015-04-08 10:58:37 -0600 | [diff] [blame] | 2208 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2209 | delete pLayout; |
| 2210 | } |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 2211 | my_data->descriptorSetLayoutMap.clear(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2212 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2213 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2214 | // Currently clearing a set is removing all previous updates to that set |
| 2215 | // TODO : Validate if this is correct clearing behavior |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2216 | static void clearDescriptorSet(layer_data* my_data, VkDescriptorSet set) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2217 | { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2218 | SET_NODE* pSet = getSetNode(my_data, set); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2219 | if (!pSet) { |
| 2220 | // TODO : Return error |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2221 | } else { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2222 | loader_platform_thread_lock_mutex(&globalLock); |
| 2223 | freeShadowUpdateTree(pSet); |
| 2224 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2225 | } |
| 2226 | } |
| 2227 | |
Courtney Goeltzenleuchter | 831c183 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2228 | static void clearDescriptorPool(layer_data* my_data, const VkDevice device, const VkDescriptorPool pool, VkDescriptorPoolResetFlags flags) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2229 | { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2230 | DESCRIPTOR_POOL_NODE* pPool = getPoolNode(my_data, pool); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2231 | if (!pPool) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2232 | log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (uint64_t) pool, 0, DRAWSTATE_INVALID_POOL, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2233 | "Unable to find pool node for pool %#" PRIxLEAST64 " specified in vkResetDescriptorPool() call", (uint64_t) pool); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2234 | } else { |
Courtney Goeltzenleuchter | 831c183 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 2235 | // TODO: validate flags |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2236 | // For every set off of this pool, clear it |
| 2237 | SET_NODE* pSet = pPool->pSets; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2238 | while (pSet) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2239 | clearDescriptorSet(my_data, pSet->set); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2240 | } |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 2241 | // Reset available count to max count for this pool |
| 2242 | for (uint32_t i=0; i<pPool->availableDescriptorTypeCount.size(); ++i) { |
| 2243 | pPool->availableDescriptorTypeCount[i] = pPool->maxDescriptorTypeCount[i]; |
| 2244 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2245 | } |
| 2246 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2247 | |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2248 | // For given CB object, fetch associated CB Node from map |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2249 | static GLOBAL_CB_NODE* getCBNode(layer_data* my_data, const VkCommandBuffer cb) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2250 | { |
| 2251 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2252 | if (my_data->commandBufferMap.count(cb) == 0) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2253 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2254 | // TODO : How to pass cb as srcObj here? |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2255 | log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2256 | "Attempt to use CommandBuffer %#" PRIxLEAST64 " that doesn't exist!", reinterpret_cast<uint64_t>(cb)); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2257 | return NULL; |
| 2258 | } |
| 2259 | loader_platform_thread_unlock_mutex(&globalLock); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2260 | return my_data->commandBufferMap[cb]; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2261 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2262 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2263 | // Free all CB Nodes |
| 2264 | // NOTE : Calls to this function should be wrapped in mutex |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2265 | static void deleteCommandBuffers(layer_data* my_data) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2266 | { |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2267 | if (my_data->commandBufferMap.size() <= 0) { |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2268 | return; |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2269 | } |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2270 | for (auto ii=my_data->commandBufferMap.begin(); ii!=my_data->commandBufferMap.end(); ++ii) { |
Courtney Goeltzenleuchter | 09098a7 | 2015-04-27 15:04:43 -0600 | [diff] [blame] | 2271 | vector<CMD_NODE*> cmd_node_list = (*ii).second->pCmds; |
| 2272 | while (!cmd_node_list.empty()) { |
| 2273 | CMD_NODE* cmd_node = cmd_node_list.back(); |
| 2274 | delete cmd_node; |
| 2275 | cmd_node_list.pop_back(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2276 | } |
| 2277 | delete (*ii).second; |
| 2278 | } |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2279 | my_data->commandBufferMap.clear(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2280 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2281 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2282 | static VkBool32 report_error_no_cb_begin(const layer_data* dev_data, const VkCommandBuffer cb, const char* caller_name) |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2283 | { |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2284 | // TODO : How to pass cb as srcObj here? |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2285 | return log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_BEGIN_COMMAND_BUFFER, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2286 | "You must call vkBeginCommandBuffer() before this call to %s", caller_name); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 2287 | } |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 2288 | |
| 2289 | bool validateCmdsInCmdBuffer(const layer_data* dev_data, const GLOBAL_CB_NODE* pCB, const CMD_TYPE cmd_type) { |
| 2290 | bool skip_call = false; |
| 2291 | for (auto cmd : pCB->pCmds) { |
| 2292 | if (cmd_type == CMD_EXECUTECOMMANDS && cmd->type != CMD_EXECUTECOMMANDS) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2293 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 2294 | "vkCmdExecuteCommands() cannot be called on a cmd buffer with exsiting commands."); |
| 2295 | } |
| 2296 | if (cmd_type != CMD_EXECUTECOMMANDS && cmd->type == CMD_EXECUTECOMMANDS) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2297 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 2298 | "Commands cannot be added to a cmd buffer with exsiting secondary commands."); |
| 2299 | } |
| 2300 | } |
| 2301 | return skip_call; |
| 2302 | } |
| 2303 | |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2304 | static VkBool32 addCmd(const layer_data* my_data, GLOBAL_CB_NODE* pCB, const CMD_TYPE cmd) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2305 | { |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 2306 | VkBool32 skipCall = validateCmdsInCmdBuffer(my_data, pCB, cmd); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2307 | CMD_NODE* pCmd = new CMD_NODE; |
| 2308 | if (pCmd) { |
| 2309 | // init cmd node and append to end of cmd LL |
| 2310 | memset(pCmd, 0, sizeof(CMD_NODE)); |
| 2311 | pCmd->cmdNumber = ++pCB->numCmds; |
| 2312 | pCmd->type = cmd; |
| 2313 | pCB->pCmds.push_back(pCmd); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2314 | } else { |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2315 | // TODO : How to pass cb as srcObj here? |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2316 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2317 | "Out of memory while attempting to allocate new CMD_NODE for commandBuffer %#" PRIxLEAST64, reinterpret_cast<uint64_t>(pCB->commandBuffer)); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2318 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2319 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2320 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2321 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2322 | static void resetCB(layer_data* my_data, const VkCommandBuffer cb) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2323 | { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2324 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2325 | if (pCB) { |
Courtney Goeltzenleuchter | f03711e | 2015-04-27 17:16:56 -0600 | [diff] [blame] | 2326 | vector<CMD_NODE*> cmd_list = pCB->pCmds; |
| 2327 | while (!cmd_list.empty()) { |
| 2328 | delete cmd_list.back(); |
| 2329 | cmd_list.pop_back(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2330 | } |
Courtney Goeltzenleuchter | f03711e | 2015-04-27 17:16:56 -0600 | [diff] [blame] | 2331 | pCB->pCmds.clear(); |
Tobin Ehlis | 0cea408 | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2332 | // Reset CB state (need to save createInfo) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2333 | VkCommandBufferAllocateInfo saveCBCI = pCB->createInfo; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2334 | pCB->commandBuffer = cb; |
Tobin Ehlis | 0cea408 | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 2335 | pCB->createInfo = saveCBCI; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2336 | memset(&pCB->beginInfo, 0, sizeof(VkCommandBufferBeginInfo)); |
| 2337 | pCB->fence = 0; |
| 2338 | pCB->numCmds = 0; |
| 2339 | memset(pCB->drawCount, 0, NUM_DRAW_TYPES * sizeof(uint64_t)); |
| 2340 | pCB->state = CB_NEW; |
| 2341 | pCB->submitCount = 0; |
| 2342 | pCB->status = 0; |
| 2343 | pCB->pCmds.clear(); |
| 2344 | pCB->lastBoundPipeline = 0; |
| 2345 | pCB->viewports.clear(); |
| 2346 | pCB->scissors.clear(); |
| 2347 | pCB->lineWidth = 0; |
| 2348 | pCB->depthBiasConstantFactor = 0; |
| 2349 | pCB->depthBiasClamp = 0; |
| 2350 | pCB->depthBiasSlopeFactor = 0; |
| 2351 | memset(pCB->blendConstants, 0, 4 * sizeof(float)); |
| 2352 | pCB->minDepthBounds = 0; |
| 2353 | pCB->maxDepthBounds = 0; |
| 2354 | memset(&pCB->front, 0, sizeof(stencil_data)); |
| 2355 | memset(&pCB->back, 0, sizeof(stencil_data)); |
| 2356 | pCB->lastBoundDescriptorSet = 0; |
| 2357 | pCB->lastBoundPipelineLayout = 0; |
| 2358 | pCB->activeRenderPass = 0; |
| 2359 | pCB->activeSubpass = 0; |
| 2360 | pCB->framebuffer = 0; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2361 | pCB->boundDescriptorSets.clear(); |
| 2362 | pCB->imageLayoutMap.clear(); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2363 | pCB->lastVtxBinding = MAX_BINDING; |
| 2364 | } |
| 2365 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2366 | |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2367 | // Set PSO-related status bits for CB, including dynamic state set via PSO |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 2368 | static void set_cb_pso_status(GLOBAL_CB_NODE* pCB, const PIPELINE_NODE* pPipe) |
| 2369 | { |
| 2370 | for (uint32_t i = 0; i < pPipe->cbStateCI.attachmentCount; i++) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 2371 | if (0 != pPipe->pAttachments[i].colorWriteMask) { |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 2372 | pCB->status |= CBSTATUS_COLOR_BLEND_WRITE_ENABLE; |
| 2373 | } |
| 2374 | } |
| 2375 | if (pPipe->dsStateCI.depthWriteEnable) { |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2376 | pCB->status |= CBSTATUS_DEPTH_WRITE_ENABLE; |
| 2377 | } |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 2378 | if (pPipe->dsStateCI.stencilTestEnable) { |
| 2379 | pCB->status |= CBSTATUS_STENCIL_TEST_ENABLE; |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 2380 | } |
Tobin Ehlis | a88e2f5 | 2015-10-02 11:00:56 -0600 | [diff] [blame] | 2381 | // Account for any dynamic state not set via this PSO |
| 2382 | if (!pPipe->dynStateCI.dynamicStateCount) { // All state is static |
| 2383 | pCB->status = CBSTATUS_ALL; |
| 2384 | } else { |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2385 | // First consider all state on |
| 2386 | // Then unset any state that's noted as dynamic in PSO |
| 2387 | // Finally OR that into CB statemask |
| 2388 | CBStatusFlags psoDynStateMask = CBSTATUS_ALL; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2389 | for (uint32_t i=0; i < pPipe->dynStateCI.dynamicStateCount; i++) { |
| 2390 | switch (pPipe->dynStateCI.pDynamicStates[i]) { |
| 2391 | case VK_DYNAMIC_STATE_VIEWPORT: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2392 | psoDynStateMask &= ~CBSTATUS_VIEWPORT_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2393 | break; |
| 2394 | case VK_DYNAMIC_STATE_SCISSOR: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2395 | psoDynStateMask &= ~CBSTATUS_SCISSOR_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2396 | break; |
| 2397 | case VK_DYNAMIC_STATE_LINE_WIDTH: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2398 | psoDynStateMask &= ~CBSTATUS_LINE_WIDTH_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2399 | break; |
| 2400 | case VK_DYNAMIC_STATE_DEPTH_BIAS: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2401 | psoDynStateMask &= ~CBSTATUS_DEPTH_BIAS_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2402 | break; |
| 2403 | case VK_DYNAMIC_STATE_BLEND_CONSTANTS: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2404 | psoDynStateMask &= ~CBSTATUS_BLEND_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2405 | break; |
| 2406 | case VK_DYNAMIC_STATE_DEPTH_BOUNDS: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2407 | psoDynStateMask &= ~CBSTATUS_DEPTH_BOUNDS_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2408 | break; |
| 2409 | case VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2410 | psoDynStateMask &= ~CBSTATUS_STENCIL_READ_MASK_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2411 | break; |
| 2412 | case VK_DYNAMIC_STATE_STENCIL_WRITE_MASK: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2413 | psoDynStateMask &= ~CBSTATUS_STENCIL_WRITE_MASK_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2414 | break; |
| 2415 | case VK_DYNAMIC_STATE_STENCIL_REFERENCE: |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2416 | psoDynStateMask &= ~CBSTATUS_STENCIL_REFERENCE_SET; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2417 | break; |
| 2418 | default: |
| 2419 | // TODO : Flag error here |
| 2420 | break; |
| 2421 | } |
| 2422 | } |
Tobin Ehlis | 3dec46c | 2015-10-01 09:24:40 -0600 | [diff] [blame] | 2423 | pCB->status |= psoDynStateMask; |
Tobin Ehlis | f6cb467 | 2015-09-29 08:18:34 -0600 | [diff] [blame] | 2424 | } |
Tobin Ehlis | 9786620 | 2015-06-10 12:57:07 -0600 | [diff] [blame] | 2425 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2426 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2427 | // Print the last bound Gfx Pipeline |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2428 | static VkBool32 printPipeline(layer_data* my_data, const VkCommandBuffer cb) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2429 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2430 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2431 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2432 | if (pCB) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2433 | PIPELINE_NODE *pPipeTrav = getPipeline(my_data, pCB->lastBoundPipeline); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2434 | if (!pPipeTrav) { |
| 2435 | // nothing to print |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2436 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2437 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2438 | "%s", vk_print_vkgraphicspipelinecreateinfo(&pPipeTrav->graphicsPipelineCI, "{DS}").c_str()); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2439 | } |
| 2440 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2441 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2442 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2443 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2444 | // Print details of DS config to stdout |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2445 | static VkBool32 printDSConfig(layer_data* my_data, const VkCommandBuffer cb) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2446 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2447 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2448 | 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 | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2449 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
Tobin Ehlis | 7297f19 | 2015-06-09 08:39:32 -0600 | [diff] [blame] | 2450 | if (pCB && pCB->lastBoundDescriptorSet) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2451 | SET_NODE* pSet = getSetNode(my_data, pCB->lastBoundDescriptorSet); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2452 | DESCRIPTOR_POOL_NODE* pPool = getPoolNode(my_data, pSet->pool); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2453 | // Print out pool details |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2454 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2455 | "Details for pool %#" PRIxLEAST64 ".", (uint64_t) pPool->pool); |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2456 | string poolStr = vk_print_vkdescriptorpoolcreateinfo(&pPool->createInfo, " "); |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2457 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2458 | "%s", poolStr.c_str()); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2459 | // Print out set details |
| 2460 | char prefix[10]; |
| 2461 | uint32_t index = 0; |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2462 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2463 | "Details for descriptor set %#" PRIxLEAST64 ".", (uint64_t) pSet->set); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2464 | LAYOUT_NODE* pLayout = pSet->pLayout; |
| 2465 | // Print layout details |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2466 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2467 | "Layout #%u, (object %#" PRIxLEAST64 ") for DS %#" PRIxLEAST64 ".", index+1, reinterpret_cast<uint64_t>(pLayout->layout), reinterpret_cast<uint64_t>(pSet->set)); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2468 | sprintf(prefix, " [L%u] ", index); |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 2469 | string DSLstr = vk_print_vkdescriptorsetlayoutcreateinfo(&pLayout->createInfo, prefix).c_str(); |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2470 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2471 | "%s", DSLstr.c_str()); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 2472 | index++; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2473 | GENERIC_HEADER* pUpdate = pSet->pUpdateStructs; |
| 2474 | if (pUpdate) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2475 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2476 | "Update Chain [UC] for descriptor set %#" PRIxLEAST64 ":", (uint64_t) pSet->set); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2477 | sprintf(prefix, " [UC] "); |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2478 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2479 | "%s", dynamic_display(pUpdate, prefix).c_str()); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2480 | // TODO : If there is a "view" associated with this update, print CI for that view |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2481 | } else { |
Tobin Ehlis | 2bca8b0 | 2015-06-15 08:41:17 -0600 | [diff] [blame] | 2482 | if (0 != pSet->descriptorCount) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2483 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2484 | "No Update Chain for descriptor set %#" PRIxLEAST64 " which has %u descriptors (vkUpdateDescriptors has not been called)", (uint64_t) pSet->set, pSet->descriptorCount); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2485 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2486 | skipCall |= log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2487 | "FYI: No descriptors in descriptor set %#" PRIxLEAST64 ".", (uint64_t) pSet->set); |
Tobin Ehlis | 2bca8b0 | 2015-06-15 08:41:17 -0600 | [diff] [blame] | 2488 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2489 | } |
| 2490 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2491 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2492 | } |
| 2493 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2494 | static void printCB(layer_data* my_data, const VkCommandBuffer cb) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2495 | { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2496 | GLOBAL_CB_NODE* pCB = getCBNode(my_data, cb); |
David Pinedo | f5997ab | 2015-04-27 16:36:17 -0600 | [diff] [blame] | 2497 | if (pCB && pCB->pCmds.size() > 0) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 2498 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2499 | "Cmds in CB %p", (void*)cb); |
Courtney Goeltzenleuchter | cf2a536 | 2015-04-27 11:16:35 -0600 | [diff] [blame] | 2500 | vector<CMD_NODE*> pCmds = pCB->pCmds; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2501 | for (auto ii=pCmds.begin(); ii!=pCmds.end(); ++ii) { |
| 2502 | // TODO : Need to pass cb as srcObj here |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2503 | log_msg(my_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2504 | " CMD#%" PRIu64 ": %s", (*ii)->cmdNumber, cmdTypeToString((*ii)->type).c_str()); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2505 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 2506 | } else { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2507 | // Nothing to print |
| 2508 | } |
| 2509 | } |
| 2510 | |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2511 | static VkBool32 synchAndPrintDSConfig(layer_data* my_data, const VkCommandBuffer cb) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2512 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2513 | VkBool32 skipCall = VK_FALSE; |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2514 | if (!(my_data->report_data->active_flags & VK_DEBUG_REPORT_INFO_BIT)) { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2515 | return skipCall; |
Mike Stroyan | fa2f222 | 2015-08-12 17:11:28 -0600 | [diff] [blame] | 2516 | } |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2517 | skipCall |= printDSConfig(my_data, cb); |
| 2518 | skipCall |= printPipeline(my_data, cb); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2519 | return skipCall; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2520 | } |
| 2521 | |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2522 | // Flags validation error if the associated call is made inside a render pass. The apiName |
| 2523 | // routine should ONLY be called outside a render pass. |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2524 | static VkBool32 insideRenderPass(const layer_data* my_data, GLOBAL_CB_NODE *pCB, const char *apiName) |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2525 | { |
| 2526 | VkBool32 inside = VK_FALSE; |
| 2527 | if (pCB->activeRenderPass) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2528 | inside = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2529 | (uint64_t)pCB->commandBuffer, 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2530 | "%s: It is invalid to issue this call inside an active render pass (%#" PRIxLEAST64 ")", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2531 | apiName, (uint64_t) pCB->activeRenderPass); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2532 | } |
| 2533 | return inside; |
| 2534 | } |
| 2535 | |
| 2536 | // Flags validation error if the associated call is made outside a render pass. The apiName |
| 2537 | // routine should ONLY be called inside a render pass. |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 2538 | static VkBool32 outsideRenderPass(const layer_data* my_data, GLOBAL_CB_NODE *pCB, const char *apiName) |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2539 | { |
| 2540 | VkBool32 outside = VK_FALSE; |
| 2541 | if (!pCB->activeRenderPass) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2542 | outside = log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2543 | (uint64_t)pCB->commandBuffer, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 2544 | "%s: This call must be issued inside an active render pass.", apiName); |
| 2545 | } |
| 2546 | return outside; |
| 2547 | } |
| 2548 | |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2549 | static void init_draw_state(layer_data *my_data) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2550 | { |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2551 | uint32_t report_flags = 0; |
| 2552 | uint32_t debug_action = 0; |
| 2553 | FILE *log_output = NULL; |
| 2554 | const char *option_str; |
Courtney Goeltzenleuchter | 1781b1c | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 2555 | VkDbgMsgCallback callback; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2556 | // initialize DrawState options |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2557 | report_flags = getLayerOptionFlags("DrawStateReportFlags", 0); |
| 2558 | getLayerOptionEnum("DrawStateDebugAction", (uint32_t *) &debug_action); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2559 | |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2560 | if (debug_action & VK_DBG_LAYER_ACTION_LOG_MSG) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2561 | { |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2562 | option_str = getLayerOption("DrawStateLogFilename"); |
Tobin Ehlis | b4b6e7c | 2015-09-15 09:55:54 -0600 | [diff] [blame] | 2563 | log_output = getLayerLogOutput(option_str, "DrawState"); |
Courtney Goeltzenleuchter | 1781b1c | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 2564 | layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &callback); |
| 2565 | my_data->logging_callback.push_back(callback); |
| 2566 | } |
| 2567 | |
| 2568 | if (debug_action & VK_DBG_LAYER_ACTION_DEBUG_OUTPUT) { |
| 2569 | layer_create_msg_callback(my_data->report_data, report_flags, win32_debug_output_msg, NULL, &callback); |
| 2570 | my_data->logging_callback.push_back(callback); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2571 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2572 | |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2573 | if (!globalLockInitialized) |
| 2574 | { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2575 | loader_platform_thread_create_mutex(&globalLock); |
| 2576 | globalLockInitialized = 1; |
| 2577 | } |
| 2578 | } |
| 2579 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2580 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkInstance* pInstance) |
Courtney Goeltzenleuchter | 3c9f6ec | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 2581 | { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 2582 | // TODOSC : Shouldn't need any customization here |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2583 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); |
| 2584 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2585 | VkResult result = pTable->CreateInstance(pCreateInfo, pAllocator, pInstance); |
Courtney Goeltzenleuchter | 3c9f6ec | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 2586 | |
| 2587 | if (result == VK_SUCCESS) { |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2588 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(*pInstance), layer_data_map); |
| 2589 | my_data->report_data = debug_report_create_instance( |
| 2590 | pTable, |
| 2591 | *pInstance, |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2592 | pCreateInfo->enabledExtensionNameCount, |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2593 | pCreateInfo->ppEnabledExtensionNames); |
Courtney Goeltzenleuchter | f4a2eba | 2015-06-08 14:58:39 -0600 | [diff] [blame] | 2594 | |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2595 | init_draw_state(my_data); |
Courtney Goeltzenleuchter | 3c9f6ec | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 2596 | } |
| 2597 | return result; |
| 2598 | } |
| 2599 | |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2600 | /* hook DestroyInstance to remove tableInstanceMap entry */ |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2601 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks* pAllocator) |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2602 | { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 2603 | // TODOSC : Shouldn't need any customization here |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2604 | dispatch_key key = get_dispatch_key(instance); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2605 | layer_data *my_data = get_my_data_ptr(key, layer_data_map); |
| 2606 | VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table; |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2607 | pTable->DestroyInstance(instance, pAllocator); |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2608 | |
| 2609 | // Clean up logging callback, if any |
Courtney Goeltzenleuchter | 1781b1c | 2015-10-05 15:58:38 -0600 | [diff] [blame] | 2610 | while (my_data->logging_callback.size() > 0) { |
| 2611 | VkDbgMsgCallback callback = my_data->logging_callback.back(); |
| 2612 | layer_destroy_msg_callback(my_data->report_data, callback); |
| 2613 | my_data->logging_callback.pop_back(); |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2614 | } |
| 2615 | |
Courtney Goeltzenleuchter | 2d034fd | 2015-06-28 13:01:17 -0600 | [diff] [blame] | 2616 | layer_debug_report_destroy_instance(my_data->report_data); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2617 | delete my_data->instance_dispatch_table; |
| 2618 | layer_data_map.erase(key); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2619 | // TODO : Potential race here with separate threads creating/destroying instance |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2620 | if (layer_data_map.empty()) { |
Mike Stroyan | d9dd007 | 2015-08-18 15:56:18 -0600 | [diff] [blame] | 2621 | // Release mutex when destroying last instance. |
| 2622 | loader_platform_thread_delete_mutex(&globalLock); |
| 2623 | globalLockInitialized = 0; |
| 2624 | } |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 2625 | } |
| 2626 | |
Jon Ashburn | f0615e2 | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 2627 | static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo, VkDevice device) |
| 2628 | { |
Tony Barbour | 29b1206 | 2015-07-13 13:37:24 -0600 | [diff] [blame] | 2629 | uint32_t i; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2630 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2631 | dev_data->device_extensions.debug_marker_enabled = false; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2632 | dev_data->device_extensions.wsi_enabled = false; |
| 2633 | |
| 2634 | |
| 2635 | VkLayerDispatchTable *pDisp = dev_data->device_dispatch_table; |
| 2636 | PFN_vkGetDeviceProcAddr gpa = pDisp->GetDeviceProcAddr; |
| 2637 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2638 | pDisp->CreateSwapchainKHR = (PFN_vkCreateSwapchainKHR) gpa(device, "vkCreateSwapchainKHR"); |
| 2639 | pDisp->DestroySwapchainKHR = (PFN_vkDestroySwapchainKHR) gpa(device, "vkDestroySwapchainKHR"); |
| 2640 | pDisp->GetSwapchainImagesKHR = (PFN_vkGetSwapchainImagesKHR) gpa(device, "vkGetSwapchainImagesKHR"); |
| 2641 | pDisp->AcquireNextImageKHR = (PFN_vkAcquireNextImageKHR) gpa(device, "vkAcquireNextImageKHR"); |
| 2642 | pDisp->QueuePresentKHR = (PFN_vkQueuePresentKHR) gpa(device, "vkQueuePresentKHR"); |
Jon Ashburn | f0615e2 | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 2643 | |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2644 | for (i = 0; i < pCreateInfo->enabledExtensionNameCount; i++) { |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 2645 | if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) { |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2646 | dev_data->device_extensions.wsi_enabled = true; |
| 2647 | } |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2648 | if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], DEBUG_MARKER_EXTENSION_NAME) == 0) { |
Jon Ashburn | 6f8cd63 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 2649 | /* Found a matching extension name, mark it enabled and init dispatch table*/ |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2650 | dev_data->device_extensions.debug_marker_enabled = true; |
Jon Ashburn | c1d059f | 2015-12-10 19:12:21 -0700 | [diff] [blame] | 2651 | initDebugMarkerTable(device); |
| 2652 | |
Jon Ashburn | f0615e2 | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 2653 | } |
Jon Ashburn | f0615e2 | 2015-05-25 14:11:37 -0600 | [diff] [blame] | 2654 | } |
| 2655 | } |
| 2656 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2657 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2658 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2659 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(*pDevice), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2660 | VkResult result = dev_data->device_dispatch_table->CreateDevice(gpu, pCreateInfo, pAllocator, pDevice); |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 2661 | // TODOSC : shouldn't need any customization here |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2662 | if (result == VK_SUCCESS) { |
| 2663 | layer_data *my_instance_data = get_my_data_ptr(get_dispatch_key(gpu), layer_data_map); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2664 | dev_data->report_data = layer_debug_report_create_device(my_instance_data->report_data, *pDevice); |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 2665 | createDeviceRegisterExtensions(pCreateInfo, *pDevice); |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 2666 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2667 | return result; |
| 2668 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 2669 | |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2670 | // prototype |
| 2671 | static void deleteRenderPasses(layer_data*); |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2672 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2673 | { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 2674 | // TODOSC : Shouldn't need any customization here |
Jeremy Hayes | ea1fef5 | 2015-06-19 11:37:38 -0600 | [diff] [blame] | 2675 | dispatch_key key = get_dispatch_key(device); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2676 | layer_data* dev_data = get_my_data_ptr(key, layer_data_map); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2677 | // Free all the memory |
| 2678 | loader_platform_thread_lock_mutex(&globalLock); |
| 2679 | deletePipelines(dev_data); |
| 2680 | deleteRenderPasses(dev_data); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2681 | deleteCommandBuffers(dev_data); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2682 | deletePools(dev_data); |
| 2683 | deleteLayouts(dev_data); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2684 | dev_data->imageViewMap.clear(); |
| 2685 | dev_data->imageMap.clear(); |
| 2686 | dev_data->bufferViewMap.clear(); |
| 2687 | dev_data->bufferMap.clear(); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2688 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2689 | |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2690 | dev_data->device_dispatch_table->DestroyDevice(device, pAllocator); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 2691 | tableDebugMarkerMap.erase(key); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2692 | delete dev_data->device_dispatch_table; |
| 2693 | layer_data_map.erase(key); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2694 | } |
| 2695 | |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2696 | static const VkLayerProperties ds_global_layers[] = { |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 2697 | { |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 2698 | "DrawState", |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2699 | VK_API_VERSION, |
| 2700 | VK_MAKE_VERSION(0, 1, 0), |
| 2701 | "Validation layer: DrawState", |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 2702 | } |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 2703 | }; |
| 2704 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2705 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceExtensionProperties( |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2706 | const char *pLayerName, |
| 2707 | uint32_t *pCount, |
| 2708 | VkExtensionProperties* pProperties) |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 2709 | { |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2710 | /* DrawState does not have any global extensions */ |
| 2711 | return util_GetExtensionProperties(0, NULL, pCount, pProperties); |
| 2712 | } |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 2713 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2714 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateInstanceLayerProperties( |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2715 | uint32_t *pCount, |
| 2716 | VkLayerProperties* pProperties) |
| 2717 | { |
| 2718 | return util_GetLayerProperties(ARRAY_SIZE(ds_global_layers), |
| 2719 | ds_global_layers, |
| 2720 | pCount, pProperties); |
| 2721 | } |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 2722 | |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2723 | static const VkExtensionProperties ds_device_extensions[] = { |
| 2724 | { |
| 2725 | DEBUG_MARKER_EXTENSION_NAME, |
| 2726 | VK_MAKE_VERSION(0, 1, 0), |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2727 | } |
| 2728 | }; |
| 2729 | |
| 2730 | static const VkLayerProperties ds_device_layers[] = { |
| 2731 | { |
| 2732 | "DrawState", |
| 2733 | VK_API_VERSION, |
| 2734 | VK_MAKE_VERSION(0, 1, 0), |
| 2735 | "Validation layer: DrawState", |
| 2736 | } |
| 2737 | }; |
| 2738 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2739 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceExtensionProperties( |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2740 | VkPhysicalDevice physicalDevice, |
| 2741 | const char* pLayerName, |
| 2742 | uint32_t* pCount, |
| 2743 | VkExtensionProperties* pProperties) |
| 2744 | { |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 2745 | // DrawState does not have any physical device extensions |
Jon Ashburn | aff81ff | 2015-11-02 17:37:20 -0700 | [diff] [blame] | 2746 | if (pLayerName == NULL) { |
| 2747 | dispatch_key key = get_dispatch_key(physicalDevice); |
| 2748 | layer_data *my_data = get_my_data_ptr(key, layer_data_map); |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 2749 | return my_data->instance_dispatch_table->EnumerateDeviceExtensionProperties( |
Jon Ashburn | aff81ff | 2015-11-02 17:37:20 -0700 | [diff] [blame] | 2750 | physicalDevice, |
| 2751 | NULL, |
| 2752 | pCount, |
| 2753 | pProperties); |
| 2754 | } else { |
| 2755 | return util_GetExtensionProperties(ARRAY_SIZE(ds_device_extensions), |
| 2756 | ds_device_extensions, |
| 2757 | pCount, pProperties); |
| 2758 | } |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2759 | } |
| 2760 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2761 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEnumerateDeviceLayerProperties( |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2762 | VkPhysicalDevice physicalDevice, |
| 2763 | uint32_t* pCount, |
| 2764 | VkLayerProperties* pProperties) |
| 2765 | { |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 2766 | /* DrawState physical device layers are the same as global */ |
Courtney Goeltzenleuchter | 73e8bd4 | 2015-07-06 22:31:52 -0600 | [diff] [blame] | 2767 | return util_GetLayerProperties(ARRAY_SIZE(ds_device_layers), ds_device_layers, |
| 2768 | pCount, pProperties); |
Jon Ashburn | eb2728b | 2015-04-10 14:33:07 -0600 | [diff] [blame] | 2769 | } |
| 2770 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2771 | bool ValidateCmdBufImageLayouts(VkCommandBuffer cmdBuffer) { |
| 2772 | bool skip_call = false; |
| 2773 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 2774 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 2775 | for (auto cb_image_data : pCB->imageLayoutMap) { |
| 2776 | auto image_data = dev_data->imageLayoutMap.find(cb_image_data.first); |
| 2777 | if (image_data == dev_data->imageLayoutMap.end()) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2778 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 2779 | "Cannot submit cmd buffer using deleted image %" PRIu64 ".", reinterpret_cast<uint64_t>(cb_image_data.first)); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2780 | } else { |
| 2781 | if (dev_data->imageLayoutMap[cb_image_data.first]->layout != cb_image_data.second.initialLayout) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2782 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2783 | "Cannot submit cmd buffer using image with layout %d when first use is %d.", dev_data->imageLayoutMap[cb_image_data.first]->layout, cb_image_data.second.initialLayout); |
| 2784 | } |
| 2785 | dev_data->imageLayoutMap[cb_image_data.first]->layout = cb_image_data.second.layout; |
| 2786 | } |
| 2787 | } |
| 2788 | return skip_call; |
| 2789 | } |
| 2790 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2791 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2792 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2793 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 28be0be | 2015-05-22 12:38:16 -0600 | [diff] [blame] | 2794 | GLOBAL_CB_NODE* pCB = NULL; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 2795 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 2796 | for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 2797 | const VkSubmitInfo *submit = &pSubmits[submit_idx]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 2798 | for (uint32_t i=0; i < submit->commandBufferCount; i++) { |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 2799 | |
| 2800 | #ifndef DISABLE_IMAGE_LAYOUT_VALIDATION |
| 2801 | skipCall |= ValidateCmdBufImageLayouts(submit->pCommandBuffers[i]); |
| 2802 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
| 2803 | |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 2804 | // Validate that cmd buffers have been updated |
| 2805 | pCB = getCBNode(dev_data, submit->pCommandBuffers[i]); |
| 2806 | loader_platform_thread_lock_mutex(&globalLock); |
| 2807 | pCB->submitCount++; // increment submit count |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2808 | if ((pCB->beginInfo.flags & VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT) && (pCB->submitCount > 1)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2809 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_COMMAND_BUFFER_SINGLE_SUBMIT_VIOLATION, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 2810 | "CB %#" PRIxLEAST64 " was begun w/ VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT set, but has been submitted %#" PRIxLEAST64 " times.", |
| 2811 | reinterpret_cast<uint64_t>(pCB->commandBuffer), pCB->submitCount); |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 2812 | } |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2813 | if (CB_RECORDED != pCB->state) { |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 2814 | // Flag error for using CB w/o vkEndCommandBuffer() called |
| 2815 | // TODO : How to pass cb as srcObj? |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 2816 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NO_END_COMMAND_BUFFER, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 2817 | "You must call vkEndCommandBuffer() on CB %#" PRIxLEAST64 " before this call to vkQueueSubmit()!", reinterpret_cast<uint64_t>(pCB->commandBuffer)); |
Courtney Goeltzenleuchter | 3ec3162 | 2015-10-20 18:04:07 -0600 | [diff] [blame] | 2818 | loader_platform_thread_unlock_mutex(&globalLock); |
| 2819 | return VK_ERROR_VALIDATION_FAILED; |
| 2820 | } |
Tobin Ehlis | e90b171 | 2015-05-27 14:30:06 -0600 | [diff] [blame] | 2821 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 28be0be | 2015-05-22 12:38:16 -0600 | [diff] [blame] | 2822 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2823 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2824 | if (VK_FALSE == skipCall) |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 2825 | return dev_data->device_dispatch_table->QueueSubmit(queue, submitCount, pSubmits, fence); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 2826 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2827 | } |
| 2828 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2829 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 2830 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2831 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyFence(device, fence, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2832 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2833 | } |
| 2834 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2835 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySemaphore(VkDevice device, VkSemaphore semaphore, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2836 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2837 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroySemaphore(device, semaphore, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2838 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2839 | } |
| 2840 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2841 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2842 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2843 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyEvent(device, event, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2844 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2845 | } |
| 2846 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2847 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyQueryPool(VkDevice device, VkQueryPool queryPool, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2848 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2849 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyQueryPool(device, queryPool, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2850 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2851 | } |
| 2852 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2853 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyBuffer(VkDevice device, VkBuffer buffer, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2854 | { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2855 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2856 | dev_data->device_dispatch_table->DestroyBuffer(device, buffer, pAllocator); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2857 | dev_data->bufferMap.erase(buffer); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2858 | } |
| 2859 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2860 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyBufferView(VkDevice device, VkBufferView bufferView, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2861 | { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2862 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2863 | dev_data->device_dispatch_table->DestroyBufferView(device, bufferView, pAllocator); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2864 | dev_data->bufferViewMap.erase(bufferView); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2865 | } |
| 2866 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2867 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyImage(VkDevice device, VkImage image, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2868 | { |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 2869 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2870 | dev_data->device_dispatch_table->DestroyImage(device, image, pAllocator); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 2871 | dev_data->imageMap.erase(image); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2872 | } |
| 2873 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2874 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyImageView(VkDevice device, VkImageView imageView, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2875 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2876 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyImageView(device, imageView, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2877 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2878 | } |
| 2879 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2880 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyShaderModule(VkDevice device, VkShaderModule shaderModule, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2881 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2882 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyShaderModule(device, shaderModule, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2883 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2884 | } |
| 2885 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2886 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyPipeline(VkDevice device, VkPipeline pipeline, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2887 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2888 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyPipeline(device, pipeline, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2889 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2890 | } |
| 2891 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2892 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyPipelineLayout(VkDevice device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2893 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2894 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyPipelineLayout(device, pipelineLayout, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2895 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2896 | } |
| 2897 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2898 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySampler(VkDevice device, VkSampler sampler, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2899 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2900 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroySampler(device, sampler, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2901 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2902 | } |
| 2903 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2904 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDescriptorSetLayout(VkDevice device, VkDescriptorSetLayout descriptorSetLayout, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2905 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2906 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyDescriptorSetLayout(device, descriptorSetLayout, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2907 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2908 | } |
| 2909 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2910 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2911 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2912 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyDescriptorPool(device, descriptorPool, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2913 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2914 | } |
| 2915 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2916 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkFreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t count, const VkCommandBuffer *pCommandBuffers) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2917 | { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2918 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2919 | |
| 2920 | for (auto i = 0; i < count; i++) { |
| 2921 | // Delete CB information structure, and remove from commandBufferMap |
| 2922 | auto cb = dev_data->commandBufferMap.find(pCommandBuffers[i]); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2923 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2924 | if (cb != dev_data->commandBufferMap.end()) { |
| 2925 | delete (*cb).second; |
| 2926 | dev_data->commandBufferMap.erase(cb); |
| 2927 | } |
| 2928 | |
| 2929 | // Remove commandBuffer reference from commandPoolMap |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2930 | dev_data->commandPoolMap[commandPool].commandBuffers.remove(pCommandBuffers[i]); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2931 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2932 | } |
| 2933 | |
| 2934 | dev_data->device_dispatch_table->FreeCommandBuffers(device, commandPool, count, pCommandBuffers); |
| 2935 | } |
| 2936 | |
| 2937 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkCommandPool* pCommandPool) |
| 2938 | { |
| 2939 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2940 | |
| 2941 | VkResult result = dev_data->device_dispatch_table->CreateCommandPool(device, pCreateInfo, pAllocator, pCommandPool); |
| 2942 | |
| 2943 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2944 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2945 | dev_data->commandPoolMap[*pCommandPool].createFlags = pCreateInfo->flags; |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2946 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2947 | } |
| 2948 | return result; |
| 2949 | } |
| 2950 | |
| 2951 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks* pAllocator) |
| 2952 | { |
| 2953 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2954 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2955 | |
| 2956 | // Must remove cmdpool from cmdpoolmap, after removing all cmdbuffers in its list from the commandPoolMap |
| 2957 | if (dev_data->commandPoolMap.find(commandPool) != dev_data->commandPoolMap.end()) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2958 | for (auto poolCb = dev_data->commandPoolMap[commandPool].commandBuffers.begin(); poolCb != dev_data->commandPoolMap[commandPool].commandBuffers.end();) { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2959 | auto del_cb = dev_data->commandBufferMap.find(*poolCb); |
| 2960 | delete (*del_cb).second; // delete CB info structure |
| 2961 | dev_data->commandBufferMap.erase(del_cb); // Remove this command buffer from cbMap |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2962 | poolCb = dev_data->commandPoolMap[commandPool].commandBuffers.erase(poolCb); // Remove CB reference from commandPoolMap's list |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2963 | } |
| 2964 | } |
| 2965 | dev_data->commandPoolMap.erase(commandPool); |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 2966 | |
| 2967 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 2968 | dev_data->device_dispatch_table->DestroyCommandPool(device, commandPool, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2969 | } |
| 2970 | |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 2971 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandPool( |
| 2972 | VkDevice device, |
| 2973 | VkCommandPool commandPool, |
| 2974 | VkCommandPoolResetFlags flags) |
| 2975 | { |
| 2976 | layer_data *dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 2977 | VkResult result = VK_ERROR_VALIDATION_FAILED; |
| 2978 | |
| 2979 | result = dev_data->device_dispatch_table->ResetCommandPool(device, commandPool, flags); |
| 2980 | // Reset all of the CBs allocated from this pool |
| 2981 | if (VK_SUCCESS == result) { |
| 2982 | auto it = dev_data->commandPoolMap[commandPool].commandBuffers.begin(); |
| 2983 | while (it != dev_data->commandPoolMap[commandPool].commandBuffers.end()) { |
| 2984 | resetCB(dev_data, (*it)); |
| 2985 | ++it; |
| 2986 | } |
| 2987 | } |
| 2988 | return result; |
| 2989 | } |
| 2990 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2991 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyFramebuffer(VkDevice device, VkFramebuffer framebuffer, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2992 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2993 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyFramebuffer(device, framebuffer, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2994 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2995 | } |
| 2996 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 2997 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyRenderPass(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks* pAllocator) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 2998 | { |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 2999 | get_my_data_ptr(get_dispatch_key(device), layer_data_map)->device_dispatch_table->DestroyRenderPass(device, renderPass, pAllocator); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3000 | // TODO : Clean up any internal data structures using this obj. |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3001 | } |
| 3002 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3003 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateBuffer(VkDevice device, const VkBufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBuffer* pBuffer) |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3004 | { |
| 3005 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3006 | VkResult result = dev_data->device_dispatch_table->CreateBuffer(device, pCreateInfo, pAllocator, pBuffer); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3007 | if (VK_SUCCESS == result) { |
| 3008 | loader_platform_thread_lock_mutex(&globalLock); |
| 3009 | // TODO : This doesn't create deep copy of pQueueFamilyIndices so need to fix that if/when we want that data to be valid |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3010 | dev_data->bufferMap[*pBuffer] = unique_ptr<VkBufferCreateInfo>(new VkBufferCreateInfo(*pCreateInfo)); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3011 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3012 | } |
| 3013 | return result; |
| 3014 | } |
| 3015 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3016 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateBufferView(VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkBufferView* pView) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3017 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3018 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3019 | VkResult result = dev_data->device_dispatch_table->CreateBufferView(device, pCreateInfo, pAllocator, pView); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3020 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3021 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3022 | dev_data->bufferViewMap[*pView] = unique_ptr<VkBufferViewCreateInfo>(new VkBufferViewCreateInfo(*pCreateInfo)); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3023 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3024 | } |
| 3025 | return result; |
| 3026 | } |
| 3027 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3028 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage(VkDevice device, const VkImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImage* pImage) |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3029 | { |
| 3030 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3031 | VkResult result = dev_data->device_dispatch_table->CreateImage(device, pCreateInfo, pAllocator, pImage); |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3032 | if (VK_SUCCESS == result) { |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 3033 | IMAGE_NODE* image_node = new IMAGE_NODE; |
| 3034 | image_node->layout = pCreateInfo->initialLayout; |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 3035 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3036 | dev_data->imageMap[*pImage] = unique_ptr<VkImageCreateInfo>(new VkImageCreateInfo(*pCreateInfo)); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 3037 | dev_data->imageLayoutMap[*pImage] = image_node; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3038 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3039 | } |
| 3040 | return result; |
| 3041 | } |
| 3042 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3043 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateImageView(VkDevice device, const VkImageViewCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkImageView* pView) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3044 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3045 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3046 | VkResult result = dev_data->device_dispatch_table->CreateImageView(device, pCreateInfo, pAllocator, pView); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3047 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3048 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3049 | dev_data->imageViewMap[*pView] = unique_ptr<VkImageViewCreateInfo>(new VkImageViewCreateInfo(*pCreateInfo)); |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 3050 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3051 | } |
| 3052 | return result; |
| 3053 | } |
| 3054 | |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3055 | //TODO handle pipeline caches |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3056 | VKAPI_ATTR VkResult VKAPI_CALL vkCreatePipelineCache( |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3057 | VkDevice device, |
| 3058 | const VkPipelineCacheCreateInfo* pCreateInfo, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3059 | const VkAllocationCallbacks* pAllocator, |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3060 | VkPipelineCache* pPipelineCache) |
| 3061 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3062 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3063 | VkResult result = dev_data->device_dispatch_table->CreatePipelineCache(device, pCreateInfo, pAllocator, pPipelineCache); |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3064 | return result; |
| 3065 | } |
| 3066 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3067 | VKAPI_ATTR void VKAPI_CALL vkDestroyPipelineCache( |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3068 | VkDevice device, |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3069 | VkPipelineCache pipelineCache, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3070 | const VkAllocationCallbacks* pAllocator) |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3071 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3072 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3073 | dev_data->device_dispatch_table->DestroyPipelineCache(device, pipelineCache, pAllocator); |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3074 | } |
| 3075 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3076 | VKAPI_ATTR VkResult VKAPI_CALL vkGetPipelineCacheData( |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3077 | VkDevice device, |
| 3078 | VkPipelineCache pipelineCache, |
Chia-I Wu | 28c3c43 | 2015-10-26 19:17:06 +0800 | [diff] [blame] | 3079 | size_t* pDataSize, |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3080 | void* pData) |
| 3081 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3082 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 28c3c43 | 2015-10-26 19:17:06 +0800 | [diff] [blame] | 3083 | VkResult result = dev_data->device_dispatch_table->GetPipelineCacheData(device, pipelineCache, pDataSize, pData); |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3084 | return result; |
| 3085 | } |
| 3086 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3087 | VKAPI_ATTR VkResult VKAPI_CALL vkMergePipelineCaches( |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3088 | VkDevice device, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3089 | VkPipelineCache dstCache, |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3090 | uint32_t srcCacheCount, |
| 3091 | const VkPipelineCache* pSrcCaches) |
| 3092 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3093 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3094 | VkResult result = dev_data->device_dispatch_table->MergePipelineCaches(device, dstCache, srcCacheCount, pSrcCaches); |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 3095 | return result; |
| 3096 | } |
| 3097 | |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3098 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateGraphicsPipelines( |
| 3099 | VkDevice device, |
| 3100 | VkPipelineCache pipelineCache, |
| 3101 | uint32_t count, |
| 3102 | const VkGraphicsPipelineCreateInfo *pCreateInfos, |
| 3103 | const VkAllocationCallbacks *pAllocator, |
| 3104 | VkPipeline *pPipelines) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3105 | { |
Courtney Goeltzenleuchter | a54b76a | 2015-09-04 13:39:59 -0600 | [diff] [blame] | 3106 | VkResult result = VK_SUCCESS; |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3107 | //TODO What to do with pipelineCache? |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3108 | // The order of operations here is a little convoluted but gets the job done |
| 3109 | // 1. Pipeline create state is first shadowed into PIPELINE_NODE struct |
| 3110 | // 2. Create state is then validated (which uses flags setup during shadowing) |
| 3111 | // 3. If everything looks good, we'll then create the pipeline and add NODE to pipelineMap |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3112 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 76c1885 | 2015-09-17 16:33:58 -0600 | [diff] [blame] | 3113 | // TODO : Improve this data struct w/ unique_ptrs so cleanup below is automatic |
| 3114 | vector<PIPELINE_NODE*> pPipeNode(count); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3115 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3116 | |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3117 | uint32_t i=0; |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3118 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3119 | |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3120 | for (i=0; i<count; i++) { |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3121 | pPipeNode[i] = initGraphicsPipeline(dev_data, &pCreateInfos[i], NULL); |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3122 | skipCall |= verifyPipelineCreateState(dev_data, device, pPipeNode[i]); |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3123 | } |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3124 | |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3125 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 3126 | |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 3127 | if (VK_FALSE == skipCall) { |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3128 | result = dev_data->device_dispatch_table->CreateGraphicsPipelines(device, |
| 3129 | pipelineCache, count, pCreateInfos, pAllocator, pPipelines); |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3130 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3131 | for (i=0; i<count; i++) { |
| 3132 | pPipeNode[i]->pipeline = pPipelines[i]; |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3133 | dev_data->pipelineMap[pPipeNode[i]->pipeline] = pPipeNode[i]; |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3134 | } |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3135 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3136 | } else { |
Tobin Ehlis | e48be20 | 2015-09-16 10:33:53 -0600 | [diff] [blame] | 3137 | for (i=0; i<count; i++) { |
| 3138 | if (pPipeNode[i]) { |
| 3139 | // If we allocated a pipeNode, need to clean it up here |
| 3140 | delete[] pPipeNode[i]->pVertexBindingDescriptions; |
| 3141 | delete[] pPipeNode[i]->pVertexAttributeDescriptions; |
| 3142 | delete[] pPipeNode[i]->pAttachments; |
| 3143 | delete pPipeNode[i]; |
| 3144 | } |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3145 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3146 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | de63c53 | 2015-06-18 15:59:33 -0600 | [diff] [blame] | 3147 | } |
Courtney Goeltzenleuchter | 9452ac2 | 2015-04-13 16:16:04 -0600 | [diff] [blame] | 3148 | return result; |
| 3149 | } |
| 3150 | |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 3151 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateComputePipelines( |
| 3152 | VkDevice device, |
| 3153 | VkPipelineCache pipelineCache, |
| 3154 | uint32_t count, |
| 3155 | const VkComputePipelineCreateInfo *pCreateInfos, |
| 3156 | const VkAllocationCallbacks *pAllocator, |
| 3157 | VkPipeline *pPipelines) |
| 3158 | { |
| 3159 | VkResult result = VK_SUCCESS; |
| 3160 | VkBool32 skipCall = VK_FALSE; |
| 3161 | |
| 3162 | // TODO : Improve this data struct w/ unique_ptrs so cleanup below is automatic |
| 3163 | vector<PIPELINE_NODE*> pPipeNode(count); |
| 3164 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 3165 | |
| 3166 | uint32_t i=0; |
| 3167 | loader_platform_thread_lock_mutex(&globalLock); |
| 3168 | for (i=0; i<count; i++) { |
| 3169 | // TODO: Verify compute stage bits |
| 3170 | |
| 3171 | // Create and initialize internal tracking data structure |
| 3172 | pPipeNode[i] = new PIPELINE_NODE; |
| 3173 | memset((void*)pPipeNode[i], 0, sizeof(PIPELINE_NODE)); |
| 3174 | memcpy(&pPipeNode[i]->computePipelineCI, (const void*)&pCreateInfos[i], sizeof(VkComputePipelineCreateInfo)); |
| 3175 | |
| 3176 | // TODO: Add Compute Pipeline Verification |
| 3177 | // skipCall |= verifyPipelineCreateState(dev_data, device, pPipeNode[i]); |
| 3178 | } |
| 3179 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3180 | |
| 3181 | if (VK_FALSE == skipCall) { |
| 3182 | result = dev_data->device_dispatch_table->CreateComputePipelines(device, pipelineCache, count, pCreateInfos, pAllocator, pPipelines); |
| 3183 | loader_platform_thread_lock_mutex(&globalLock); |
| 3184 | for (i=0; i<count; i++) { |
| 3185 | pPipeNode[i]->pipeline = pPipelines[i]; |
| 3186 | dev_data->pipelineMap[pPipeNode[i]->pipeline] = pPipeNode[i]; |
| 3187 | } |
| 3188 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3189 | } else { |
| 3190 | for (i=0; i<count; i++) { |
| 3191 | if (pPipeNode[i]) { |
| 3192 | // Clean up any locally allocated data structures |
| 3193 | delete pPipeNode[i]; |
| 3194 | } |
| 3195 | } |
| 3196 | return VK_ERROR_VALIDATION_FAILED; |
| 3197 | } |
| 3198 | return result; |
| 3199 | } |
| 3200 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3201 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSampler(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSampler* pSampler) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3202 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3203 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3204 | VkResult result = dev_data->device_dispatch_table->CreateSampler(device, pCreateInfo, pAllocator, pSampler); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3205 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3206 | loader_platform_thread_lock_mutex(&globalLock); |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3207 | dev_data->sampleMap[*pSampler] = unique_ptr<SAMPLER_NODE>(new SAMPLER_NODE(pSampler, pCreateInfo)); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3208 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3209 | } |
| 3210 | return result; |
| 3211 | } |
| 3212 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3213 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDescriptorSetLayout(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorSetLayout* pSetLayout) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3214 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3215 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3216 | VkResult result = dev_data->device_dispatch_table->CreateDescriptorSetLayout(device, pCreateInfo, pAllocator, pSetLayout); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3217 | if (VK_SUCCESS == result) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 3218 | // TODOSC : Capture layout bindings set |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3219 | LAYOUT_NODE* pNewNode = new LAYOUT_NODE; |
| 3220 | if (NULL == pNewNode) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3221 | if (log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) *pSetLayout, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3222 | "Out of memory while attempting to allocate LAYOUT_NODE in vkCreateDescriptorSetLayout()")) |
| 3223 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3224 | } |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 3225 | memcpy((void*)&pNewNode->createInfo, pCreateInfo, sizeof(VkDescriptorSetLayoutCreateInfo)); |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3226 | pNewNode->createInfo.pBinding = new VkDescriptorSetLayoutBinding[pCreateInfo->bindingCount]; |
| 3227 | memcpy((void*)pNewNode->createInfo.pBinding, pCreateInfo->pBinding, sizeof(VkDescriptorSetLayoutBinding)*pCreateInfo->bindingCount); |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3228 | // g++ does not like reserve with size 0 |
| 3229 | if (pCreateInfo->bindingCount) |
| 3230 | pNewNode->bindings.reserve(pCreateInfo->bindingCount); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3231 | uint32_t totalCount = 0; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 3232 | for (uint32_t i=0; i<pCreateInfo->bindingCount; i++) { |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3233 | if (!pNewNode->bindings.insert(pCreateInfo->pBinding[i].binding).second) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3234 | if (log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) *pSetLayout, 0, DRAWSTATE_INVALID_LAYOUT, "DS", |
Chia-I Wu | b5689ee | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3235 | "duplicated binding number in VkDescriptorSetLayoutBinding")) |
| 3236 | return VK_ERROR_VALIDATION_FAILED; |
| 3237 | } |
| 3238 | |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3239 | totalCount += pCreateInfo->pBinding[i].descriptorCount; |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3240 | if (pCreateInfo->pBinding[i].pImmutableSamplers) { |
| 3241 | VkSampler** ppIS = (VkSampler**)&pNewNode->createInfo.pBinding[i].pImmutableSamplers; |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3242 | *ppIS = new VkSampler[pCreateInfo->pBinding[i].descriptorCount]; |
| 3243 | memcpy(*ppIS, pCreateInfo->pBinding[i].pImmutableSamplers, pCreateInfo->pBinding[i].descriptorCount*sizeof(VkSampler)); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3244 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3245 | } |
| 3246 | if (totalCount > 0) { |
Cody Northrop | 8a90832 | 2015-10-26 14:07:35 -0600 | [diff] [blame] | 3247 | pNewNode->descriptorTypes.resize(totalCount); |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 3248 | pNewNode->stageFlags.resize(totalCount); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3249 | uint32_t offset = 0; |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3250 | uint32_t j = 0; |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3251 | VkDescriptorType dType; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 3252 | for (uint32_t i=0; i<pCreateInfo->bindingCount; i++) { |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3253 | dType = pCreateInfo->pBinding[i].descriptorType; |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3254 | for (j = 0; j < pCreateInfo->pBinding[i].descriptorCount; j++) { |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3255 | pNewNode->descriptorTypes[offset + j] = dType; |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3256 | pNewNode->stageFlags[offset + j] = pCreateInfo->pBinding[i].stageFlags; |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3257 | if ((dType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) || |
| 3258 | (dType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)) { |
| 3259 | pNewNode->dynamicDescriptorCount++; |
| 3260 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3261 | } |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3262 | offset += j; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3263 | } |
| 3264 | } |
| 3265 | pNewNode->layout = *pSetLayout; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3266 | pNewNode->startIndex = 0; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3267 | pNewNode->endIndex = pNewNode->startIndex + totalCount - 1; |
| 3268 | assert(pNewNode->endIndex >= pNewNode->startIndex); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3269 | // Put new node at Head of global Layer list |
| 3270 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 3271 | dev_data->descriptorSetLayoutMap[*pSetLayout] = pNewNode; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3272 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3273 | } |
| 3274 | return result; |
| 3275 | } |
| 3276 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3277 | VKAPI_ATTR VkResult VKAPI_CALL vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkPipelineLayout* pPipelineLayout) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3278 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3279 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3280 | VkResult result = dev_data->device_dispatch_table->CreatePipelineLayout(device, pCreateInfo, pAllocator, pPipelineLayout); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3281 | if (VK_SUCCESS == result) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 3282 | // TODOSC : Merge capture of the setLayouts per pipeline |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3283 | PIPELINE_LAYOUT_NODE& plNode = dev_data->pipelineLayoutMap[*pPipelineLayout]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 3284 | plNode.descriptorSetLayouts.resize(pCreateInfo->setLayoutCount); |
Tobin Ehlis | 91423d2 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 3285 | uint32_t i = 0; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 3286 | for (i=0; i<pCreateInfo->setLayoutCount; ++i) { |
Tobin Ehlis | 91423d2 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 3287 | plNode.descriptorSetLayouts[i] = pCreateInfo->pSetLayouts[i]; |
| 3288 | } |
Cody Northrop | 8a90832 | 2015-10-26 14:07:35 -0600 | [diff] [blame] | 3289 | plNode.pushConstantRanges.resize(pCreateInfo->pushConstantRangeCount); |
Tobin Ehlis | 91423d2 | 2015-10-20 10:11:55 -0600 | [diff] [blame] | 3290 | for (i=0; i<pCreateInfo->pushConstantRangeCount; ++i) { |
| 3291 | plNode.pushConstantRanges[i] = pCreateInfo->pPushConstantRanges[i]; |
| 3292 | } |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3293 | } |
| 3294 | return result; |
| 3295 | } |
| 3296 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3297 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDescriptorPool(VkDevice device, const VkDescriptorPoolCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDescriptorPool* pDescriptorPool) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3298 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3299 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 3300 | VkResult result = dev_data->device_dispatch_table->CreateDescriptorPool(device, pCreateInfo, pAllocator, pDescriptorPool); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3301 | if (VK_SUCCESS == result) { |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3302 | // Insert this pool into Global Pool LL at head |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3303 | if (log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (uint64_t) *pDescriptorPool, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3304 | "Created Descriptor Pool %#" PRIxLEAST64, (uint64_t) *pDescriptorPool)) |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3305 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3306 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3307 | DESCRIPTOR_POOL_NODE* pNewNode = new DESCRIPTOR_POOL_NODE(*pDescriptorPool, pCreateInfo); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3308 | if (NULL == pNewNode) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3309 | if (log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (uint64_t) *pDescriptorPool, 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3310 | "Out of memory while attempting to allocate DESCRIPTOR_POOL_NODE in vkCreateDescriptorPool()")) |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3311 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3312 | } else { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3313 | dev_data->descriptorPoolMap[*pDescriptorPool] = pNewNode; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3314 | } |
| 3315 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3316 | } else { |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3317 | // Need to do anything if pool create fails? |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3318 | } |
| 3319 | return result; |
| 3320 | } |
| 3321 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3322 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkResetDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3323 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3324 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Courtney Goeltzenleuchter | 831c183 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 3325 | VkResult result = dev_data->device_dispatch_table->ResetDescriptorPool(device, descriptorPool, flags); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3326 | if (VK_SUCCESS == result) { |
Courtney Goeltzenleuchter | 831c183 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 3327 | clearDescriptorPool(dev_data, device, descriptorPool, flags); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3328 | } |
| 3329 | return result; |
| 3330 | } |
| 3331 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3332 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAllocateDescriptorSets(VkDevice device, const VkDescriptorSetAllocateInfo* pAllocateInfo, VkDescriptorSet* pDescriptorSets) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3333 | { |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3334 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3335 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3336 | // Verify that requested descriptorSets are available in pool |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3337 | DESCRIPTOR_POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocateInfo->descriptorPool); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3338 | if (!pPoolNode) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3339 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_POOL, (uint64_t) pAllocateInfo->descriptorPool, 0, DRAWSTATE_INVALID_POOL, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3340 | "Unable to find pool node for pool %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pAllocateInfo->descriptorPool); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3341 | } else { // Make sure pool has all the available descriptors before calling down chain |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3342 | skipCall |= validate_descriptor_availability_in_pool(dev_data, pPoolNode, pAllocateInfo->setLayoutCount, pAllocateInfo->pSetLayouts); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3343 | } |
| 3344 | if (skipCall) |
| 3345 | return VK_ERROR_VALIDATION_FAILED; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3346 | VkResult result = dev_data->device_dispatch_table->AllocateDescriptorSets(device, pAllocateInfo, pDescriptorSets); |
Cody Northrop | c8aa4a5 | 2015-08-03 12:47:29 -0600 | [diff] [blame] | 3347 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3348 | DESCRIPTOR_POOL_NODE *pPoolNode = getPoolNode(dev_data, pAllocateInfo->descriptorPool); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3349 | if (pPoolNode) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3350 | if (pAllocateInfo->setLayoutCount == 0) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3351 | log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, pAllocateInfo->setLayoutCount, 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3352 | "AllocateDescriptorSets called with 0 count"); |
Cody Northrop | c8aa4a5 | 2015-08-03 12:47:29 -0600 | [diff] [blame] | 3353 | } |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3354 | for (uint32_t i = 0; i < pAllocateInfo->setLayoutCount; i++) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3355 | log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3356 | "Created Descriptor Set %#" PRIxLEAST64, (uint64_t) pDescriptorSets[i]); |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3357 | // Create new set node and add to head of pool nodes |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3358 | SET_NODE* pNewNode = new SET_NODE; |
| 3359 | if (NULL == pNewNode) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3360 | if (log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_OUT_OF_MEMORY, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3361 | "Out of memory while attempting to allocate SET_NODE in vkAllocateDescriptorSets()")) |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3362 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3363 | } else { |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3364 | memset(pNewNode, 0, sizeof(SET_NODE)); |
Tobin Ehlis | f6e93e0 | 2015-10-19 12:09:13 -0600 | [diff] [blame] | 3365 | // TODO : Pool should store a total count of each type of Descriptor available |
| 3366 | // When descriptors are allocated, decrement the count and validate here |
| 3367 | // that the count doesn't go below 0. One reset/free need to bump count back up. |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3368 | // Insert set at head of Set LL for this pool |
| 3369 | pNewNode->pNext = pPoolNode->pSets; |
| 3370 | pPoolNode->pSets = pNewNode; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3371 | LAYOUT_NODE* pLayout = getLayoutNode(dev_data, pAllocateInfo->pSetLayouts[i]); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3372 | if (NULL == pLayout) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3373 | if (log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT, (uint64_t) pAllocateInfo->pSetLayouts[i], 0, DRAWSTATE_INVALID_LAYOUT, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3374 | "Unable to find set layout node for layout %#" PRIxLEAST64 " specified in vkAllocateDescriptorSets() call", (uint64_t) pAllocateInfo->pSetLayouts[i])) |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3375 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3376 | } |
Tobin Ehlis | dd82f6b | 2015-04-03 12:01:11 -0600 | [diff] [blame] | 3377 | pNewNode->pLayout = pLayout; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3378 | pNewNode->pool = pAllocateInfo->descriptorPool; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3379 | pNewNode->set = pDescriptorSets[i]; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3380 | pNewNode->descriptorCount = pLayout->endIndex + 1; |
| 3381 | if (pNewNode->descriptorCount) { |
| 3382 | size_t descriptorArraySize = sizeof(GENERIC_HEADER*)*pNewNode->descriptorCount; |
| 3383 | pNewNode->ppDescriptors = new GENERIC_HEADER*[descriptorArraySize]; |
| 3384 | memset(pNewNode->ppDescriptors, 0, descriptorArraySize); |
| 3385 | } |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3386 | dev_data->setMap[pDescriptorSets[i]] = pNewNode; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3387 | } |
| 3388 | } |
| 3389 | } |
| 3390 | } |
| 3391 | return result; |
| 3392 | } |
| 3393 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3394 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkFreeDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets) |
Tony Barbour | b857d31 | 2015-07-10 10:50:45 -0600 | [diff] [blame] | 3395 | { |
Tobin Ehlis | 3c54311 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 3396 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3397 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3398 | DESCRIPTOR_POOL_NODE *pPoolNode = getPoolNode(dev_data, descriptorPool); |
Courtney Goeltzenleuchter | 831c183 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 3399 | if (pPoolNode && !(VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT & pPoolNode->createInfo.flags)) { |
| 3400 | // Can't Free from a NON_FREE pool |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3401 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, (uint64_t)device, 0, DRAWSTATE_CANT_FREE_FROM_NON_FREE_POOL, "DS", |
Courtney Goeltzenleuchter | 831c183 | 2015-10-23 14:21:05 -0600 | [diff] [blame] | 3402 | "It is invalid to call vkFreeDescriptorSets() with a pool created without setting VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT."); |
Tobin Ehlis | 3c54311 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 3403 | } |
| 3404 | if (skipCall) |
| 3405 | return VK_ERROR_VALIDATION_FAILED; |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3406 | VkResult result = dev_data->device_dispatch_table->FreeDescriptorSets(device, descriptorPool, count, pDescriptorSets); |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3407 | if (VK_SUCCESS == result) { |
| 3408 | // For each freed descriptor add it back into the pool as available |
| 3409 | for (uint32_t i=0; i<count; ++i) { |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3410 | SET_NODE* pSet = dev_data->setMap[pDescriptorSets[i]]; // getSetNode() without locking |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3411 | LAYOUT_NODE* pLayout = pSet->pLayout; |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3412 | uint32_t typeIndex = 0, poolSizeCount = 0; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 3413 | for (uint32_t j=0; j<pLayout->createInfo.bindingCount; ++j) { |
Chia-I Wu | f03cbf7 | 2015-10-31 00:31:16 +0800 | [diff] [blame] | 3414 | typeIndex = static_cast<uint32_t>(pLayout->createInfo.pBinding[j].descriptorType); |
Chia-I Wu | 045654f | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3415 | poolSizeCount = pLayout->createInfo.pBinding[j].descriptorCount; |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3416 | pPoolNode->availableDescriptorTypeCount[typeIndex] += poolSizeCount; |
Tobin Ehlis | c6457d2 | 2015-10-20 16:16:04 -0600 | [diff] [blame] | 3417 | } |
| 3418 | } |
| 3419 | } |
| 3420 | // TODO : Any other clean-up or book-keeping to do here? |
Tony Barbour | b857d31 | 2015-07-10 10:50:45 -0600 | [diff] [blame] | 3421 | return result; |
| 3422 | } |
| 3423 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3424 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkUpdateDescriptorSets(VkDevice device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t descriptorCopyCount, const VkCopyDescriptorSet* pDescriptorCopies) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3425 | { |
Tobin Ehlis | 68fbd44 | 2015-10-27 12:25:35 -0600 | [diff] [blame] | 3426 | // dsUpdate will return VK_TRUE only if a bailout error occurs, so we want to call down tree when update returns VK_FALSE |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3427 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 483e770 | 2015-10-26 17:20:32 +0800 | [diff] [blame] | 3428 | if (!dsUpdate(dev_data, device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies)) { |
| 3429 | dev_data->device_dispatch_table->UpdateDescriptorSets(device, descriptorWriteCount, pDescriptorWrites, descriptorCopyCount, pDescriptorCopies); |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 3430 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3431 | } |
| 3432 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3433 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo* pCreateInfo, VkCommandBuffer* pCommandBuffer) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3434 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 3435 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3436 | VkResult result = dev_data->device_dispatch_table->AllocateCommandBuffers(device, pCreateInfo, pCommandBuffer); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3437 | if (VK_SUCCESS == result) { |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3438 | for (auto i = 0; i < pCreateInfo->bufferCount; i++) { |
| 3439 | // Validate command pool |
| 3440 | if (dev_data->commandPoolMap.find(pCreateInfo->commandPool) != dev_data->commandPoolMap.end()) { |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 3441 | loader_platform_thread_lock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3442 | // Add command buffer to its commandPool map |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3443 | dev_data->commandPoolMap[pCreateInfo->commandPool].commandBuffers.push_back(pCommandBuffer[i]); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3444 | GLOBAL_CB_NODE* pCB = new GLOBAL_CB_NODE; |
| 3445 | // Add command buffer to map |
| 3446 | dev_data->commandBufferMap[pCommandBuffer[i]] = pCB; |
Mark Lobodzinski | 13b6674 | 2015-11-20 14:33:48 -0700 | [diff] [blame] | 3447 | loader_platform_thread_unlock_mutex(&globalLock); |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3448 | resetCB(dev_data, pCommandBuffer[i]); |
| 3449 | pCB->commandBuffer = pCommandBuffer[i]; |
| 3450 | pCB->createInfo = *pCreateInfo; |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 3451 | } |
| 3452 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3453 | } |
| 3454 | return result; |
| 3455 | } |
| 3456 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3457 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo* pBeginInfo) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3458 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3459 | VkBool32 skipCall = false; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3460 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3461 | // Validate command buffer level |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3462 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3463 | if (pCB) { |
Mark Lobodzinski | a142086 | 2015-11-19 13:22:11 -0700 | [diff] [blame] | 3464 | if (pCB->createInfo.level == VK_COMMAND_BUFFER_LEVEL_PRIMARY) { |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3465 | if (pBeginInfo->renderPass || pBeginInfo->framebuffer) { |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3466 | // These should be NULL for a Primary CB |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3467 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3468 | "vkBeginCommandBuffer(): Primary Command Buffer (%p) may not specify framebuffer or renderpass parameters", (void*)commandBuffer); |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3469 | } |
| 3470 | } else { |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3471 | if (!pBeginInfo->renderPass || !pBeginInfo->framebuffer) { |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3472 | // These should NOT be null for an Secondary CB |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3473 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3474 | "vkBeginCommandBuffer(): Secondary Command Buffers (%p) must specify framebuffer and renderpass parameters", (void*)commandBuffer); |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3475 | } |
| 3476 | } |
Tobin Ehlis | 0cea408 | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 3477 | pCB->beginInfo = *pBeginInfo; |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3478 | if (CB_RECORDING == pCB->state) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3479 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_BEGIN_CB_INVALID_STATE, "DS", |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3480 | "vkBeginCommandBuffer(): Cannot call Begin on CB (%#" PRIxLEAST64 ") in the RECORDING state. Must first call vkEndCommandBuffer().", (uint64_t)commandBuffer); |
| 3481 | } else if (CB_RECORDED == pCB->state) { |
| 3482 | VkCommandPool cmdPool = pCB->createInfo.commandPool; |
| 3483 | if (!(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT & dev_data->commandPoolMap[cmdPool].createFlags)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3484 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3485 | 0, DRAWSTATE_INVALID_COMMAND_BUFFER_RESET, "DS", |
| 3486 | "Call to vkBeginCommandBuffer() on command buffer (%#" PRIxLEAST64 ") attempts to implicitly reset cmdBuffer created from command pool (%#" PRIxLEAST64 ") that does NOT have the VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT bit set.", |
| 3487 | (uint64_t) commandBuffer, (uint64_t) cmdPool); |
| 3488 | } |
| 3489 | } |
Tobin Ehlis | 0cea408 | 2015-08-18 07:10:58 -0600 | [diff] [blame] | 3490 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3491 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3492 | "In vkBeginCommandBuffer() and unable to find CommandBuffer Node for CB %p!", (void*)commandBuffer); |
Mark Lobodzinski | 90bf5b0 | 2015-08-04 16:24:20 -0600 | [diff] [blame] | 3493 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3494 | if (skipCall) { |
| 3495 | return VK_ERROR_VALIDATION_FAILED; |
Courtney Goeltzenleuchter | 3abd86e | 2015-09-04 15:03:52 -0600 | [diff] [blame] | 3496 | } |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3497 | VkResult result = dev_data->device_dispatch_table->BeginCommandBuffer(commandBuffer, pBeginInfo); |
Mark Lobodzinski | 2ad3559 | 2015-11-12 16:14:04 -0700 | [diff] [blame] | 3498 | if ((VK_SUCCESS == result) && (pCB != NULL)) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3499 | if (CB_RECORDED == pCB->state) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3500 | resetCB(dev_data, commandBuffer); |
Mark Lobodzinski | 2ad3559 | 2015-11-12 16:14:04 -0700 | [diff] [blame] | 3501 | } |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3502 | pCB->state = CB_RECORDING; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3503 | } |
| 3504 | return result; |
| 3505 | } |
| 3506 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3507 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkEndCommandBuffer(VkCommandBuffer commandBuffer) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3508 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3509 | VkBool32 skipCall = VK_FALSE; |
Courtney Goeltzenleuchter | a54b76a | 2015-09-04 13:39:59 -0600 | [diff] [blame] | 3510 | VkResult result = VK_SUCCESS; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3511 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3512 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3513 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3514 | if (pCB->state != CB_RECORDING) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3515 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkEndCommandBuffer()"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3516 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3517 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3518 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3519 | result = dev_data->device_dispatch_table->EndCommandBuffer(commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3520 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3521 | pCB->state = CB_RECORDED; |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3522 | // Reset CB status flags |
| 3523 | pCB->status = 0; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3524 | printCB(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3525 | } |
| 3526 | } else { |
| 3527 | result = VK_ERROR_VALIDATION_FAILED; |
| 3528 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3529 | return result; |
| 3530 | } |
| 3531 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3532 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkResetCommandBuffer(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3533 | { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3534 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3535 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3536 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
| 3537 | VkCommandPool cmdPool = pCB->createInfo.commandPool; |
| 3538 | if (!(VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT & dev_data->commandPoolMap[cmdPool].createFlags)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3539 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t) commandBuffer, |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3540 | 0, DRAWSTATE_INVALID_COMMAND_BUFFER_RESET, "DS", |
| 3541 | "Attempt to reset command buffer (%#" PRIxLEAST64 ") created from command pool (%#" PRIxLEAST64 ") that does NOT have the VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT bit set.", |
| 3542 | (uint64_t) commandBuffer, (uint64_t) cmdPool); |
| 3543 | } |
| 3544 | if (skipCall) |
| 3545 | return VK_ERROR_VALIDATION_FAILED; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3546 | VkResult result = dev_data->device_dispatch_table->ResetCommandBuffer(commandBuffer, flags); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 3547 | if (VK_SUCCESS == result) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3548 | resetCB(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3549 | } |
| 3550 | return result; |
| 3551 | } |
| 3552 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3553 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3554 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3555 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3556 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3557 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3558 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3559 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3560 | skipCall |= addCmd(dev_data, pCB, CMD_BINDPIPELINE); |
Tobin Ehlis | 642d5a5 | 2015-06-23 08:46:18 -0600 | [diff] [blame] | 3561 | if ((VK_PIPELINE_BIND_POINT_COMPUTE == pipelineBindPoint) && (pCB->activeRenderPass)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3562 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, (uint64_t) pipeline, |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3563 | 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", |
| 3564 | "Incorrectly binding compute pipeline (%#" PRIxLEAST64 ") during active RenderPass (%#" PRIxLEAST64 ")", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3565 | (uint64_t) pipeline, (uint64_t) pCB->activeRenderPass); |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3566 | } else if ((VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) && (!pCB->activeRenderPass)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3567 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, (uint64_t) pipeline, |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3568 | 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", "Incorrectly binding graphics pipeline " |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3569 | " (%#" PRIxLEAST64 ") without an active RenderPass", (uint64_t) pipeline); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3570 | } else { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3571 | PIPELINE_NODE* pPN = getPipeline(dev_data, pipeline); |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3572 | if (pPN) { |
| 3573 | pCB->lastBoundPipeline = pipeline; |
| 3574 | loader_platform_thread_lock_mutex(&globalLock); |
| 3575 | set_cb_pso_status(pCB, pPN); |
| 3576 | g_lastBoundPipeline = pPN; |
| 3577 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3578 | skipCall |= validatePipelineState(dev_data, pCB, pipelineBindPoint, pipeline); |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3579 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3580 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_PIPELINE, (uint64_t) pipeline, |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3581 | 0, DRAWSTATE_INVALID_PIPELINE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 3582 | "Attempt to bind Pipeline %#" PRIxLEAST64 " that doesn't exist!", reinterpret_cast<uint64_t>(pipeline)); |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3583 | } |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3584 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3585 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3586 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindPipeline()"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3587 | } |
| 3588 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3589 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3590 | dev_data->device_dispatch_table->CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3591 | } |
| 3592 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3593 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetViewport( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3594 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3595 | uint32_t viewportCount, |
| 3596 | const VkViewport* pViewports) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3597 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3598 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3599 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3600 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3601 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3602 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3603 | skipCall |= addCmd(dev_data, pCB, CMD_SETVIEWPORTSTATE); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3604 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3605 | pCB->status |= CBSTATUS_VIEWPORT_SET; |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3606 | pCB->viewports.resize(viewportCount); |
Tobin Ehlis | 9e839e5 | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 3607 | memcpy(pCB->viewports.data(), pViewports, viewportCount * sizeof(VkViewport)); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3608 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3609 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3610 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetViewport()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3611 | } |
| 3612 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3613 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3614 | dev_data->device_dispatch_table->CmdSetViewport(commandBuffer, viewportCount, pViewports); |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3615 | } |
| 3616 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3617 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetScissor( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3618 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3619 | uint32_t scissorCount, |
| 3620 | const VkRect2D* pScissors) |
| 3621 | { |
| 3622 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3623 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3624 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3625 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3626 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3627 | skipCall |= addCmd(dev_data, pCB, CMD_SETSCISSORSTATE); |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3628 | loader_platform_thread_lock_mutex(&globalLock); |
| 3629 | pCB->status |= CBSTATUS_SCISSOR_SET; |
| 3630 | pCB->scissors.resize(scissorCount); |
Tobin Ehlis | 9e839e5 | 2015-10-01 11:15:13 -0600 | [diff] [blame] | 3631 | memcpy(pCB->scissors.data(), pScissors, scissorCount * sizeof(VkRect2D)); |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3632 | loader_platform_thread_unlock_mutex(&globalLock); |
| 3633 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3634 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetScissor()"); |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 3635 | } |
| 3636 | } |
| 3637 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3638 | dev_data->device_dispatch_table->CmdSetScissor(commandBuffer, scissorCount, pScissors); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3639 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3640 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3641 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3642 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3643 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3644 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3645 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3646 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3647 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3648 | skipCall |= addCmd(dev_data, pCB, CMD_SETLINEWIDTHSTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3649 | /* TODO: Do we still need this lock? */ |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3650 | loader_platform_thread_lock_mutex(&globalLock); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3651 | pCB->status |= CBSTATUS_LINE_WIDTH_SET; |
| 3652 | pCB->lineWidth = lineWidth; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3653 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3654 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3655 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindDynamicLineWidthState()"); |
Cody Northrop | f5bd225 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 3656 | } |
| 3657 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3658 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3659 | dev_data->device_dispatch_table->CmdSetLineWidth(commandBuffer, lineWidth); |
Cody Northrop | f5bd225 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 3660 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3661 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3662 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBias( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3663 | VkCommandBuffer commandBuffer, |
Chia-I Wu | fa950c5 | 2015-10-26 19:08:09 +0800 | [diff] [blame] | 3664 | float depthBiasConstantFactor, |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3665 | float depthBiasClamp, |
Chia-I Wu | fa950c5 | 2015-10-26 19:08:09 +0800 | [diff] [blame] | 3666 | float depthBiasSlopeFactor) |
Cody Northrop | f5bd225 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 3667 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3668 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3669 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3670 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Cody Northrop | f5bd225 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 3671 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3672 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3673 | skipCall |= addCmd(dev_data, pCB, CMD_SETDEPTHBIASSTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3674 | pCB->status |= CBSTATUS_DEPTH_BIAS_SET; |
Chia-I Wu | fa950c5 | 2015-10-26 19:08:09 +0800 | [diff] [blame] | 3675 | pCB->depthBiasConstantFactor = depthBiasConstantFactor; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3676 | pCB->depthBiasClamp = depthBiasClamp; |
Chia-I Wu | fa950c5 | 2015-10-26 19:08:09 +0800 | [diff] [blame] | 3677 | pCB->depthBiasSlopeFactor = depthBiasSlopeFactor; |
Cody Northrop | f5bd225 | 2015-08-17 11:10:49 -0600 | [diff] [blame] | 3678 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3679 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetDepthBias()"); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3680 | } |
| 3681 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3682 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3683 | dev_data->device_dispatch_table->CmdSetDepthBias(commandBuffer, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3684 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3685 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3686 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3687 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3688 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3689 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3690 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3691 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3692 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3693 | skipCall |= addCmd(dev_data, pCB, CMD_SETBLENDSTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3694 | pCB->status |= CBSTATUS_BLEND_SET; |
Chia-I Wu | 7e47070 | 2015-10-26 17:24:52 +0800 | [diff] [blame] | 3695 | memcpy(pCB->blendConstants, blendConstants, 4 * sizeof(float)); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3696 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3697 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetBlendConstants()"); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3698 | } |
| 3699 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3700 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3701 | dev_data->device_dispatch_table->CmdSetBlendConstants(commandBuffer, blendConstants); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3702 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3703 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3704 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetDepthBounds( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3705 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3706 | float minDepthBounds, |
| 3707 | float maxDepthBounds) |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3708 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3709 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3710 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3711 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3712 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3713 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3714 | skipCall |= addCmd(dev_data, pCB, CMD_SETDEPTHBOUNDSSTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3715 | pCB->status |= CBSTATUS_DEPTH_BOUNDS_SET; |
| 3716 | pCB->minDepthBounds = minDepthBounds; |
| 3717 | pCB->maxDepthBounds = maxDepthBounds; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3718 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3719 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetDepthBounds()"); |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 3720 | } |
| 3721 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3722 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3723 | dev_data->device_dispatch_table->CmdSetDepthBounds(commandBuffer, minDepthBounds, maxDepthBounds); |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 3724 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3725 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3726 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilCompareMask( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3727 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3728 | VkStencilFaceFlags faceMask, |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3729 | uint32_t compareMask) |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 3730 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3731 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3732 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3733 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 3734 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3735 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3736 | skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILREADMASKSTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3737 | if (faceMask & VK_STENCIL_FACE_FRONT_BIT) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3738 | pCB->front.compareMask = compareMask; |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 3739 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3740 | if (faceMask & VK_STENCIL_FACE_BACK_BIT) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3741 | pCB->back.compareMask = compareMask; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3742 | } |
| 3743 | /* TODO: Do we need to track front and back separately? */ |
| 3744 | /* TODO: We aren't capturing the faceMask, do we need to? */ |
| 3745 | pCB->status |= CBSTATUS_STENCIL_READ_MASK_SET; |
Cody Northrop | 2605cb0 | 2015-08-18 15:21:16 -0600 | [diff] [blame] | 3746 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3747 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetStencilCompareMask()"); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3748 | } |
| 3749 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3750 | if (VK_FALSE == skipCall) |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3751 | dev_data->device_dispatch_table->CmdSetStencilCompareMask(commandBuffer, faceMask, compareMask); |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 3752 | } |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3753 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3754 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilWriteMask( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3755 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3756 | VkStencilFaceFlags faceMask, |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3757 | uint32_t writeMask) |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3758 | { |
| 3759 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3760 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3761 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3762 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3763 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3764 | skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILWRITEMASKSTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3765 | if (faceMask & VK_STENCIL_FACE_FRONT_BIT) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3766 | pCB->front.writeMask = writeMask; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3767 | } |
| 3768 | if (faceMask & VK_STENCIL_FACE_BACK_BIT) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3769 | pCB->back.writeMask = writeMask; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3770 | } |
| 3771 | pCB->status |= CBSTATUS_STENCIL_WRITE_MASK_SET; |
| 3772 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3773 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetStencilWriteMask()"); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3774 | } |
| 3775 | } |
| 3776 | if (VK_FALSE == skipCall) |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3777 | dev_data->device_dispatch_table->CmdSetStencilWriteMask(commandBuffer, faceMask, writeMask); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3778 | } |
| 3779 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3780 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetStencilReference( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3781 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3782 | VkStencilFaceFlags faceMask, |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3783 | uint32_t reference) |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3784 | { |
| 3785 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3786 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3787 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3788 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3789 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3790 | skipCall |= addCmd(dev_data, pCB, CMD_SETSTENCILREFERENCESTATE); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3791 | if (faceMask & VK_STENCIL_FACE_FRONT_BIT) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3792 | pCB->front.reference = reference; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3793 | } |
| 3794 | if (faceMask & VK_STENCIL_FACE_BACK_BIT) { |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3795 | pCB->back.reference = reference; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3796 | } |
| 3797 | pCB->status |= CBSTATUS_STENCIL_REFERENCE_SET; |
| 3798 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3799 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetStencilReference()"); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3800 | } |
| 3801 | } |
| 3802 | if (VK_FALSE == skipCall) |
Chia-I Wu | c51b121 | 2015-10-27 19:25:11 +0800 | [diff] [blame] | 3803 | dev_data->device_dispatch_table->CmdSetStencilReference(commandBuffer, faceMask, reference); |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 3804 | } |
| 3805 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3806 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t setCount, const VkDescriptorSet* pDescriptorSets, uint32_t dynamicOffsetCount, const uint32_t* pDynamicOffsets) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3807 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3808 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3809 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3810 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3811 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3812 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3813 | if ((VK_PIPELINE_BIND_POINT_COMPUTE == pipelineBindPoint) && (pCB->activeRenderPass)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 3814 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_RENDERPASS_CMD, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3815 | "Incorrectly binding compute DescriptorSets during active RenderPass (%#" PRIxLEAST64 ")", (uint64_t) pCB->activeRenderPass); |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3816 | } else if ((VK_PIPELINE_BIND_POINT_GRAPHICS == pipelineBindPoint) && (!pCB->activeRenderPass)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 3817 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_NO_ACTIVE_RENDERPASS, "DS", |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3818 | "Incorrectly binding graphics DescriptorSets without an active RenderPass"); |
Tobin Ehlis | d28acef | 2015-09-09 15:12:35 -0600 | [diff] [blame] | 3819 | } else { |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3820 | // Track total count of dynamic descriptor types to make sure we have an offset for each one |
| 3821 | uint32_t totalDynamicDescriptors = 0; |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3822 | string errorString = ""; |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 3823 | uint32_t lastSetIndex = firstSet+setCount-1; |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3824 | if (lastSetIndex >= pCB->boundDescriptorSets.size()) |
| 3825 | pCB->boundDescriptorSets.resize(lastSetIndex+1); |
| 3826 | VkDescriptorSet oldFinalBoundSet = pCB->boundDescriptorSets[lastSetIndex]; |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3827 | for (uint32_t i=0; i<setCount; i++) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3828 | SET_NODE* pSet = getSetNode(dev_data, pDescriptorSets[i]); |
Tobin Ehlis | 55c1c60 | 2015-06-24 17:27:33 -0600 | [diff] [blame] | 3829 | if (pSet) { |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3830 | loader_platform_thread_lock_mutex(&globalLock); |
| 3831 | pCB->lastBoundDescriptorSet = pDescriptorSets[i]; |
Tobin Ehlis | c6c3d6d | 2015-06-22 17:20:50 -0600 | [diff] [blame] | 3832 | pCB->lastBoundPipelineLayout = layout; |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3833 | pCB->boundDescriptorSets[i+firstSet] = pDescriptorSets[i]; |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3834 | loader_platform_thread_unlock_mutex(&globalLock); |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3835 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3836 | "DS %#" PRIxLEAST64 " bound on pipeline %s", (uint64_t) pDescriptorSets[i], string_VkPipelineBindPoint(pipelineBindPoint)); |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3837 | if (!pSet->pUpdateStructs) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3838 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_DESCRIPTOR_SET_NOT_UPDATED, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3839 | "DS %#" PRIxLEAST64 " bound but it was never updated. You may want to either update it or not bind it.", (uint64_t) pDescriptorSets[i]); |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3840 | } |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3841 | // Verify that set being bound is compatible with overlapping setLayout of pipelineLayout |
| 3842 | if (!verify_set_layout_compatibility(dev_data, pSet, layout, i+firstSet, errorString)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3843 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_PIPELINE_LAYOUTS_INCOMPATIBLE, "DS", |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3844 | "descriptorSet #%u being bound is not compatible with overlapping layout in pipelineLayout due to: %s", i, errorString.c_str()); |
| 3845 | } |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3846 | totalDynamicDescriptors += pSet->pLayout->dynamicDescriptorCount; |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3847 | } else { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3848 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pDescriptorSets[i], 0, DRAWSTATE_INVALID_SET, "DS", |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 3849 | "Attempt to bind DS %#" PRIxLEAST64 " that doesn't exist!", (uint64_t) pDescriptorSets[i]); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3850 | } |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 3851 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3852 | skipCall |= addCmd(dev_data, pCB, CMD_BINDDESCRIPTORSETS); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3853 | // For any previously bound sets, need to set them to "invalid" if they were disturbed by this update |
| 3854 | if (firstSet > 0) { // Check set #s below the first bound set |
| 3855 | for (uint32_t i=0; i<firstSet; ++i) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 3856 | if (pCB->boundDescriptorSets[i] && !verify_set_layout_compatibility(dev_data, dev_data->setMap[pCB->boundDescriptorSets[i]], layout, i, errorString)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3857 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_PERF_WARN_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) pCB->boundDescriptorSets[i], 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3858 | "DescriptorSetDS %#" PRIxLEAST64 " previously bound as set #%u was disturbed by newly bound pipelineLayout (%#" PRIxLEAST64 ")", (uint64_t) pCB->boundDescriptorSets[i], i, (uint64_t) layout); |
| 3859 | pCB->boundDescriptorSets[i] = VK_NULL_HANDLE; |
| 3860 | } |
| 3861 | } |
| 3862 | } |
| 3863 | // Check if newly last bound set invalidates any remaining bound sets |
| 3864 | if ((pCB->boundDescriptorSets.size()-1) > (lastSetIndex)) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 3865 | if (oldFinalBoundSet && !verify_set_layout_compatibility(dev_data, dev_data->setMap[oldFinalBoundSet], layout, lastSetIndex, errorString)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3866 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_PERF_WARN_BIT, VK_OBJECT_TYPE_DESCRIPTOR_SET, (uint64_t) oldFinalBoundSet, 0, DRAWSTATE_NONE, "DS", |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 3867 | "DescriptorSetDS %#" PRIxLEAST64 " previously bound as set #%u is incompatible with set %#" PRIxLEAST64 " newly bound as set #%u so set #%u and any subsequent sets were disturbed by newly bound pipelineLayout (%#" PRIxLEAST64 ")", (uint64_t) oldFinalBoundSet, lastSetIndex, (uint64_t) pCB->boundDescriptorSets[lastSetIndex], lastSetIndex, lastSetIndex+1, (uint64_t) layout); |
Tobin Ehlis | 982099b | 2015-11-05 09:52:49 -0700 | [diff] [blame] | 3868 | pCB->boundDescriptorSets.resize(lastSetIndex+1); |
| 3869 | } |
| 3870 | } |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3871 | // dynamicOffsetCount must equal the total number of dynamic descriptors in the sets being bound |
| 3872 | if (totalDynamicDescriptors != dynamicOffsetCount) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3873 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t) commandBuffer, 0, DRAWSTATE_INVALID_DYNAMIC_OFFSET_COUNT, "DS", |
Tobin Ehlis | 61ebb31 | 2015-11-04 12:28:28 -0700 | [diff] [blame] | 3874 | "Attempting to bind %u descriptorSets with %u dynamic descriptors, but dynamicOffsetCount is %u. It should exactly match the number of dynamic descriptors.", setCount, totalDynamicDescriptors, dynamicOffsetCount); |
| 3875 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3876 | } |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3877 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3878 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindDescriptorSets()"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3879 | } |
| 3880 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3881 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3882 | dev_data->device_dispatch_table->CmdBindDescriptorSets(commandBuffer, pipelineBindPoint, layout, firstSet, setCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3883 | } |
| 3884 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3885 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3886 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3887 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3888 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3889 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3890 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3891 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 8d199e5 | 2015-09-17 12:24:13 -0600 | [diff] [blame] | 3892 | VkDeviceSize offset_align = 0; |
| 3893 | switch (indexType) { |
| 3894 | case VK_INDEX_TYPE_UINT16: |
| 3895 | offset_align = 2; |
| 3896 | break; |
| 3897 | case VK_INDEX_TYPE_UINT32: |
| 3898 | offset_align = 4; |
| 3899 | break; |
| 3900 | default: |
| 3901 | // ParamChecker should catch bad enum, we'll also throw alignment error below if offset_align stays 0 |
| 3902 | break; |
| 3903 | } |
| 3904 | if (!offset_align || (offset % offset_align)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 3905 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_VTX_INDEX_ALIGNMENT_ERROR, "DS", |
Tobin Ehlis | 8d199e5 | 2015-09-17 12:24:13 -0600 | [diff] [blame] | 3906 | "vkCmdBindIndexBuffer() offset (%#" PRIxLEAST64 ") does not fall on alignment (%s) boundary.", offset, string_VkIndexType(indexType)); |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 3907 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3908 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3909 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindIndexBuffer()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3910 | } |
Tobin Ehlis | 8d199e5 | 2015-09-17 12:24:13 -0600 | [diff] [blame] | 3911 | pCB->status |= CBSTATUS_INDEX_BUFFER_BOUND; |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3912 | skipCall |= addCmd(dev_data, pCB, CMD_BINDINDEXBUFFER); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3913 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3914 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3915 | dev_data->device_dispatch_table->CmdBindIndexBuffer(commandBuffer, buffer, offset, indexType); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3916 | } |
| 3917 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3918 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBindVertexBuffers( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3919 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 4696294 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 3920 | uint32_t startBinding, |
| 3921 | uint32_t bindingCount, |
| 3922 | const VkBuffer* pBuffers, |
Tony Barbour | 8205d90 | 2015-04-16 15:59:00 -0600 | [diff] [blame] | 3923 | const VkDeviceSize* pOffsets) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3924 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3925 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3926 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3927 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3928 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3929 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3930 | /* TODO: Need to track all the vertex buffers, not just last one */ |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 3931 | pCB->lastVtxBinding = startBinding + bindingCount -1; |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3932 | addCmd(dev_data, pCB, CMD_BINDVERTEXBUFFER); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3933 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3934 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBindVertexBuffer()"); |
Tobin Ehlis | 0b551cd | 2015-05-28 12:10:17 -0600 | [diff] [blame] | 3935 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3936 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3937 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3938 | dev_data->device_dispatch_table->CmdBindVertexBuffers(commandBuffer, startBinding, bindingCount, pBuffers, pOffsets); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3939 | } |
| 3940 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3941 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3942 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3943 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3944 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3945 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3946 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3947 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3948 | pCB->drawCount[DRAW]++; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3949 | skipCall |= validate_draw_state(dev_data, pCB, VK_FALSE); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3950 | // TODO : Need to pass commandBuffer as srcObj here |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3951 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 3952 | "vkCmdDraw() call #%" PRIu64 ", reporting DS state:", g_drawCount[DRAW]++); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3953 | skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3954 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3955 | skipCall |= addCmd(dev_data, pCB, CMD_DRAW); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3956 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3957 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3958 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDraw()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3959 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3960 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDraw"); |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 3961 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3962 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3963 | dev_data->device_dispatch_table->CmdDraw(commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3964 | } |
| 3965 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3966 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3967 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3968 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3969 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3970 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3971 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3972 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3973 | pCB->drawCount[DRAW_INDEXED]++; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3974 | skipCall |= validate_draw_state(dev_data, pCB, VK_TRUE); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3975 | // TODO : Need to pass commandBuffer as srcObj here |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 3976 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 3977 | "vkCmdDrawIndexed() call #%" PRIu64 ", reporting DS state:", g_drawCount[DRAW_INDEXED]++); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3978 | skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3979 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3980 | skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDEXED); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3981 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 3982 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3983 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDrawIndexed()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3984 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 3985 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndexed"); |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 3986 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3987 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3988 | dev_data->device_dispatch_table->CmdDrawIndexed(commandBuffer, indexCount, instanceCount, firstIndex, vertexOffset, firstInstance); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3989 | } |
| 3990 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 3991 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3992 | { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 3993 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 3994 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 3995 | VkBool32 skipCall = VK_FALSE; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 3996 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 3997 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 3998 | pCB->drawCount[DRAW_INDIRECT]++; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 3999 | skipCall |= validate_draw_state(dev_data, pCB, VK_FALSE); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4000 | // TODO : Need to pass commandBuffer as srcObj here |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4001 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 4002 | "vkCmdDrawIndirect() call #%" PRIu64 ", reporting DS state:", g_drawCount[DRAW_INDIRECT]++); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4003 | skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4004 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4005 | skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDIRECT); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4006 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4007 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4008 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDrawIndirect()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4009 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4010 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndirect"); |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 4011 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4012 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4013 | dev_data->device_dispatch_table->CmdDrawIndirect(commandBuffer, buffer, offset, count, stride); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4014 | } |
| 4015 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4016 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t count, uint32_t stride) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4017 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4018 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4019 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4020 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4021 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4022 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4023 | pCB->drawCount[DRAW_INDEXED_INDIRECT]++; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 4024 | skipCall |= validate_draw_state(dev_data, pCB, VK_TRUE); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4025 | // TODO : Need to pass commandBuffer as srcObj here |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4026 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_INFO_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_NONE, "DS", |
Michael Lentine | cbc4a5e | 2015-11-03 16:19:46 -0800 | [diff] [blame] | 4027 | "vkCmdDrawIndexedIndirect() call #%" PRIu64 ", reporting DS state:", g_drawCount[DRAW_INDEXED_INDIRECT]++); |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4028 | skipCall |= synchAndPrintDSConfig(dev_data, commandBuffer); |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4029 | if (VK_FALSE == skipCall) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4030 | skipCall |= addCmd(dev_data, pCB, CMD_DRAWINDEXEDINDIRECT); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4031 | } |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4032 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4033 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDrawIndexedIndirect()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4034 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4035 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdDrawIndexedIndirect"); |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 4036 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4037 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4038 | dev_data->device_dispatch_table->CmdDrawIndexedIndirect(commandBuffer, buffer, offset, count, stride); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4039 | } |
| 4040 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4041 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4042 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4043 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4044 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4045 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4046 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4047 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4048 | skipCall |= addCmd(dev_data, pCB, CMD_DISPATCH); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4049 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4050 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDispatch()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4051 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4052 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdDispatch"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4053 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4054 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4055 | dev_data->device_dispatch_table->CmdDispatch(commandBuffer, x, y, z); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4056 | } |
| 4057 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4058 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4059 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4060 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4061 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4062 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4063 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4064 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4065 | skipCall |= addCmd(dev_data, pCB, CMD_DISPATCHINDIRECT); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4066 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4067 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdDispatchIndirect()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4068 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4069 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdDispatchIndirect"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4070 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4071 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4072 | dev_data->device_dispatch_table->CmdDispatchIndirect(commandBuffer, buffer, offset); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4073 | } |
| 4074 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4075 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, uint32_t regionCount, const VkBufferCopy* pRegions) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4076 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4077 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4078 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4079 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4080 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4081 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4082 | skipCall |= addCmd(dev_data, pCB, CMD_COPYBUFFER); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4083 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4084 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyBuffer()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4085 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4086 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyBuffer"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4087 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4088 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4089 | dev_data->device_dispatch_table->CmdCopyBuffer(commandBuffer, srcBuffer, dstBuffer, regionCount, pRegions); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4090 | } |
| 4091 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4092 | bool VerifySourceImageLayout(VkCommandBuffer cmdBuffer, VkImage srcImage, VkImageLayout srcImageLayout) { |
| 4093 | bool skip_call = false; |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 4094 | |
| 4095 | #ifdef DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4096 | // TODO: Fix -- initialLayout may have been set in a previous command buffer |
| 4097 | return skip_call; |
| 4098 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4099 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4100 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 4101 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 4102 | auto src_image_element = pCB->imageLayoutMap.find(srcImage); |
| 4103 | if (src_image_element == pCB->imageLayoutMap.end()) { |
| 4104 | pCB->imageLayoutMap[srcImage].initialLayout = srcImageLayout; |
| 4105 | pCB->imageLayoutMap[srcImage].layout = srcImageLayout; |
| 4106 | return false; |
| 4107 | } |
| 4108 | if (src_image_element->second.layout != srcImageLayout) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4109 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4110 | "Cannot copy from an image whose source layout is %d and doesn't match the current layout %d.", srcImageLayout, src_image_element->second.layout); |
| 4111 | } |
| 4112 | if (srcImageLayout != VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL) { |
| 4113 | if (srcImageLayout == VK_IMAGE_LAYOUT_GENERAL) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4114 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4115 | "Layout for input image should be TRANSFER_SRC_OPTIMAL instead of GENERAL."); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4116 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4117 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4118 | "Layout for input image is %d but can only be TRANSFER_SRC_OPTIMAL or GENERAL.", srcImageLayout); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4119 | } |
| 4120 | } |
| 4121 | return skip_call; |
| 4122 | } |
| 4123 | |
| 4124 | bool VerifyDestImageLayout(VkCommandBuffer cmdBuffer, VkImage destImage, VkImageLayout destImageLayout) { |
| 4125 | bool skip_call = false; |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 4126 | |
| 4127 | #ifdef DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4128 | // TODO: Fix -- initialLayout may have been set in a previous command buffer |
| 4129 | return skip_call; |
| 4130 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4131 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4132 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 4133 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 4134 | auto dest_image_element = pCB->imageLayoutMap.find(destImage); |
| 4135 | if (dest_image_element == pCB->imageLayoutMap.end()) { |
| 4136 | pCB->imageLayoutMap[destImage].initialLayout = destImageLayout; |
| 4137 | pCB->imageLayoutMap[destImage].layout = destImageLayout; |
| 4138 | return false; |
| 4139 | } |
| 4140 | if (dest_image_element->second.layout != destImageLayout) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4141 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4142 | "Cannot copy from an image whose dest layout is %d and doesn't match the current layout %d.", destImageLayout, dest_image_element->second.layout); |
| 4143 | } |
| 4144 | if (destImageLayout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL) { |
| 4145 | if (destImageLayout == VK_IMAGE_LAYOUT_GENERAL) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4146 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4147 | "Layout for output image should be TRANSFER_DST_OPTIMAL instead of GENERAL."); |
| 4148 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4149 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4150 | "Layout for output image is %d but can only be TRANSFER_DST_OPTIMAL or GENERAL.", destImageLayout); |
| 4151 | } |
| 4152 | } |
| 4153 | return skip_call; |
| 4154 | } |
| 4155 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4156 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyImage(VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4157 | VkImage srcImage, |
| 4158 | VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4159 | VkImage dstImage, |
| 4160 | VkImageLayout dstImageLayout, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4161 | uint32_t regionCount, const VkImageCopy* pRegions) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4162 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4163 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4164 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4165 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4166 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4167 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4168 | skipCall |= addCmd(dev_data, pCB, CMD_COPYIMAGE); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4169 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4170 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyImage()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4171 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4172 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyImage"); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4173 | skipCall |= VerifySourceImageLayout(commandBuffer, srcImage, srcImageLayout); |
| 4174 | skipCall |= VerifyDestImageLayout(commandBuffer, dstImage, dstImageLayout); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4175 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4176 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4177 | dev_data->device_dispatch_table->CmdCopyImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4178 | } |
| 4179 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4180 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBlitImage(VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4181 | VkImage srcImage, VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4182 | VkImage dstImage, VkImageLayout dstImageLayout, |
Mark Lobodzinski | 20f6859 | 2015-05-22 14:43:25 -0500 | [diff] [blame] | 4183 | uint32_t regionCount, const VkImageBlit* pRegions, |
Chia-I Wu | 3603b08 | 2015-10-26 16:49:32 +0800 | [diff] [blame] | 4184 | VkFilter filter) |
Courtney Goeltzenleuchter | 6ff8ebc | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 4185 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4186 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4187 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4188 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Courtney Goeltzenleuchter | 6ff8ebc | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 4189 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4190 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4191 | skipCall |= addCmd(dev_data, pCB, CMD_BLITIMAGE); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4192 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4193 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBlitImage()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4194 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4195 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdBlitImage"); |
Courtney Goeltzenleuchter | 6ff8ebc | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 4196 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4197 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4198 | dev_data->device_dispatch_table->CmdBlitImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions, filter); |
Courtney Goeltzenleuchter | 6ff8ebc | 2015-04-03 14:42:51 -0600 | [diff] [blame] | 4199 | } |
| 4200 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4201 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyBufferToImage(VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4202 | VkBuffer srcBuffer, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4203 | VkImage dstImage, VkImageLayout dstImageLayout, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4204 | uint32_t regionCount, const VkBufferImageCopy* pRegions) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4205 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4206 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4207 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4208 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4209 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4210 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4211 | skipCall |= addCmd(dev_data, pCB, CMD_COPYBUFFERTOIMAGE); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4212 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4213 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyBufferToImage()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4214 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4215 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyBufferToImage"); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4216 | skipCall |= VerifyDestImageLayout(commandBuffer, dstImage, dstImageLayout); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4217 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4218 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4219 | dev_data->device_dispatch_table->CmdCopyBufferToImage(commandBuffer, srcBuffer, dstImage, dstImageLayout, regionCount, pRegions); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4220 | } |
| 4221 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4222 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyImageToBuffer(VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4223 | VkImage srcImage, VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4224 | VkBuffer dstBuffer, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4225 | uint32_t regionCount, const VkBufferImageCopy* pRegions) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4226 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4227 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4228 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4229 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4230 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4231 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4232 | skipCall |= addCmd(dev_data, pCB, CMD_COPYIMAGETOBUFFER); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4233 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4234 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyImageToBuffer()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4235 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4236 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyImageToBuffer"); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4237 | skipCall |= VerifySourceImageLayout(commandBuffer, srcImage, srcImageLayout); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4238 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4239 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4240 | dev_data->device_dispatch_table->CmdCopyImageToBuffer(commandBuffer, srcImage, srcImageLayout, dstBuffer, regionCount, pRegions); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4241 | } |
| 4242 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4243 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const uint32_t* pData) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4244 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4245 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4246 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4247 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4248 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4249 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4250 | skipCall |= addCmd(dev_data, pCB, CMD_UPDATEBUFFER); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4251 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4252 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdUpdateBuffer()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4253 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4254 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyUpdateBuffer"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4255 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4256 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4257 | dev_data->device_dispatch_table->CmdUpdateBuffer(commandBuffer, dstBuffer, dstOffset, dataSize, pData); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4258 | } |
| 4259 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4260 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, uint32_t data) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4261 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4262 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4263 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4264 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4265 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4266 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4267 | skipCall |= addCmd(dev_data, pCB, CMD_FILLBUFFER); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4268 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4269 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdFillBuffer()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4270 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4271 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyFillBuffer"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4272 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4273 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4274 | dev_data->device_dispatch_table->CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4275 | } |
| 4276 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4277 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdClearAttachments( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4278 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4279 | uint32_t attachmentCount, |
| 4280 | const VkClearAttachment* pAttachments, |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4281 | uint32_t rectCount, |
Courtney Goeltzenleuchter | a12e291 | 2015-10-15 18:22:08 -0600 | [diff] [blame] | 4282 | const VkClearRect* pRects) |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4283 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4284 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4285 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4286 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4287 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4288 | if (pCB->state == CB_RECORDING) { |
Mark Lobodzinski | 92c712c | 2015-12-08 13:47:14 -0700 | [diff] [blame] | 4289 | // Warn if this is issued prior to Draw Cmd and clearing the entire attachment |
| 4290 | if (!hasDrawCmd(pCB) && |
| 4291 | (pCB->activeRenderPassBeginInfo.renderArea.extent.width == pRects[0].rect.extent.width) && |
| 4292 | (pCB->activeRenderPassBeginInfo.renderArea.extent.height == pRects[0].rect.extent.height)) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4293 | // TODO : commandBuffer should be srcObj |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4294 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_WARN_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, 0, 0, DRAWSTATE_CLEAR_CMD_BEFORE_DRAW, "DS", |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4295 | "vkCmdClearAttachments() issued on CB object 0x%" PRIxLEAST64 " prior to any Draw Cmds." |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4296 | " It is recommended you use RenderPass LOAD_OP_CLEAR on Attachments prior to any Draw.", reinterpret_cast<uint64_t>(commandBuffer)); |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4297 | } |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4298 | skipCall |= addCmd(dev_data, pCB, CMD_CLEARATTACHMENTS); |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4299 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4300 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdClearAttachments()"); |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4301 | } |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4302 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdClearAttachments"); |
| 4303 | } |
| 4304 | |
| 4305 | // Validate that attachment is in reference list of active subpass |
| 4306 | if (pCB->activeRenderPass) { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 4307 | const VkRenderPassCreateInfo *pRPCI = dev_data->renderPassMap[pCB->activeRenderPass]->pCreateInfo; |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4308 | const VkSubpassDescription *pSD = &pRPCI->pSubpasses[pCB->activeSubpass]; |
| 4309 | |
| 4310 | for (uint32_t attachment_idx = 0; attachment_idx < attachmentCount; attachment_idx++) { |
| 4311 | const VkClearAttachment *attachment = &pAttachments[attachment_idx]; |
| 4312 | if (attachment->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { |
| 4313 | VkBool32 found = VK_FALSE; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4314 | for (uint32_t i = 0; i < pSD->colorAttachmentCount; i++) { |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4315 | if (attachment->colorAttachment == pSD->pColorAttachments[i].attachment) { |
| 4316 | found = VK_TRUE; |
| 4317 | break; |
| 4318 | } |
| 4319 | } |
| 4320 | if (VK_FALSE == found) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4321 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4322 | (uint64_t)commandBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4323 | "vkCmdClearAttachments() attachment index %d not found in attachment reference array of active subpass %d", |
| 4324 | attachment->colorAttachment, pCB->activeSubpass); |
| 4325 | } |
| 4326 | } else if (attachment->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { |
Mark Lobodzinski | 1523e3a | 2015-11-17 15:11:24 -0700 | [diff] [blame] | 4327 | if (!pSD->pDepthStencilAttachment || // Says no DS will be used in active subpass |
Mark Lobodzinski | ea1fff2 | 2015-11-18 08:58:31 -0700 | [diff] [blame] | 4328 | (pSD->pDepthStencilAttachment->attachment == VK_ATTACHMENT_UNUSED)) { // Says no DS will be used in active subpass |
Mark Lobodzinski | 1523e3a | 2015-11-17 15:11:24 -0700 | [diff] [blame] | 4329 | |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4330 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, |
Mark Lobodzinski | 1523e3a | 2015-11-17 15:11:24 -0700 | [diff] [blame] | 4331 | (uint64_t)commandBuffer, 0, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", |
| 4332 | "vkCmdClearAttachments() attachment index %d does not match depthStencilAttachment.attachment (%d) found in active subpass %d", |
| 4333 | attachment->colorAttachment, |
| 4334 | (pSD->pDepthStencilAttachment) ? pSD->pDepthStencilAttachment->attachment : VK_ATTACHMENT_UNUSED, |
| 4335 | pCB->activeSubpass); |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 4336 | } |
| 4337 | } |
| 4338 | } |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4339 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4340 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4341 | dev_data->device_dispatch_table->CmdClearAttachments(commandBuffer, attachmentCount, pAttachments, rectCount, pRects); |
Tobin Ehlis | 8cd650e | 2015-07-01 16:46:13 -0600 | [diff] [blame] | 4342 | } |
| 4343 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4344 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdClearColorImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4345 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | da4a99e | 2015-04-23 17:49:22 -0600 | [diff] [blame] | 4346 | VkImage image, VkImageLayout imageLayout, |
Chris Forbes | e310597 | 2015-06-24 14:34:53 +1200 | [diff] [blame] | 4347 | const VkClearColorValue *pColor, |
Courtney Goeltzenleuchter | da4a99e | 2015-04-23 17:49:22 -0600 | [diff] [blame] | 4348 | uint32_t rangeCount, const VkImageSubresourceRange* pRanges) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4349 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4350 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4351 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4352 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4353 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4354 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4355 | skipCall |= addCmd(dev_data, pCB, CMD_CLEARCOLORIMAGE); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4356 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4357 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdClearColorImage()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4358 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4359 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdClearColorImage"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4360 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4361 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4362 | dev_data->device_dispatch_table->CmdClearColorImage(commandBuffer, image, imageLayout, pColor, rangeCount, pRanges); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4363 | } |
| 4364 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4365 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdClearDepthStencilImage( |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4366 | VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 315ad99 | 2015-09-15 18:03:22 -0600 | [diff] [blame] | 4367 | VkImage image, VkImageLayout imageLayout, |
| 4368 | const VkClearDepthStencilValue *pDepthStencil, |
| 4369 | uint32_t rangeCount, |
| 4370 | const VkImageSubresourceRange* pRanges) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4371 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4372 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4373 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4374 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4375 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4376 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4377 | skipCall |= addCmd(dev_data, pCB, CMD_CLEARDEPTHSTENCILIMAGE); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4378 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4379 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdClearDepthStencilImage()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4380 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4381 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdClearDepthStencilImage"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4382 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4383 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4384 | dev_data->device_dispatch_table->CmdClearDepthStencilImage(commandBuffer, image, imageLayout, pDepthStencil, rangeCount, pRanges); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4385 | } |
| 4386 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4387 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdResolveImage(VkCommandBuffer commandBuffer, |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4388 | VkImage srcImage, VkImageLayout srcImageLayout, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4389 | VkImage dstImage, VkImageLayout dstImageLayout, |
Tony Barbour | 11f7437 | 2015-04-13 15:02:52 -0600 | [diff] [blame] | 4390 | uint32_t regionCount, const VkImageResolve* pRegions) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4391 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4392 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4393 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4394 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4395 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4396 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4397 | skipCall |= addCmd(dev_data, pCB, CMD_RESOLVEIMAGE); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4398 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4399 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdResolveImage()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4400 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4401 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdResolveImage"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4402 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4403 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4404 | dev_data->device_dispatch_table->CmdResolveImage(commandBuffer, srcImage, srcImageLayout, dstImage, dstImageLayout, regionCount, pRegions); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4405 | } |
| 4406 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4407 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4408 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4409 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4410 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4411 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4412 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4413 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4414 | skipCall |= addCmd(dev_data, pCB, CMD_SETEVENT); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4415 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4416 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdSetEvent()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4417 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4418 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdSetEvent"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4419 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4420 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4421 | dev_data->device_dispatch_table->CmdSetEvent(commandBuffer, event, stageMask); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4422 | } |
| 4423 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4424 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdResetEvent(VkCommandBuffer commandBuffer, VkEvent event, VkPipelineStageFlags stageMask) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4425 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4426 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4427 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4428 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4429 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4430 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4431 | skipCall |= addCmd(dev_data, pCB, CMD_RESETEVENT); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4432 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4433 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdResetEvent()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4434 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4435 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdResetEvent"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4436 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4437 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4438 | dev_data->device_dispatch_table->CmdResetEvent(commandBuffer, event, stageMask); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4439 | } |
| 4440 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4441 | bool TransitionImageLayouts(VkCommandBuffer cmdBuffer, uint32_t memBarrierCount, const void* const* ppMemBarriers) { |
| 4442 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 4443 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 4444 | bool skip = false; |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 4445 | |
| 4446 | #ifdef DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4447 | // TODO: Fix -- pay attention to image subresource ranges -- not all subresources transition at the same time |
| 4448 | return skip; |
| 4449 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4450 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4451 | for (uint32_t i = 0; i < memBarrierCount; ++i) { |
| 4452 | auto mem_barrier = reinterpret_cast<const VkMemoryBarrier*>(ppMemBarriers[i]); |
| 4453 | if (mem_barrier && mem_barrier->sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) { |
| 4454 | auto image_mem_barrier = reinterpret_cast<const VkImageMemoryBarrier*>(mem_barrier); |
| 4455 | auto image_data = pCB->imageLayoutMap.find(image_mem_barrier->image); |
| 4456 | if (image_data == pCB->imageLayoutMap.end()) { |
| 4457 | pCB->imageLayoutMap[image_mem_barrier->image].initialLayout = image_mem_barrier->oldLayout; |
| 4458 | pCB->imageLayoutMap[image_mem_barrier->image].layout = image_mem_barrier->newLayout; |
| 4459 | } else { |
| 4460 | if (image_data->second.layout != image_mem_barrier->oldLayout) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4461 | skip |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
| 4462 | "You cannot transition the layout from %d when current layout is %d.", image_mem_barrier->oldLayout, image_data->second.layout); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4463 | } |
| 4464 | image_data->second.layout = image_mem_barrier->newLayout; |
| 4465 | } |
| 4466 | } |
| 4467 | } |
| 4468 | return skip; |
| 4469 | } |
| 4470 | |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4471 | // AccessFlags MUST have 'required_bit' set, and may have one or more of 'optional_bits' set. |
| 4472 | // If required_bit is zero, accessMask must have at least one of 'optional_bits' set |
| 4473 | bool ValidateMaskBits(const layer_data* my_data, VkCommandBuffer cmdBuffer, const VkAccessFlags& accessMask, const VkImageLayout& layout, VkAccessFlags required_bit, VkAccessFlags optional_bits) { |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4474 | bool skip_call = false; |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4475 | if ((accessMask & required_bit) || (!required_bit && (accessMask & optional_bits))) { |
| 4476 | if (accessMask & !(required_bit | optional_bits)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4477 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS", |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4478 | "Additional bits in accessMask %d are specified when layout is %s.", accessMask, string_VkImageLayout(layout)); |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4479 | } |
| 4480 | } else { |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4481 | if (!required_bit) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4482 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS", |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4483 | "AccessMask %d must contain at least one of access bits %d when layout is %s.", |
| 4484 | accessMask, optional_bits, string_VkImageLayout(layout)); |
| 4485 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4486 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS", |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4487 | "AccessMask %d must have required access bit %d and may have optional bits %d when layout is %s.", |
| 4488 | accessMask, required_bit, optional_bits,string_VkImageLayout(layout)); |
| 4489 | } |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4490 | } |
| 4491 | return skip_call; |
| 4492 | } |
| 4493 | |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4494 | bool ValidateMaskBitsFromLayouts(const layer_data* my_data, VkCommandBuffer cmdBuffer, const VkAccessFlags& accessMask, const VkImageLayout& layout) { |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4495 | bool skip_call = false; |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4496 | switch (layout) { |
| 4497 | case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: { |
| 4498 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_COLOR_ATTACHMENT_READ_BIT); |
| 4499 | break; |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4500 | } |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4501 | case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: { |
| 4502 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT); |
| 4503 | break; |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4504 | } |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4505 | case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: { |
| 4506 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_TRANSFER_WRITE_BIT, 0); |
| 4507 | break; |
| 4508 | } |
| 4509 | case VK_IMAGE_LAYOUT_PREINITIALIZED: { |
| 4510 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_HOST_WRITE_BIT, 0); |
| 4511 | break; |
| 4512 | } |
| 4513 | case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL: { |
| 4514 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, 0, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT); |
| 4515 | break; |
| 4516 | } |
| 4517 | case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: { |
| 4518 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, 0, VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT); |
| 4519 | break; |
| 4520 | } |
| 4521 | case VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL: { |
| 4522 | skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_TRANSFER_READ_BIT, 0); |
| 4523 | break; |
| 4524 | } |
| 4525 | case VK_IMAGE_LAYOUT_UNDEFINED: { |
| 4526 | if (accessMask != 0) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4527 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS", |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4528 | "Additional bits in accessMask %d are specified when layout is %s.", accessMask, string_VkImageLayout(layout)); |
| 4529 | } |
| 4530 | break; |
| 4531 | } |
| 4532 | case VK_IMAGE_LAYOUT_GENERAL: |
| 4533 | default: { |
| 4534 | break; |
| 4535 | } |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4536 | } |
| 4537 | return skip_call; |
| 4538 | } |
| 4539 | |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4540 | bool ValidateBarriers(VkCommandBuffer cmdBuffer, uint32_t memBarrierCount, const void* const* ppMemBarriers) { |
| 4541 | bool skip_call = false; |
| 4542 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 4543 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 4544 | if (pCB->activeRenderPass && memBarrierCount) { |
| 4545 | for (uint32_t i = 0; i < memBarrierCount; ++i) { |
| 4546 | auto mem_barrier = reinterpret_cast<const VkMemoryBarrier*>(ppMemBarriers[i]); |
| 4547 | if (mem_barrier && mem_barrier->sType != VK_STRUCTURE_TYPE_MEMORY_BARRIER) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4548 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS", |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4549 | "Image or Buffers Barriers cannot be used during a render pass."); |
| 4550 | } |
| 4551 | } |
| 4552 | if (!dev_data->renderPassMap[pCB->activeRenderPass]->hasSelfDependency[pCB->activeSubpass]) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4553 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS", |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4554 | "Barriers cannot be set during subpass %d with no self dependency specified.", pCB->activeSubpass); |
| 4555 | } |
| 4556 | } |
Mark Lobodzinski | b684b51 | 2015-11-20 09:27:27 -0700 | [diff] [blame] | 4557 | |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4558 | for (uint32_t i = 0; i < memBarrierCount; ++i) { |
| 4559 | auto mem_barrier = reinterpret_cast<const VkMemoryBarrier*>(ppMemBarriers[i]); |
| 4560 | if (mem_barrier && mem_barrier->sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) { |
| 4561 | auto image_mem_barrier = reinterpret_cast<const VkImageMemoryBarrier*>(mem_barrier); |
Michael Lentine | 8469dd6 | 2015-11-20 09:48:52 -0800 | [diff] [blame] | 4562 | skip_call |= ValidateMaskBitsFromLayouts(dev_data, cmdBuffer, image_mem_barrier->srcAccessMask, image_mem_barrier->oldLayout); |
| 4563 | skip_call |= ValidateMaskBitsFromLayouts(dev_data, cmdBuffer, image_mem_barrier->dstAccessMask, image_mem_barrier->newLayout); |
Michael Lentine | 472af7d | 2015-10-16 18:08:09 -0500 | [diff] [blame] | 4564 | } |
| 4565 | } |
Mark Lobodzinski | b95fc09 | 2015-12-03 15:42:32 -0700 | [diff] [blame] | 4566 | |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4567 | return skip_call; |
| 4568 | } |
| 4569 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4570 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent* pEvents, VkPipelineStageFlags sourceStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4571 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4572 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4573 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4574 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4575 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4576 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4577 | skipCall |= addCmd(dev_data, pCB, CMD_WAITEVENTS); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4578 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4579 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdWaitEvents()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4580 | } |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4581 | skipCall |= TransitionImageLayouts(commandBuffer, memoryBarrierCount, ppMemoryBarriers); |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4582 | skipCall |= ValidateBarriers(commandBuffer, memoryBarrierCount, ppMemoryBarriers); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4583 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4584 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4585 | dev_data->device_dispatch_table->CmdWaitEvents(commandBuffer, eventCount, pEvents, sourceStageMask, dstStageMask, memoryBarrierCount, ppMemoryBarriers); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4586 | } |
| 4587 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4588 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, const void* const* ppMemoryBarriers) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4589 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4590 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4591 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4592 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4593 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4594 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4595 | skipCall |= addCmd(dev_data, pCB, CMD_PIPELINEBARRIER); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4596 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4597 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdPipelineBarrier()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4598 | } |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4599 | skipCall |= TransitionImageLayouts(commandBuffer, memoryBarrierCount, ppMemoryBarriers); |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4600 | skipCall |= ValidateBarriers(commandBuffer, memoryBarrierCount, ppMemoryBarriers); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4601 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4602 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4603 | dev_data->device_dispatch_table->CmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, ppMemoryBarriers); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4604 | } |
| 4605 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4606 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot, VkFlags flags) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4607 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4608 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4609 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4610 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4611 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4612 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4613 | skipCall |= addCmd(dev_data, pCB, CMD_BEGINQUERY); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4614 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4615 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdBeginQuery()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4616 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4617 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4618 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4619 | dev_data->device_dispatch_table->CmdBeginQuery(commandBuffer, queryPool, slot, flags); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4620 | } |
| 4621 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4622 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t slot) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4623 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4624 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4625 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4626 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4627 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4628 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4629 | skipCall |= addCmd(dev_data, pCB, CMD_ENDQUERY); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4630 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4631 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdEndQuery()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4632 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4633 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4634 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4635 | dev_data->device_dispatch_table->CmdEndQuery(commandBuffer, queryPool, slot); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4636 | } |
| 4637 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4638 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4639 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4640 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4641 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4642 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4643 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4644 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4645 | skipCall |= addCmd(dev_data, pCB, CMD_RESETQUERYPOOL); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4646 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4647 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdResetQueryPool()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4648 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4649 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdQueryPool"); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4650 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4651 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4652 | dev_data->device_dispatch_table->CmdResetQueryPool(commandBuffer, queryPool, startQuery, queryCount); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4653 | } |
| 4654 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4655 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t startQuery, |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4656 | uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, |
Chia-I Wu | 1f6942d | 2015-10-26 18:36:20 +0800 | [diff] [blame] | 4657 | VkDeviceSize stride, VkQueryResultFlags flags) |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 4658 | { |
| 4659 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4660 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4661 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 4662 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4663 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4664 | skipCall |= addCmd(dev_data, pCB, CMD_COPYQUERYPOOLRESULTS); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 4665 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4666 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdCopyQueryPoolResults()"); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 4667 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4668 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdCopyQueryPoolResults"); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 4669 | } |
| 4670 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4671 | dev_data->device_dispatch_table->CmdCopyQueryPoolResults(commandBuffer, queryPool, |
| 4672 | startQuery, queryCount, dstBuffer, dstOffset, stride, flags); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 4673 | } |
| 4674 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4675 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t slot) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4676 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4677 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4678 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 4679 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4680 | if (pCB) { |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 4681 | if (pCB->state == CB_RECORDING) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4682 | skipCall |= addCmd(dev_data, pCB, CMD_WRITETIMESTAMP); |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 4683 | } else { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4684 | skipCall |= report_error_no_cb_begin(dev_data, commandBuffer, "vkCmdWriteTimestamp()"); |
Tobin Ehlis | e42007c | 2015-06-19 13:00:59 -0600 | [diff] [blame] | 4685 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4686 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 4687 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4688 | dev_data->device_dispatch_table->CmdWriteTimestamp(commandBuffer, pipelineStage, queryPool, slot); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 4689 | } |
| 4690 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4691 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkFramebuffer* pFramebuffer) |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4692 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 4693 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 4694 | VkResult result = dev_data->device_dispatch_table->CreateFramebuffer(device, pCreateInfo, pAllocator, pFramebuffer); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 4695 | if (VK_SUCCESS == result) { |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4696 | // Shadow create info and store in map |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4697 | VkFramebufferCreateInfo* localFBCI = new VkFramebufferCreateInfo(*pCreateInfo); |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 4698 | if (pCreateInfo->pAttachments) { |
Courtney Goeltzenleuchter | 1856d6f | 2015-09-01 17:30:39 -0600 | [diff] [blame] | 4699 | localFBCI->pAttachments = new VkImageView[localFBCI->attachmentCount]; |
| 4700 | memcpy((void*)localFBCI->pAttachments, pCreateInfo->pAttachments, localFBCI->attachmentCount*sizeof(VkImageView)); |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4701 | } |
Chia-I Wu | e420a33 | 2015-10-26 20:04:44 +0800 | [diff] [blame] | 4702 | dev_data->frameBufferMap[*pFramebuffer] = localFBCI; |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4703 | } |
| 4704 | return result; |
| 4705 | } |
| 4706 | |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4707 | // Store the DAG. |
| 4708 | struct DAGNode { |
| 4709 | uint32_t pass; |
| 4710 | std::vector<uint32_t> prev; |
| 4711 | std::vector<uint32_t> next; |
| 4712 | }; |
| 4713 | |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4714 | VkBool32 FindDependency(const int index, const int dependent, const std::vector<DAGNode>& subpass_to_node, std::unordered_set<uint32_t>& processed_nodes) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4715 | // If we have already checked this node we have not found a dependency path so return false. |
| 4716 | if (processed_nodes.count(index)) |
| 4717 | return false; |
| 4718 | processed_nodes.insert(index); |
| 4719 | const DAGNode& node = subpass_to_node[index]; |
| 4720 | // Look for a dependency path. If one exists return true else recurse on the previous nodes. |
| 4721 | if (std::find(node.prev.begin(), node.prev.end(), dependent) == node.prev.end()) { |
| 4722 | for (auto elem : node.prev) { |
| 4723 | if (FindDependency(elem, dependent, subpass_to_node, processed_nodes)) |
| 4724 | return true; |
| 4725 | } |
| 4726 | } else { |
| 4727 | return true; |
| 4728 | } |
| 4729 | return false; |
| 4730 | } |
| 4731 | |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4732 | VkBool32 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, VkBool32& skip_call) { |
| 4733 | VkBool32 result = true; |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4734 | // Loop through all subpasses that share the same attachment and make sure a dependency exists |
| 4735 | for (uint32_t k = 0; k < dependent_subpasses.size(); ++k) { |
| 4736 | if (subpass == dependent_subpasses[k]) |
| 4737 | continue; |
| 4738 | const DAGNode& node = subpass_to_node[subpass]; |
| 4739 | // Check for a specified dependency between the two nodes. If one exists we are done. |
| 4740 | auto prev_elem = std::find(node.prev.begin(), node.prev.end(), dependent_subpasses[k]); |
| 4741 | auto next_elem = std::find(node.next.begin(), node.next.end(), dependent_subpasses[k]); |
| 4742 | if (prev_elem == node.prev.end() && next_elem == node.next.end()) { |
| 4743 | // If no dependency exits an implicit dependency still might. If so, warn and if not throw an error. |
| 4744 | std::unordered_set<uint32_t> processed_nodes; |
| 4745 | if (FindDependency(subpass, dependent_subpasses[k], subpass_to_node, processed_nodes) || |
| 4746 | FindDependency(dependent_subpasses[k], subpass, subpass_to_node, processed_nodes)) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4747 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4748 | "A dependency between subpasses %d and %d must exist but only an implicit one is specified.", |
| 4749 | subpass, dependent_subpasses[k]); |
| 4750 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4751 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4752 | "A dependency between subpasses %d and %d must exist but one is not specified.", |
| 4753 | subpass, dependent_subpasses[k]); |
| 4754 | result = false; |
| 4755 | } |
| 4756 | } |
| 4757 | } |
| 4758 | return result; |
| 4759 | } |
| 4760 | |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4761 | VkBool32 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, VkBool32& skip_call) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4762 | const DAGNode& node = subpass_to_node[index]; |
| 4763 | // If this node writes to the attachment return true as next nodes need to preserve the attachment. |
| 4764 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[index]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4765 | for (uint32_t j = 0; j < subpass.colorAttachmentCount; ++j) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4766 | if (attachment == subpass.pColorAttachments[j].attachment) |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4767 | return VK_TRUE; |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4768 | } |
Chia-I Wu | ce532f7 | 2015-10-26 17:32:47 +0800 | [diff] [blame] | 4769 | if (subpass.pDepthStencilAttachment && |
| 4770 | subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { |
| 4771 | if (attachment == subpass.pDepthStencilAttachment->attachment) |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4772 | return VK_TRUE; |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4773 | } |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4774 | VkBool32 result = VK_FALSE; |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4775 | // Loop through previous nodes and see if any of them write to the attachment. |
| 4776 | for (auto elem : node.prev) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4777 | result |= CheckPreserved(my_data, device, pCreateInfo, elem, attachment, subpass_to_node, depth + 1, skip_call); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4778 | } |
| 4779 | // If the attachment was written to by a previous node than this node needs to preserve it. |
| 4780 | if (result && depth > 0) { |
| 4781 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[index]; |
Courtney Goeltzenleuchter | f2bca90 | 2015-11-03 15:41:43 -0700 | [diff] [blame] | 4782 | VkBool32 has_preserved = false; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4783 | for (uint32_t j = 0; j < subpass.preserveAttachmentCount; ++j) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4784 | if (subpass.pPreserveAttachments[j].attachment == attachment) { |
| 4785 | has_preserved = true; |
| 4786 | break; |
| 4787 | } |
| 4788 | } |
| 4789 | if (!has_preserved) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4790 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4791 | "Attachment %d is used by a later subpass and must be preserved in subpass %d.", attachment, index); |
| 4792 | } |
| 4793 | } |
| 4794 | return result; |
| 4795 | } |
| 4796 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4797 | VkBool32 ValidateDependencies(const layer_data* my_data, VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, std::vector<DAGNode>& subpass_to_node) { |
| 4798 | VkBool32 skip_call = false; |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4799 | std::vector<std::vector<uint32_t>> output_attachment_to_subpass(pCreateInfo->attachmentCount); |
| 4800 | std::vector<std::vector<uint32_t>> input_attachment_to_subpass(pCreateInfo->attachmentCount); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4801 | |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4802 | // Create DAG |
| 4803 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 4804 | DAGNode& subpass_node = subpass_to_node[i]; |
| 4805 | subpass_node.pass = i; |
| 4806 | } |
| 4807 | for (uint32_t i = 0; i < pCreateInfo->dependencyCount; ++i) { |
| 4808 | const VkSubpassDependency& dependency = pCreateInfo->pDependencies[i]; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4809 | if (dependency.srcSubpass > dependency.dstSubpass) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4810 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4811 | "Dependency graph must be specified such that an earlier pass cannot depend on a later pass."); |
| 4812 | } |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 4813 | subpass_to_node[dependency.dstSubpass].prev.push_back(dependency.srcSubpass); |
| 4814 | subpass_to_node[dependency.srcSubpass].next.push_back(dependency.dstSubpass); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4815 | } |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4816 | |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4817 | // Find for each attachment the subpasses that use them. |
| 4818 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 4819 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4820 | for (uint32_t j = 0; j < subpass.inputAttachmentCount; ++j) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4821 | input_attachment_to_subpass[subpass.pInputAttachments[j].attachment].push_back(i); |
| 4822 | } |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4823 | for (uint32_t j = 0; j < subpass.colorAttachmentCount; ++j) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4824 | output_attachment_to_subpass[subpass.pColorAttachments[j].attachment].push_back(i); |
| 4825 | } |
Chia-I Wu | ce532f7 | 2015-10-26 17:32:47 +0800 | [diff] [blame] | 4826 | if (subpass.pDepthStencilAttachment && subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { |
| 4827 | output_attachment_to_subpass[subpass.pDepthStencilAttachment->attachment].push_back(i); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4828 | } |
| 4829 | } |
| 4830 | // If there is a dependency needed make sure one exists |
| 4831 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 4832 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
| 4833 | // If the attachment is an input then all subpasses that output must have a dependency relationship |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4834 | for (uint32_t j = 0; j < subpass.inputAttachmentCount; ++j) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4835 | const uint32_t& attachment = subpass.pInputAttachments[j].attachment; |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4836 | CheckDependencyExists(my_data, device, i, output_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4837 | } |
| 4838 | // If the attachment is an output then all subpasses that use the attachment must have a dependency relationship |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4839 | for (uint32_t j = 0; j < subpass.colorAttachmentCount; ++j) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4840 | const uint32_t& attachment = subpass.pColorAttachments[j].attachment; |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4841 | CheckDependencyExists(my_data, device, i, output_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
| 4842 | CheckDependencyExists(my_data, device, i, input_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4843 | } |
Chia-I Wu | ce532f7 | 2015-10-26 17:32:47 +0800 | [diff] [blame] | 4844 | if (subpass.pDepthStencilAttachment && subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { |
| 4845 | const uint32_t& attachment = subpass.pDepthStencilAttachment->attachment; |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4846 | CheckDependencyExists(my_data, device, i, output_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
| 4847 | CheckDependencyExists(my_data, device, i, input_attachment_to_subpass[attachment], subpass_to_node, skip_call); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4848 | } |
| 4849 | } |
| 4850 | // Loop through implicit dependencies, if this pass reads make sure the attachment is preserved for all passes after it was written. |
| 4851 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 4852 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4853 | for (uint32_t j = 0; j < subpass.inputAttachmentCount; ++j) { |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4854 | CheckPreserved(my_data, device, pCreateInfo, i, subpass.pInputAttachments[j].attachment, subpass_to_node, 0, skip_call); |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4855 | } |
| 4856 | } |
| 4857 | return skip_call; |
| 4858 | } |
| 4859 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4860 | bool ValidateLayouts(const layer_data* my_data, VkDevice device, const VkRenderPassCreateInfo* pCreateInfo) { |
| 4861 | bool skip = false; |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 4862 | |
| 4863 | #ifdef DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4864 | return skip; |
| 4865 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
| 4866 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4867 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 4868 | const VkSubpassDescription& subpass = pCreateInfo->pSubpasses[i]; |
| 4869 | for (uint32_t j = 0; j < subpass.inputAttachmentCount; ++j) { |
| 4870 | if (subpass.pInputAttachments[j].layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL && |
| 4871 | subpass.pInputAttachments[j].layout != VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) { |
| 4872 | if (subpass.pInputAttachments[j].layout == VK_IMAGE_LAYOUT_GENERAL) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4873 | skip |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4874 | "Layout for input attachment is GENERAL but should be READ_ONLY_OPTIMAL."); |
| 4875 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4876 | skip |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4877 | "Layout for input attachment is %d but can only be READ_ONLY_OPTIMAL or GENERAL.", subpass.pInputAttachments[j].attachment); |
| 4878 | } |
| 4879 | } |
| 4880 | } |
| 4881 | for (uint32_t j = 0; j < subpass.colorAttachmentCount; ++j) { |
| 4882 | if (subpass.pColorAttachments[j].layout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { |
| 4883 | if (subpass.pColorAttachments[j].layout == VK_IMAGE_LAYOUT_GENERAL) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4884 | skip |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4885 | "Layout for color attachment is GENERAL but should be COLOR_ATTACHMENT_OPTIMAL."); |
| 4886 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4887 | skip |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4888 | "Layout for color attachment is %d but can only be COLOR_ATTACHMENT_OPTIMAL or GENERAL.", subpass.pColorAttachments[j].attachment); |
| 4889 | } |
| 4890 | } |
| 4891 | } |
Mark Lobodzinski | c344bef | 2015-10-28 13:03:56 -0600 | [diff] [blame] | 4892 | if ((subpass.pDepthStencilAttachment != NULL) && |
| 4893 | (subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED)) { |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4894 | if (subpass.pDepthStencilAttachment->layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { |
| 4895 | if (subpass.pDepthStencilAttachment->layout == VK_IMAGE_LAYOUT_GENERAL) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4896 | skip |= log_msg(my_data->report_data, VK_DEBUG_REPORT_WARN_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4897 | "Layout for depth attachment is GENERAL but should be DEPTH_STENCIL_ATTACHMENT_OPTIMAL."); |
| 4898 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4899 | skip |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4900 | "Layout for depth attachment is %d but can only be DEPTH_STENCIL_ATTACHMENT_OPTIMAL or GENERAL.", subpass.pDepthStencilAttachment->attachment); |
| 4901 | } |
| 4902 | } |
| 4903 | } |
| 4904 | } |
| 4905 | return skip; |
| 4906 | } |
| 4907 | |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4908 | bool CreatePassDAG(const layer_data* my_data, VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, std::vector<DAGNode>& subpass_to_node, std::vector<bool>& has_self_dependency) { |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4909 | bool skip_call = false; |
| 4910 | for (uint32_t i = 0; i < pCreateInfo->subpassCount; ++i) { |
| 4911 | DAGNode& subpass_node = subpass_to_node[i]; |
| 4912 | subpass_node.pass = i; |
| 4913 | } |
| 4914 | for (uint32_t i = 0; i < pCreateInfo->dependencyCount; ++i) { |
| 4915 | const VkSubpassDependency& dependency = pCreateInfo->pDependencies[i]; |
| 4916 | if (dependency.srcSubpass > dependency.dstSubpass) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 4917 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4918 | "Depedency graph must be specified such that an earlier pass cannot depend on a later pass."); |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4919 | } else if (dependency.srcSubpass == dependency.dstSubpass) { |
| 4920 | has_self_dependency[dependency.srcSubpass] = true; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4921 | } |
| 4922 | subpass_to_node[dependency.dstSubpass].prev.push_back(dependency.srcSubpass); |
| 4923 | subpass_to_node[dependency.srcSubpass].next.push_back(dependency.dstSubpass); |
| 4924 | } |
| 4925 | return skip_call; |
| 4926 | } |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 4927 | // TODOSC : Add intercept of vkCreateShaderModule |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4928 | |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 4929 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateShaderModule( |
| 4930 | VkDevice device, |
| 4931 | const VkShaderModuleCreateInfo *pCreateInfo, |
| 4932 | const VkAllocationCallbacks* pAllocator, |
| 4933 | VkShaderModule *pShaderModule) |
| 4934 | { |
| 4935 | layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 4936 | bool skip_call = false; |
| 4937 | if (!shader_is_spirv(pCreateInfo)) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 4938 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_DEVICE, |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 4939 | /* dev */ 0, 0, SHADER_CHECKER_NON_SPIRV_SHADER, "SC", |
| 4940 | "Shader is not SPIR-V"); |
| 4941 | } |
| 4942 | |
| 4943 | if (skip_call) |
| 4944 | return VK_ERROR_VALIDATION_FAILED; |
| 4945 | |
| 4946 | VkResult res = my_data->device_dispatch_table->CreateShaderModule(device, pCreateInfo, pAllocator, pShaderModule); |
| 4947 | |
| 4948 | if (res == VK_SUCCESS) { |
| 4949 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 4950 | my_data->shaderModuleMap[*pShaderModule] = new shader_module(pCreateInfo); |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 4951 | loader_platform_thread_unlock_mutex(&globalLock); |
| 4952 | } |
| 4953 | return res; |
| 4954 | } |
| 4955 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 4956 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateRenderPass(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass) |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4957 | { |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4958 | bool skip_call = false; |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 4959 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4960 | // Create DAG |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4961 | std::vector<bool> has_self_dependency(pCreateInfo->subpassCount); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4962 | std::vector<DAGNode> subpass_to_node(pCreateInfo->subpassCount); |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 4963 | skip_call |= CreatePassDAG(dev_data, device, pCreateInfo, subpass_to_node, has_self_dependency); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 4964 | // Validate using DAG |
| 4965 | skip_call |= ValidateDependencies(dev_data, device, pCreateInfo, subpass_to_node); |
| 4966 | skip_call |= ValidateLayouts(dev_data, device, pCreateInfo); |
| 4967 | if (skip_call) { |
Michael Lentine | 329697b | 2015-10-06 14:56:18 -0700 | [diff] [blame] | 4968 | return VK_ERROR_VALIDATION_FAILED; |
| 4969 | } |
Chia-I Wu | 69f4012 | 2015-10-26 21:10:41 +0800 | [diff] [blame] | 4970 | VkResult result = dev_data->device_dispatch_table->CreateRenderPass(device, pCreateInfo, pAllocator, pRenderPass); |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 4971 | if (VK_SUCCESS == result) { |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 4972 | // TODOSC : Merge in tracking of renderpass from ShaderChecker |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4973 | // Shadow create info and store in map |
Courtney Goeltzenleuchter | 382489d | 2015-04-10 08:34:15 -0600 | [diff] [blame] | 4974 | VkRenderPassCreateInfo* localRPCI = new VkRenderPassCreateInfo(*pCreateInfo); |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 4975 | if (pCreateInfo->pAttachments) { |
| 4976 | localRPCI->pAttachments = new VkAttachmentDescription[localRPCI->attachmentCount]; |
| 4977 | memcpy((void*)localRPCI->pAttachments, pCreateInfo->pAttachments, localRPCI->attachmentCount*sizeof(VkAttachmentDescription)); |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 4978 | } |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 4979 | if (pCreateInfo->pSubpasses) { |
| 4980 | localRPCI->pSubpasses = new VkSubpassDescription[localRPCI->subpassCount]; |
| 4981 | memcpy((void*)localRPCI->pSubpasses, pCreateInfo->pSubpasses, localRPCI->subpassCount*sizeof(VkSubpassDescription)); |
| 4982 | |
| 4983 | for (uint32_t i = 0; i < localRPCI->subpassCount; i++) { |
| 4984 | VkSubpassDescription *subpass = (VkSubpassDescription *) &localRPCI->pSubpasses[i]; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4985 | const uint32_t attachmentCount = subpass->inputAttachmentCount + |
| 4986 | subpass->colorAttachmentCount * (1 + (subpass->pResolveAttachments?1:0)) + |
Chia-I Wu | ce532f7 | 2015-10-26 17:32:47 +0800 | [diff] [blame] | 4987 | ((subpass->pDepthStencilAttachment) ? 1 : 0) + subpass->preserveAttachmentCount; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 4988 | VkAttachmentReference *attachments = new VkAttachmentReference[attachmentCount]; |
| 4989 | |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 4990 | memcpy(attachments, subpass->pInputAttachments, |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4991 | sizeof(attachments[0]) * subpass->inputAttachmentCount); |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 4992 | subpass->pInputAttachments = attachments; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4993 | attachments += subpass->inputAttachmentCount; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 4994 | |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 4995 | memcpy(attachments, subpass->pColorAttachments, |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4996 | sizeof(attachments[0]) * subpass->colorAttachmentCount); |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 4997 | subpass->pColorAttachments = attachments; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 4998 | attachments += subpass->colorAttachmentCount; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 4999 | |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 5000 | if (subpass->pResolveAttachments) { |
| 5001 | memcpy(attachments, subpass->pResolveAttachments, |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 5002 | sizeof(attachments[0]) * subpass->colorAttachmentCount); |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 5003 | subpass->pResolveAttachments = attachments; |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 5004 | attachments += subpass->colorAttachmentCount; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5005 | } |
| 5006 | |
Chia-I Wu | ce532f7 | 2015-10-26 17:32:47 +0800 | [diff] [blame] | 5007 | if (subpass->pDepthStencilAttachment) { |
| 5008 | memcpy(attachments, subpass->pDepthStencilAttachment, |
| 5009 | sizeof(attachments[0]) * 1); |
| 5010 | subpass->pDepthStencilAttachment = attachments; |
| 5011 | attachments += 1; |
| 5012 | } |
| 5013 | |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 5014 | memcpy(attachments, subpass->pPreserveAttachments, |
Chia-I Wu | 763a749 | 2015-10-26 20:48:51 +0800 | [diff] [blame] | 5015 | sizeof(attachments[0]) * subpass->preserveAttachmentCount); |
Cody Northrop | 6de6b0b | 2015-08-04 11:16:41 -0600 | [diff] [blame] | 5016 | subpass->pPreserveAttachments = attachments; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5017 | } |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 5018 | } |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5019 | if (pCreateInfo->pDependencies) { |
| 5020 | localRPCI->pDependencies = new VkSubpassDependency[localRPCI->dependencyCount]; |
| 5021 | memcpy((void*)localRPCI->pDependencies, pCreateInfo->pDependencies, localRPCI->dependencyCount*sizeof(VkSubpassDependency)); |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 5022 | } |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 5023 | loader_platform_thread_lock_mutex(&globalLock); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 5024 | dev_data->renderPassMap[*pRenderPass] = new RENDER_PASS_NODE(localRPCI); |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5025 | dev_data->renderPassMap[*pRenderPass]->hasSelfDependency = has_self_dependency; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 5026 | loader_platform_thread_unlock_mutex(&globalLock); |
Tobin Ehlis | 2464b88 | 2015-04-01 08:40:34 -0600 | [diff] [blame] | 5027 | } |
| 5028 | return result; |
| 5029 | } |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5030 | // Free the renderpass shadow |
| 5031 | static void deleteRenderPasses(layer_data* my_data) |
| 5032 | { |
| 5033 | if (my_data->renderPassMap.size() <= 0) |
| 5034 | return; |
| 5035 | for (auto ii=my_data->renderPassMap.begin(); ii!=my_data->renderPassMap.end(); ++ii) { |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 5036 | const VkRenderPassCreateInfo* pRenderPassInfo = (*ii).second->pCreateInfo; |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5037 | if (pRenderPassInfo->pAttachments) { |
| 5038 | delete[] pRenderPassInfo->pAttachments; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5039 | } |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5040 | if (pRenderPassInfo->pSubpasses) { |
| 5041 | for (uint32_t i=0; i<pRenderPassInfo->subpassCount; ++i) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5042 | // Attachements are all allocated in a block, so just need to |
| 5043 | // find the first non-null one to delete |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5044 | if (pRenderPassInfo->pSubpasses[i].pInputAttachments) { |
| 5045 | delete[] pRenderPassInfo->pSubpasses[i].pInputAttachments; |
| 5046 | } else if (pRenderPassInfo->pSubpasses[i].pColorAttachments) { |
| 5047 | delete[] pRenderPassInfo->pSubpasses[i].pColorAttachments; |
| 5048 | } else if (pRenderPassInfo->pSubpasses[i].pResolveAttachments) { |
| 5049 | delete[] pRenderPassInfo->pSubpasses[i].pResolveAttachments; |
| 5050 | } else if (pRenderPassInfo->pSubpasses[i].pPreserveAttachments) { |
| 5051 | delete[] pRenderPassInfo->pSubpasses[i].pPreserveAttachments; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5052 | } |
| 5053 | } |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5054 | delete[] pRenderPassInfo->pSubpasses; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5055 | } |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5056 | if (pRenderPassInfo->pDependencies) { |
| 5057 | delete[] pRenderPassInfo->pDependencies; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5058 | } |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 5059 | delete pRenderPassInfo; |
Michael Lentine | 07ff1a1 | 2015-10-15 17:07:00 -0500 | [diff] [blame] | 5060 | delete (*ii).second; |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5061 | } |
| 5062 | my_data->renderPassMap.clear(); |
| 5063 | } |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5064 | |
| 5065 | bool VerifyFramebufferAndRenderPassLayouts(VkCommandBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin) { |
| 5066 | bool skip_call = false; |
| 5067 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 5068 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 5069 | const VkRenderPassCreateInfo* pRenderPassInfo = dev_data->renderPassMap[pRenderPassBegin->renderPass]->pCreateInfo; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5070 | const VkFramebufferCreateInfo* pFramebufferInfo = dev_data->frameBufferMap[pRenderPassBegin->framebuffer]; |
| 5071 | if (pRenderPassInfo->attachmentCount != pFramebufferInfo->attachmentCount) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5072 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5073 | "You cannot start a render pass using a framebuffer with a different number of attachments."); |
| 5074 | } |
| 5075 | for (uint32_t i = 0; i < pRenderPassInfo->attachmentCount; ++i) { |
| 5076 | const VkImageView& image_view = pFramebufferInfo->pAttachments[i]; |
| 5077 | const VkImage& image = dev_data->imageViewMap[image_view]->image; |
| 5078 | auto image_data = pCB->imageLayoutMap.find(image); |
| 5079 | if (image_data == pCB->imageLayoutMap.end()) { |
| 5080 | pCB->imageLayoutMap[image].initialLayout = pRenderPassInfo->pAttachments[i].initialLayout; |
| 5081 | pCB->imageLayoutMap[image].layout = pRenderPassInfo->pAttachments[i].initialLayout; |
| 5082 | } else if (pRenderPassInfo->pAttachments[i].initialLayout != image_data->second.layout) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5083 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5084 | "You cannot start a render pass using attachment %i where the intial layout differs from the starting layout.", i); |
| 5085 | } |
| 5086 | } |
| 5087 | return skip_call; |
| 5088 | } |
| 5089 | |
| 5090 | void TransitionSubpassLayouts(VkCommandBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin, const int subpass_index) { |
| 5091 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 5092 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 5093 | auto render_pass_data = dev_data->renderPassMap.find(pRenderPassBegin->renderPass); |
| 5094 | if (render_pass_data == dev_data->renderPassMap.end()) { |
| 5095 | return; |
| 5096 | } |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 5097 | const VkRenderPassCreateInfo* pRenderPassInfo = render_pass_data->second->pCreateInfo; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5098 | auto framebuffer_data = dev_data->frameBufferMap.find(pRenderPassBegin->framebuffer); |
| 5099 | if (framebuffer_data == dev_data->frameBufferMap.end()) { |
| 5100 | return; |
| 5101 | } |
| 5102 | const VkFramebufferCreateInfo* pFramebufferInfo = framebuffer_data->second; |
| 5103 | const VkSubpassDescription& subpass = pRenderPassInfo->pSubpasses[subpass_index]; |
| 5104 | for (uint32_t j = 0; j < subpass.inputAttachmentCount; ++j) { |
| 5105 | const VkImageView& image_view = pFramebufferInfo->pAttachments[subpass.pInputAttachments[j].attachment]; |
| 5106 | auto image_view_data = dev_data->imageViewMap.find(image_view); |
| 5107 | if (image_view_data != dev_data->imageViewMap.end()) { |
| 5108 | auto image_layout = pCB->imageLayoutMap.find(image_view_data->second->image); |
| 5109 | if (image_layout != pCB->imageLayoutMap.end()) { |
| 5110 | image_layout->second.layout = subpass.pInputAttachments[j].layout; |
| 5111 | } |
| 5112 | } |
| 5113 | } |
| 5114 | for (uint32_t j = 0; j < subpass.colorAttachmentCount; ++j) { |
| 5115 | const VkImageView& image_view = pFramebufferInfo->pAttachments[subpass.pColorAttachments[j].attachment]; |
| 5116 | auto image_view_data = dev_data->imageViewMap.find(image_view); |
| 5117 | if (image_view_data != dev_data->imageViewMap.end()) { |
| 5118 | auto image_layout = pCB->imageLayoutMap.find(image_view_data->second->image); |
| 5119 | if (image_layout != pCB->imageLayoutMap.end()) { |
| 5120 | image_layout->second.layout = subpass.pColorAttachments[j].layout; |
| 5121 | } |
| 5122 | } |
| 5123 | } |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5124 | if ((subpass.pDepthStencilAttachment != NULL) && |
Mark Lobodzinski | c344bef | 2015-10-28 13:03:56 -0600 | [diff] [blame] | 5125 | (subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED)) { |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5126 | const VkImageView& image_view = pFramebufferInfo->pAttachments[subpass.pDepthStencilAttachment->attachment]; |
| 5127 | auto image_view_data = dev_data->imageViewMap.find(image_view); |
| 5128 | if (image_view_data != dev_data->imageViewMap.end()) { |
| 5129 | auto image_layout = pCB->imageLayoutMap.find(image_view_data->second->image); |
| 5130 | if (image_layout != pCB->imageLayoutMap.end()) { |
| 5131 | image_layout->second.layout = subpass.pDepthStencilAttachment->layout; |
| 5132 | } |
| 5133 | } |
| 5134 | } |
| 5135 | } |
| 5136 | |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5137 | bool validatePrimaryCommandBuffer(const layer_data* my_data, const GLOBAL_CB_NODE* pCB, const std::string& cmd_name) { |
| 5138 | bool skip_call = false; |
| 5139 | if (pCB->createInfo.level != VK_COMMAND_BUFFER_LEVEL_PRIMARY) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5140 | skip_call |= log_msg(my_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG)0, 0, 0, DRAWSTATE_INVALID_COMMAND_BUFFER, "DS", |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5141 | "Cannot execute command %s on a secondary command buffer.", cmd_name.c_str()); |
| 5142 | } |
| 5143 | return skip_call; |
| 5144 | } |
| 5145 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5146 | void TransitionFinalSubpassLayouts(VkCommandBuffer cmdBuffer, const VkRenderPassBeginInfo* pRenderPassBegin) { |
| 5147 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(cmdBuffer), layer_data_map); |
| 5148 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, cmdBuffer); |
| 5149 | auto render_pass_data = dev_data->renderPassMap.find(pRenderPassBegin->renderPass); |
| 5150 | if (render_pass_data == dev_data->renderPassMap.end()) { |
| 5151 | return; |
| 5152 | } |
Tobin Ehlis | ad61de4 | 2015-12-02 13:53:34 -0700 | [diff] [blame] | 5153 | const VkRenderPassCreateInfo* pRenderPassInfo = render_pass_data->second->pCreateInfo; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5154 | auto framebuffer_data = dev_data->frameBufferMap.find(pRenderPassBegin->framebuffer); |
| 5155 | if (framebuffer_data == dev_data->frameBufferMap.end()) { |
| 5156 | return; |
| 5157 | } |
| 5158 | const VkFramebufferCreateInfo* pFramebufferInfo = framebuffer_data->second; |
| 5159 | for (uint32_t i = 0; i < pRenderPassInfo->attachmentCount; ++i) { |
| 5160 | const VkImageView& image_view = pFramebufferInfo->pAttachments[i]; |
| 5161 | auto image_view_data = dev_data->imageViewMap.find(image_view); |
| 5162 | if (image_view_data != dev_data->imageViewMap.end()) { |
| 5163 | auto image_layout = pCB->imageLayoutMap.find(image_view_data->second->image); |
| 5164 | if (image_layout != pCB->imageLayoutMap.end()) { |
| 5165 | image_layout->second.layout = pRenderPassInfo->pAttachments[i].finalLayout; |
| 5166 | } |
| 5167 | } |
| 5168 | } |
| 5169 | } |
| 5170 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5171 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, VkSubpassContents contents) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5172 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5173 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5174 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 5175 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5176 | if (pCB) { |
Tobin Ehlis | 8b6c235 | 2015-06-23 16:13:03 -0600 | [diff] [blame] | 5177 | if (pRenderPassBegin && pRenderPassBegin->renderPass) { |
Mark Lobodzinski | c344bef | 2015-10-28 13:03:56 -0600 | [diff] [blame] | 5178 | skipCall |= VerifyFramebufferAndRenderPassLayouts(commandBuffer, pRenderPassBegin); |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5179 | skipCall |= insideRenderPass(dev_data, pCB, "vkCmdBeginRenderPass"); |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5180 | skipCall |= validatePrimaryCommandBuffer(dev_data, pCB, "vkCmdBeginRenderPass"); |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5181 | skipCall |= addCmd(dev_data, pCB, CMD_BEGINRENDERPASS); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 5182 | pCB->activeRenderPass = pRenderPassBegin->renderPass; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5183 | // This is a shallow copy as that is all that is needed for now |
| 5184 | pCB->activeRenderPassBeginInfo = *pRenderPassBegin; |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 5185 | pCB->activeSubpass = 0; |
| 5186 | pCB->framebuffer = pRenderPassBegin->framebuffer; |
| 5187 | if (pCB->lastBoundPipeline) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5188 | skipCall |= validatePipelineState(dev_data, pCB, VK_PIPELINE_BIND_POINT_GRAPHICS, pCB->lastBoundPipeline); |
Tobin Ehlis | 8b6c235 | 2015-06-23 16:13:03 -0600 | [diff] [blame] | 5189 | } |
Tobin Ehlis | e407678 | 2015-06-24 15:53:07 -0600 | [diff] [blame] | 5190 | } else { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5191 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_RENDERPASS, "DS", |
Tobin Ehlis | 8b6c235 | 2015-06-23 16:13:03 -0600 | [diff] [blame] | 5192 | "You cannot use a NULL RenderPass object in vkCmdBeginRenderPass()"); |
Tony Barbour | b9f82ba | 2015-04-06 11:09:26 -0600 | [diff] [blame] | 5193 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5194 | } |
Mark Lobodzinski | c344bef | 2015-10-28 13:03:56 -0600 | [diff] [blame] | 5195 | if (VK_FALSE == skipCall) { |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5196 | dev_data->device_dispatch_table->CmdBeginRenderPass(commandBuffer, pRenderPassBegin, contents); |
Mark Lobodzinski | c344bef | 2015-10-28 13:03:56 -0600 | [diff] [blame] | 5197 | // This is a shallow copy as that is all that is needed for now |
| 5198 | dev_data->renderPassBeginInfo = *pRenderPassBegin; |
| 5199 | dev_data->currentSubpass = 0; |
| 5200 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5201 | } |
| 5202 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5203 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents) |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5204 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5205 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5206 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 5207 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5208 | TransitionSubpassLayouts(commandBuffer, &dev_data->renderPassBeginInfo, ++dev_data->currentSubpass); |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5209 | if (pCB) { |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5210 | skipCall |= validatePrimaryCommandBuffer(dev_data, pCB, "vkCmdNextSubpass"); |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5211 | skipCall |= addCmd(dev_data, pCB, CMD_NEXTSUBPASS); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 5212 | pCB->activeSubpass++; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5213 | TransitionSubpassLayouts(commandBuffer, &pCB->activeRenderPassBeginInfo, ++pCB->activeSubpass); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 5214 | if (pCB->lastBoundPipeline) { |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5215 | skipCall |= validatePipelineState(dev_data, pCB, VK_PIPELINE_BIND_POINT_GRAPHICS, pCB->lastBoundPipeline); |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5216 | } |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5217 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdNextSubpass"); |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5218 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5219 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5220 | dev_data->device_dispatch_table->CmdNextSubpass(commandBuffer, contents); |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5221 | } |
| 5222 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5223 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdEndRenderPass(VkCommandBuffer commandBuffer) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5224 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5225 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5226 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 5227 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5228 | TransitionFinalSubpassLayouts(commandBuffer, &dev_data->renderPassBeginInfo); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5229 | if (pCB) { |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5230 | skipCall |= outsideRenderPass(dev_data, pCB, "vkCmdEndRenderpass"); |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5231 | skipCall |= validatePrimaryCommandBuffer(dev_data, pCB, "vkCmdEndRenderPass"); |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5232 | skipCall |= addCmd(dev_data, pCB, CMD_ENDRENDERPASS); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5233 | TransitionFinalSubpassLayouts(commandBuffer, &pCB->activeRenderPassBeginInfo); |
Mark Lobodzinski | a0f061c | 2015-09-30 16:19:16 -0600 | [diff] [blame] | 5234 | pCB->activeRenderPass = 0; |
| 5235 | pCB->activeSubpass = 0; |
Chia-I Wu | 88eaa3b | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 5236 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5237 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5238 | dev_data->device_dispatch_table->CmdEndRenderPass(commandBuffer); |
Chia-I Wu | 88eaa3b | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 5239 | } |
| 5240 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5241 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBuffersCount, const VkCommandBuffer* pCommandBuffers) |
Chia-I Wu | 88eaa3b | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 5242 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5243 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5244 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 5245 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Chia-I Wu | 88eaa3b | 2015-06-26 15:34:39 +0800 | [diff] [blame] | 5246 | if (pCB) { |
Tobin Ehlis | 5f728d3 | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 5247 | GLOBAL_CB_NODE* pSubCB = NULL; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5248 | for (uint32_t i=0; i<commandBuffersCount; i++) { |
| 5249 | pSubCB = getCBNode(dev_data, pCommandBuffers[i]); |
Tobin Ehlis | 5f728d3 | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 5250 | if (!pSubCB) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5251 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_COMMAND_BUFFER, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5252 | "vkCmdExecuteCommands() called w/ invalid Cmd Buffer %p in element %u of pCommandBuffers array.", (void*)pCommandBuffers[i], i); |
| 5253 | } else if (VK_COMMAND_BUFFER_LEVEL_PRIMARY == pSubCB->createInfo.level) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5254 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_SECONDARY_COMMAND_BUFFER, "DS", |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5255 | "vkCmdExecuteCommands() called w/ Primary Cmd Buffer %p in element %u of pCommandBuffers array. All cmd buffers in pCommandBuffers array must be secondary.", (void*)pCommandBuffers[i], i); |
Tobin Ehlis | 5f728d3 | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 5256 | } |
| 5257 | } |
Michael Lentine | 2b9eda4 | 2015-10-28 15:55:18 -0700 | [diff] [blame] | 5258 | skipCall |= validatePrimaryCommandBuffer(dev_data, pCB, "vkCmdExecuteComands"); |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5259 | skipCall |= addCmd(dev_data, pCB, CMD_EXECUTECOMMANDS); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5260 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5261 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5262 | dev_data->device_dispatch_table->CmdExecuteCommands(commandBuffer, commandBuffersCount, pCommandBuffers); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5263 | } |
| 5264 | |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 5265 | bool ValidateMapImageLayouts(VkDevice device, VkDeviceMemory mem) { |
| 5266 | bool skip_call = false; |
| 5267 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 5268 | auto mem_data = dev_data->memImageMap.find(mem); |
| 5269 | if (mem_data != dev_data->memImageMap.end()) { |
| 5270 | auto image_data = dev_data->imageLayoutMap.find(mem_data->second); |
| 5271 | if (image_data != dev_data->imageLayoutMap.end()) { |
| 5272 | if (image_data->second->layout != VK_IMAGE_LAYOUT_PREINITIALIZED && image_data->second->layout != VK_IMAGE_LAYOUT_GENERAL) { |
Courtney Goeltzenleuchter | 95e6dba | 2015-11-25 11:38:54 -0700 | [diff] [blame] | 5273 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, (VkDebugReportObjectTypeLUNARG) 0, 0, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 5274 | "Cannot map an image with layout %d. Only GENERAL or PREINITIALIZED are supported.", image_data->second->layout); |
| 5275 | } |
| 5276 | } |
| 5277 | } |
| 5278 | return skip_call; |
| 5279 | } |
| 5280 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5281 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory( |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 5282 | VkDevice device, |
| 5283 | VkDeviceMemory mem, |
| 5284 | VkDeviceSize offset, |
| 5285 | VkDeviceSize size, |
| 5286 | VkFlags flags, |
| 5287 | void **ppData) |
| 5288 | { |
| 5289 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 5290 | |
| 5291 | bool skip_call = VK_FALSE; |
| 5292 | #ifndef DISABLE_IMAGE_LAYOUT_VALIDATION |
| 5293 | skip_call = ValidateMapImageLayouts(device, mem); |
| 5294 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
| 5295 | |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 5296 | if (VK_FALSE == skip_call) { |
| 5297 | return dev_data->device_dispatch_table->MapMemory(device, mem, offset, size, flags, ppData); |
| 5298 | } |
| 5299 | return VK_ERROR_VALIDATION_FAILED; |
| 5300 | } |
| 5301 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5302 | VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory( |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 5303 | VkDevice device, |
| 5304 | VkImage image, |
| 5305 | VkDeviceMemory mem, |
| 5306 | VkDeviceSize memOffset) |
| 5307 | { |
| 5308 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 5309 | VkResult result = dev_data->device_dispatch_table->BindImageMemory(device, image, mem, memOffset); |
| 5310 | loader_platform_thread_lock_mutex(&globalLock); |
| 5311 | dev_data->memImageMap[mem] = image; |
| 5312 | loader_platform_thread_unlock_mutex(&globalLock); |
| 5313 | return result; |
| 5314 | } |
| 5315 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5316 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR( |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5317 | VkDevice device, |
| 5318 | const VkSwapchainCreateInfoKHR *pCreateInfo, |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5319 | const VkAllocationCallbacks *pAllocator, |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5320 | VkSwapchainKHR *pSwapchain) |
| 5321 | { |
| 5322 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5323 | VkResult result = dev_data->device_dispatch_table->CreateSwapchainKHR(device, pCreateInfo, pAllocator, pSwapchain); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5324 | |
| 5325 | if (VK_SUCCESS == result) { |
| 5326 | SWAPCHAIN_NODE *swapchain_data = new SWAPCHAIN_NODE; |
| 5327 | loader_platform_thread_lock_mutex(&globalLock); |
| 5328 | dev_data->device_extensions.swapchainMap[*pSwapchain] = swapchain_data; |
| 5329 | loader_platform_thread_unlock_mutex(&globalLock); |
| 5330 | } |
| 5331 | |
| 5332 | return result; |
| 5333 | } |
| 5334 | |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5335 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR( |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5336 | VkDevice device, |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5337 | VkSwapchainKHR swapchain, |
| 5338 | const VkAllocationCallbacks *pAllocator) |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5339 | { |
| 5340 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5341 | |
| 5342 | loader_platform_thread_lock_mutex(&globalLock); |
| 5343 | auto swapchain_data = dev_data->device_extensions.swapchainMap.find(swapchain); |
| 5344 | if (swapchain_data != dev_data->device_extensions.swapchainMap.end()) { |
| 5345 | if (swapchain_data->second->images.size() > 0) { |
| 5346 | for (auto swapchain_image : swapchain_data->second->images) { |
| 5347 | auto image_item = dev_data->imageLayoutMap.find(swapchain_image); |
| 5348 | if (image_item != dev_data->imageLayoutMap.end()) |
| 5349 | dev_data->imageLayoutMap.erase(image_item); |
| 5350 | } |
| 5351 | } |
| 5352 | delete swapchain_data->second; |
| 5353 | dev_data->device_extensions.swapchainMap.erase(swapchain); |
| 5354 | } |
| 5355 | loader_platform_thread_unlock_mutex(&globalLock); |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5356 | return dev_data->device_dispatch_table->DestroySwapchainKHR(device, swapchain, pAllocator); |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5357 | } |
| 5358 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5359 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR( |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5360 | VkDevice device, |
| 5361 | VkSwapchainKHR swapchain, |
| 5362 | uint32_t* pCount, |
| 5363 | VkImage* pSwapchainImages) |
| 5364 | { |
| 5365 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); |
| 5366 | VkResult result = dev_data->device_dispatch_table->GetSwapchainImagesKHR(device, swapchain, pCount, pSwapchainImages); |
| 5367 | |
| 5368 | if (result == VK_SUCCESS && pSwapchainImages != NULL) { |
| 5369 | // This should never happen and is checked by param checker. |
| 5370 | if (!pCount) return result; |
| 5371 | for (uint32_t i = 0; i < *pCount; ++i) { |
| 5372 | IMAGE_NODE* image_node = new IMAGE_NODE; |
| 5373 | image_node->layout = VK_IMAGE_LAYOUT_UNDEFINED; |
| 5374 | loader_platform_thread_lock_mutex(&globalLock); |
| 5375 | dev_data->device_extensions.swapchainMap[swapchain]->images.push_back(pSwapchainImages[i]); |
| 5376 | dev_data->imageLayoutMap[pSwapchainImages[i]] = image_node; |
| 5377 | loader_platform_thread_unlock_mutex(&globalLock); |
| 5378 | } |
| 5379 | } |
| 5380 | return result; |
| 5381 | } |
| 5382 | |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5383 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* pPresentInfo) |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5384 | { |
| 5385 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(queue), layer_data_map); |
| 5386 | bool skip_call = false; |
| 5387 | |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 5388 | #ifndef DISABLE_IMAGE_LAYOUT_VALIDATION |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5389 | if (pPresentInfo) { |
| 5390 | for (uint32_t i = 0; i < pPresentInfo->swapchainCount; ++i) { |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5391 | auto swapchain_data = dev_data->device_extensions.swapchainMap.find(pPresentInfo->pSwapchains[i]); |
| 5392 | if (swapchain_data != dev_data->device_extensions.swapchainMap.end() && pPresentInfo->pImageIndices[i] < swapchain_data->second->images.size()) { |
| 5393 | VkImage image = swapchain_data->second->images[pPresentInfo->pImageIndices[i]]; |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5394 | auto image_data = dev_data->imageLayoutMap.find(image); |
| 5395 | if (image_data != dev_data->imageLayoutMap.end()) { |
Ian Elliott | c623ba5 | 2015-11-20 14:13:17 -0700 | [diff] [blame] | 5396 | if (image_data->second->layout != VK_IMAGE_LAYOUT_PRESENT_SRC_KHR) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 5397 | skip_call |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_QUEUE, (uint64_t)queue, 0, DRAWSTATE_INVALID_IMAGE_LAYOUT, "DS", |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5398 | "Images passed to present must be in layout PRESENT_SOURCE_KHR but is in %d", image_data->second->layout); |
| 5399 | } |
| 5400 | } |
| 5401 | } |
| 5402 | } |
| 5403 | } |
Mark Lobodzinski | 78940a4 | 2015-11-30 16:48:53 -0700 | [diff] [blame] | 5404 | #endif // DISABLE_IMAGE_LAYOUT_VALIDATION |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5405 | |
| 5406 | if (VK_FALSE == skip_call) |
| 5407 | return dev_data->device_dispatch_table->QueuePresentKHR(queue, pPresentInfo); |
| 5408 | return VK_ERROR_VALIDATION_FAILED; |
| 5409 | } |
| 5410 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5411 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback( |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 5412 | VkInstance instance, |
| 5413 | VkFlags msgFlags, |
| 5414 | const PFN_vkDbgMsgCallback pfnMsgCallback, |
| 5415 | void* pUserData, |
| 5416 | VkDbgMsgCallback* pMsgCallback) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5417 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5418 | layer_data* my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 5419 | VkResult res = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
Tobin Ehlis | c91330b | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 5420 | if (VK_SUCCESS == res) { |
Tobin Ehlis | c91330b | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 5421 | res = layer_create_msg_callback(my_data->report_data, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); |
| 5422 | } |
| 5423 | return res; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5424 | } |
| 5425 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5426 | VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback( |
Courtney Goeltzenleuchter | 1c7c65d | 2015-06-10 17:39:03 -0600 | [diff] [blame] | 5427 | VkInstance instance, |
| 5428 | VkDbgMsgCallback msgCallback) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5429 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5430 | layer_data* my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Tobin Ehlis | cb08529 | 2015-12-01 09:57:09 -0700 | [diff] [blame] | 5431 | VkResult res = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback); |
Tobin Ehlis | c91330b | 2015-06-16 09:04:30 -0600 | [diff] [blame] | 5432 | layer_destroy_msg_callback(my_data->report_data, msgCallback); |
| 5433 | return res; |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5434 | } |
| 5435 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5436 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDbgMarkerBegin(VkCommandBuffer commandBuffer, const char* pMarker) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5437 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5438 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5439 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 5440 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5441 | if (!dev_data->device_extensions.debug_marker_enabled) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 5442 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 5443 | "Attempt to use CmdDbgMarkerBegin but extension disabled!"); |
Jon Ashburn | 6f8cd63 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 5444 | return; |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 5445 | } else if (pCB) { |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 5446 | |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5447 | skipCall |= addCmd(dev_data, pCB, CMD_DBGMARKERBEGIN); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5448 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5449 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5450 | debug_marker_dispatch_table(commandBuffer)->CmdDbgMarkerBegin(commandBuffer, pMarker); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5451 | } |
| 5452 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5453 | VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdDbgMarkerEnd(VkCommandBuffer commandBuffer) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5454 | { |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5455 | VkBool32 skipCall = VK_FALSE; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5456 | layer_data* dev_data = get_my_data_ptr(get_dispatch_key(commandBuffer), layer_data_map); |
| 5457 | GLOBAL_CB_NODE* pCB = getCBNode(dev_data, commandBuffer); |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5458 | if (!dev_data->device_extensions.debug_marker_enabled) { |
Courtney Goeltzenleuchter | f8fe128 | 2015-11-25 10:30:56 -0700 | [diff] [blame] | 5459 | skipCall |= log_msg(dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT, VK_OBJECT_TYPE_COMMAND_BUFFER, (uint64_t)commandBuffer, 0, DRAWSTATE_INVALID_EXTENSION, "DS", |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 5460 | "Attempt to use CmdDbgMarkerEnd but extension disabled!"); |
Jon Ashburn | 6f8cd63 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 5461 | return; |
Tobin Ehlis | a366ca2 | 2015-06-19 15:07:05 -0600 | [diff] [blame] | 5462 | } else if (pCB) { |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 5463 | |
Tobin Ehlis | 42d440c | 2015-10-20 17:06:16 -0600 | [diff] [blame] | 5464 | skipCall |= addCmd(dev_data, pCB, CMD_DBGMARKEREND); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5465 | } |
Tobin Ehlis | 48ddcb8 | 2015-09-09 11:31:10 -0600 | [diff] [blame] | 5466 | if (VK_FALSE == skipCall) |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5467 | debug_marker_dispatch_table(commandBuffer)->CmdDbgMarkerEnd(commandBuffer); |
Jon Ashburn | 6f8cd63 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 5468 | } |
| 5469 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5470 | VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice dev, const char* funcName) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5471 | { |
Jon Ashburn | 1245cec | 2015-05-18 13:20:15 -0600 | [diff] [blame] | 5472 | if (dev == NULL) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5473 | return NULL; |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 5474 | |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5475 | layer_data *dev_data; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5476 | /* loader uses this to force layer initialization; device object is wrapped */ |
| 5477 | if (!strcmp(funcName, "vkGetDeviceProcAddr")) { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5478 | VkBaseLayerObject* wrapped_dev = (VkBaseLayerObject*) dev; |
| 5479 | dev_data = get_my_data_ptr(get_dispatch_key(wrapped_dev->baseObject), layer_data_map); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5480 | dev_data->device_dispatch_table = new VkLayerDispatchTable; |
| 5481 | layer_initialize_dispatch_table(dev_data->device_dispatch_table, wrapped_dev); |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5482 | return (PFN_vkVoidFunction) vkGetDeviceProcAddr; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5483 | } |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5484 | dev_data = get_my_data_ptr(get_dispatch_key(dev), layer_data_map); |
Courtney Goeltzenleuchter | be63799 | 2015-06-25 18:01:43 -0600 | [diff] [blame] | 5485 | if (!strcmp(funcName, "vkCreateDevice")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5486 | return (PFN_vkVoidFunction) vkCreateDevice; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5487 | if (!strcmp(funcName, "vkDestroyDevice")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5488 | return (PFN_vkVoidFunction) vkDestroyDevice; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5489 | if (!strcmp(funcName, "vkQueueSubmit")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5490 | return (PFN_vkVoidFunction) vkQueueSubmit; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5491 | if (!strcmp(funcName, "vkDestroyInstance")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5492 | return (PFN_vkVoidFunction) vkDestroyInstance; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5493 | if (!strcmp(funcName, "vkDestroyDevice")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5494 | return (PFN_vkVoidFunction) vkDestroyDevice; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5495 | if (!strcmp(funcName, "vkDestroyFence")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5496 | return (PFN_vkVoidFunction) vkDestroyFence; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5497 | if (!strcmp(funcName, "vkDestroySemaphore")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5498 | return (PFN_vkVoidFunction) vkDestroySemaphore; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5499 | if (!strcmp(funcName, "vkDestroyEvent")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5500 | return (PFN_vkVoidFunction) vkDestroyEvent; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5501 | if (!strcmp(funcName, "vkDestroyQueryPool")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5502 | return (PFN_vkVoidFunction) vkDestroyQueryPool; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5503 | if (!strcmp(funcName, "vkDestroyBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5504 | return (PFN_vkVoidFunction) vkDestroyBuffer; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5505 | if (!strcmp(funcName, "vkDestroyBufferView")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5506 | return (PFN_vkVoidFunction) vkDestroyBufferView; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5507 | if (!strcmp(funcName, "vkDestroyImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5508 | return (PFN_vkVoidFunction) vkDestroyImage; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5509 | if (!strcmp(funcName, "vkDestroyImageView")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5510 | return (PFN_vkVoidFunction) vkDestroyImageView; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5511 | if (!strcmp(funcName, "vkDestroyShaderModule")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5512 | return (PFN_vkVoidFunction) vkDestroyShaderModule; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5513 | if (!strcmp(funcName, "vkDestroyPipeline")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5514 | return (PFN_vkVoidFunction) vkDestroyPipeline; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5515 | if (!strcmp(funcName, "vkDestroyPipelineLayout")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5516 | return (PFN_vkVoidFunction) vkDestroyPipelineLayout; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5517 | if (!strcmp(funcName, "vkDestroySampler")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5518 | return (PFN_vkVoidFunction) vkDestroySampler; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5519 | if (!strcmp(funcName, "vkDestroyDescriptorSetLayout")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5520 | return (PFN_vkVoidFunction) vkDestroyDescriptorSetLayout; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5521 | if (!strcmp(funcName, "vkDestroyDescriptorPool")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5522 | return (PFN_vkVoidFunction) vkDestroyDescriptorPool; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5523 | if (!strcmp(funcName, "vkDestroyFramebuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5524 | return (PFN_vkVoidFunction) vkDestroyFramebuffer; |
Tobin Ehlis | 1dce5f1 | 2015-07-07 10:42:20 -0600 | [diff] [blame] | 5525 | if (!strcmp(funcName, "vkDestroyRenderPass")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5526 | return (PFN_vkVoidFunction) vkDestroyRenderPass; |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 5527 | if (!strcmp(funcName, "vkCreateBuffer")) |
| 5528 | return (PFN_vkVoidFunction) vkCreateBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5529 | if (!strcmp(funcName, "vkCreateBufferView")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5530 | return (PFN_vkVoidFunction) vkCreateBufferView; |
Tobin Ehlis | b46be81 | 2015-10-23 16:00:08 -0600 | [diff] [blame] | 5531 | if (!strcmp(funcName, "vkCreateImage")) |
| 5532 | return (PFN_vkVoidFunction) vkCreateImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5533 | if (!strcmp(funcName, "vkCreateImageView")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5534 | return (PFN_vkVoidFunction) vkCreateImageView; |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 5535 | if (!strcmp(funcName, "CreatePipelineCache")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5536 | return (PFN_vkVoidFunction) vkCreatePipelineCache; |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 5537 | if (!strcmp(funcName, "DestroyPipelineCache")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5538 | return (PFN_vkVoidFunction) vkDestroyPipelineCache; |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 5539 | if (!strcmp(funcName, "GetPipelineCacheData")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5540 | return (PFN_vkVoidFunction) vkGetPipelineCacheData; |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 5541 | if (!strcmp(funcName, "MergePipelineCaches")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5542 | return (PFN_vkVoidFunction) vkMergePipelineCaches; |
Jon Ashburn | 0d60d27 | 2015-07-09 15:02:25 -0600 | [diff] [blame] | 5543 | if (!strcmp(funcName, "vkCreateGraphicsPipelines")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5544 | return (PFN_vkVoidFunction) vkCreateGraphicsPipelines; |
Mark Lobodzinski | 2adea75 | 2015-11-10 15:25:01 -0700 | [diff] [blame] | 5545 | if (!strcmp(funcName, "vkCreateComputePipelines")) |
| 5546 | return (PFN_vkVoidFunction) vkCreateComputePipelines; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5547 | if (!strcmp(funcName, "vkCreateSampler")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5548 | return (PFN_vkVoidFunction) vkCreateSampler; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5549 | if (!strcmp(funcName, "vkCreateDescriptorSetLayout")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5550 | return (PFN_vkVoidFunction) vkCreateDescriptorSetLayout; |
Mark Lobodzinski | 556f721 | 2015-04-17 14:11:39 -0500 | [diff] [blame] | 5551 | if (!strcmp(funcName, "vkCreatePipelineLayout")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5552 | return (PFN_vkVoidFunction) vkCreatePipelineLayout; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5553 | if (!strcmp(funcName, "vkCreateDescriptorPool")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5554 | return (PFN_vkVoidFunction) vkCreateDescriptorPool; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5555 | if (!strcmp(funcName, "vkResetDescriptorPool")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5556 | return (PFN_vkVoidFunction) vkResetDescriptorPool; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5557 | if (!strcmp(funcName, "vkAllocateDescriptorSets")) |
| 5558 | return (PFN_vkVoidFunction) vkAllocateDescriptorSets; |
Tobin Ehlis | 3c54311 | 2015-10-08 13:13:50 -0600 | [diff] [blame] | 5559 | if (!strcmp(funcName, "vkFreeDescriptorSets")) |
| 5560 | return (PFN_vkVoidFunction) vkFreeDescriptorSets; |
Chia-I Wu | 8cd8ecd | 2015-05-25 16:27:55 +0800 | [diff] [blame] | 5561 | if (!strcmp(funcName, "vkUpdateDescriptorSets")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5562 | return (PFN_vkVoidFunction) vkUpdateDescriptorSets; |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 5563 | if (!strcmp(funcName, "vkCreateCommandPool")) |
| 5564 | return (PFN_vkVoidFunction) vkCreateCommandPool; |
| 5565 | if (!strcmp(funcName, "vkDestroyCommandPool")) |
| 5566 | return (PFN_vkVoidFunction) vkDestroyCommandPool; |
Tobin Ehlis | 4c8381e | 2015-12-14 13:46:38 -0700 | [diff] [blame] | 5567 | if (!strcmp(funcName, "vkResetCommandPool")) |
| 5568 | return (PFN_vkVoidFunction) vkResetCommandPool; |
Chia-I Wu | 1f85191 | 2015-10-27 18:04:07 +0800 | [diff] [blame] | 5569 | if (!strcmp(funcName, "vkAllocateCommandBuffers")) |
| 5570 | return (PFN_vkVoidFunction) vkAllocateCommandBuffers; |
Mark Lobodzinski | a3b99d8 | 2015-11-18 08:38:27 -0700 | [diff] [blame] | 5571 | if (!strcmp(funcName, "vkFreeCommandBuffers")) |
| 5572 | return (PFN_vkVoidFunction) vkFreeCommandBuffers; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5573 | if (!strcmp(funcName, "vkBeginCommandBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5574 | return (PFN_vkVoidFunction) vkBeginCommandBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5575 | if (!strcmp(funcName, "vkEndCommandBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5576 | return (PFN_vkVoidFunction) vkEndCommandBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5577 | if (!strcmp(funcName, "vkResetCommandBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5578 | return (PFN_vkVoidFunction) vkResetCommandBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5579 | if (!strcmp(funcName, "vkCmdBindPipeline")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5580 | return (PFN_vkVoidFunction) vkCmdBindPipeline; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 5581 | if (!strcmp(funcName, "vkCmdSetViewport")) |
| 5582 | return (PFN_vkVoidFunction) vkCmdSetViewport; |
Courtney Goeltzenleuchter | 932cdb5 | 2015-09-21 11:44:06 -0600 | [diff] [blame] | 5583 | if (!strcmp(funcName, "vkCmdSetScissor")) |
| 5584 | return (PFN_vkVoidFunction) vkCmdSetScissor; |
Courtney Goeltzenleuchter | 09772bb | 2015-09-17 15:06:17 -0600 | [diff] [blame] | 5585 | if (!strcmp(funcName, "vkCmdSetLineWidth")) |
| 5586 | return (PFN_vkVoidFunction) vkCmdSetLineWidth; |
| 5587 | if (!strcmp(funcName, "vkCmdSetDepthBias")) |
| 5588 | return (PFN_vkVoidFunction) vkCmdSetDepthBias; |
| 5589 | if (!strcmp(funcName, "vkCmdSetBlendConstants")) |
| 5590 | return (PFN_vkVoidFunction) vkCmdSetBlendConstants; |
| 5591 | if (!strcmp(funcName, "vkCmdSetDepthBounds")) |
| 5592 | return (PFN_vkVoidFunction) vkCmdSetDepthBounds; |
| 5593 | if (!strcmp(funcName, "vkCmdSetStencilCompareMask")) |
| 5594 | return (PFN_vkVoidFunction) vkCmdSetStencilCompareMask; |
| 5595 | if (!strcmp(funcName, "vkCmdSetStencilWriteMask")) |
| 5596 | return (PFN_vkVoidFunction) vkCmdSetStencilWriteMask; |
| 5597 | if (!strcmp(funcName, "vkCmdSetStencilReference")) |
| 5598 | return (PFN_vkVoidFunction) vkCmdSetStencilReference; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5599 | if (!strcmp(funcName, "vkCmdBindDescriptorSets")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5600 | return (PFN_vkVoidFunction) vkCmdBindDescriptorSets; |
Courtney Goeltzenleuchter | 4696294 | 2015-04-16 13:38:46 -0600 | [diff] [blame] | 5601 | if (!strcmp(funcName, "vkCmdBindVertexBuffers")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5602 | return (PFN_vkVoidFunction) vkCmdBindVertexBuffers; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5603 | if (!strcmp(funcName, "vkCmdBindIndexBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5604 | return (PFN_vkVoidFunction) vkCmdBindIndexBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5605 | if (!strcmp(funcName, "vkCmdDraw")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5606 | return (PFN_vkVoidFunction) vkCmdDraw; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5607 | if (!strcmp(funcName, "vkCmdDrawIndexed")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5608 | return (PFN_vkVoidFunction) vkCmdDrawIndexed; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5609 | if (!strcmp(funcName, "vkCmdDrawIndirect")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5610 | return (PFN_vkVoidFunction) vkCmdDrawIndirect; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5611 | if (!strcmp(funcName, "vkCmdDrawIndexedIndirect")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5612 | return (PFN_vkVoidFunction) vkCmdDrawIndexedIndirect; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5613 | if (!strcmp(funcName, "vkCmdDispatch")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5614 | return (PFN_vkVoidFunction) vkCmdDispatch; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5615 | if (!strcmp(funcName, "vkCmdDispatchIndirect")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5616 | return (PFN_vkVoidFunction) vkCmdDispatchIndirect; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5617 | if (!strcmp(funcName, "vkCmdCopyBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5618 | return (PFN_vkVoidFunction) vkCmdCopyBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5619 | if (!strcmp(funcName, "vkCmdCopyImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5620 | return (PFN_vkVoidFunction) vkCmdCopyImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5621 | if (!strcmp(funcName, "vkCmdCopyBufferToImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5622 | return (PFN_vkVoidFunction) vkCmdCopyBufferToImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5623 | if (!strcmp(funcName, "vkCmdCopyImageToBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5624 | return (PFN_vkVoidFunction) vkCmdCopyImageToBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5625 | if (!strcmp(funcName, "vkCmdUpdateBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5626 | return (PFN_vkVoidFunction) vkCmdUpdateBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5627 | if (!strcmp(funcName, "vkCmdFillBuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5628 | return (PFN_vkVoidFunction) vkCmdFillBuffer; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5629 | if (!strcmp(funcName, "vkCmdClearColorImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5630 | return (PFN_vkVoidFunction) vkCmdClearColorImage; |
Chris Forbes | 2951d7d | 2015-06-22 17:21:59 +1200 | [diff] [blame] | 5631 | if (!strcmp(funcName, "vkCmdClearDepthStencilImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5632 | return (PFN_vkVoidFunction) vkCmdClearDepthStencilImage; |
Courtney Goeltzenleuchter | 9feb073 | 2015-10-15 16:51:05 -0600 | [diff] [blame] | 5633 | if (!strcmp(funcName, "vkCmdClearAttachments")) |
| 5634 | return (PFN_vkVoidFunction) vkCmdClearAttachments; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5635 | if (!strcmp(funcName, "vkCmdResolveImage")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5636 | return (PFN_vkVoidFunction) vkCmdResolveImage; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5637 | if (!strcmp(funcName, "vkCmdSetEvent")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5638 | return (PFN_vkVoidFunction) vkCmdSetEvent; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5639 | if (!strcmp(funcName, "vkCmdResetEvent")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5640 | return (PFN_vkVoidFunction) vkCmdResetEvent; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5641 | if (!strcmp(funcName, "vkCmdWaitEvents")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5642 | return (PFN_vkVoidFunction) vkCmdWaitEvents; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5643 | if (!strcmp(funcName, "vkCmdPipelineBarrier")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5644 | return (PFN_vkVoidFunction) vkCmdPipelineBarrier; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5645 | if (!strcmp(funcName, "vkCmdBeginQuery")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5646 | return (PFN_vkVoidFunction) vkCmdBeginQuery; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5647 | if (!strcmp(funcName, "vkCmdEndQuery")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5648 | return (PFN_vkVoidFunction) vkCmdEndQuery; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5649 | if (!strcmp(funcName, "vkCmdResetQueryPool")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5650 | return (PFN_vkVoidFunction) vkCmdResetQueryPool; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5651 | if (!strcmp(funcName, "vkCmdWriteTimestamp")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5652 | return (PFN_vkVoidFunction) vkCmdWriteTimestamp; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5653 | if (!strcmp(funcName, "vkCreateFramebuffer")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5654 | return (PFN_vkVoidFunction) vkCreateFramebuffer; |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 5655 | if (!strcmp(funcName, "vkCreateShaderModule")) |
| 5656 | return (PFN_vkVoidFunction) vkCreateShaderModule; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5657 | if (!strcmp(funcName, "vkCreateRenderPass")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5658 | return (PFN_vkVoidFunction) vkCreateRenderPass; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5659 | if (!strcmp(funcName, "vkCmdBeginRenderPass")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5660 | return (PFN_vkVoidFunction) vkCmdBeginRenderPass; |
Chia-I Wu | c278df8 | 2015-07-07 11:50:03 +0800 | [diff] [blame] | 5661 | if (!strcmp(funcName, "vkCmdNextSubpass")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5662 | return (PFN_vkVoidFunction) vkCmdNextSubpass; |
Courtney Goeltzenleuchter | 9cc421e | 2015-04-08 15:36:08 -0600 | [diff] [blame] | 5663 | if (!strcmp(funcName, "vkCmdEndRenderPass")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5664 | return (PFN_vkVoidFunction) vkCmdEndRenderPass; |
Tobin Ehlis | 5f728d3 | 2015-09-17 14:18:16 -0600 | [diff] [blame] | 5665 | if (!strcmp(funcName, "vkCmdExecuteCommands")) |
| 5666 | return (PFN_vkVoidFunction) vkCmdExecuteCommands; |
Michael Lentine | ee4ad4d | 2015-10-23 12:41:44 -0700 | [diff] [blame] | 5667 | if (!strcmp(funcName, "vkMapMemory")) |
| 5668 | return (PFN_vkVoidFunction) vkMapMemory; |
Jon Ashburn | 6f8cd63 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 5669 | |
Michael Lentine | 27b0f90 | 2015-10-12 11:30:14 -0500 | [diff] [blame] | 5670 | if (dev_data->device_extensions.wsi_enabled) |
| 5671 | { |
| 5672 | if (!strcmp(funcName, "vkCreateSwapchainKHR")) |
| 5673 | return (PFN_vkVoidFunction) vkCreateSwapchainKHR; |
| 5674 | if (!strcmp(funcName, "vkDestroySwapchainKHR")) |
| 5675 | return (PFN_vkVoidFunction) vkDestroySwapchainKHR; |
| 5676 | if (!strcmp(funcName, "vkGetSwapchainImagesKHR")) |
| 5677 | return (PFN_vkVoidFunction) vkGetSwapchainImagesKHR; |
| 5678 | if (!strcmp(funcName, "vkQueuePresentKHR")) |
| 5679 | return (PFN_vkVoidFunction) vkQueuePresentKHR; |
| 5680 | } |
| 5681 | |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5682 | VkLayerDispatchTable* pTable = dev_data->device_dispatch_table; |
| 5683 | if (dev_data->device_extensions.debug_marker_enabled) |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5684 | { |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 5685 | if (!strcmp(funcName, "vkCmdDbgMarkerBegin")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5686 | return (PFN_vkVoidFunction) vkCmdDbgMarkerBegin; |
Jon Ashburn | 7e07faf | 2015-06-18 15:02:58 -0600 | [diff] [blame] | 5687 | if (!strcmp(funcName, "vkCmdDbgMarkerEnd")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5688 | return (PFN_vkVoidFunction) vkCmdDbgMarkerEnd; |
Jon Ashburn | 6f8cd63 | 2015-06-01 09:37:38 -0600 | [diff] [blame] | 5689 | } |
| 5690 | { |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5691 | if (pTable->GetDeviceProcAddr == NULL) |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5692 | return NULL; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5693 | return pTable->GetDeviceProcAddr(dev, funcName); |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 5694 | } |
| 5695 | } |
| 5696 | |
Chia-I Wu | af9e4fd | 2015-11-06 06:42:02 +0800 | [diff] [blame] | 5697 | VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char* funcName) |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 5698 | { |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5699 | PFN_vkVoidFunction fptr; |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 5700 | if (instance == NULL) |
| 5701 | return NULL; |
| 5702 | |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5703 | layer_data* my_data; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5704 | /* loader uses this to force layer initialization; instance object is wrapped */ |
| 5705 | if (!strcmp(funcName, "vkGetInstanceProcAddr")) { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5706 | VkBaseLayerObject* wrapped_inst = (VkBaseLayerObject*) instance; |
| 5707 | my_data = get_my_data_ptr(get_dispatch_key(wrapped_inst->baseObject), layer_data_map); |
Tobin Ehlis | d04ccab | 2015-10-07 15:40:22 -0600 | [diff] [blame] | 5708 | my_data->instance_dispatch_table = new VkLayerInstanceDispatchTable; |
| 5709 | layer_init_instance_dispatch_table(my_data->instance_dispatch_table, wrapped_inst); |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5710 | return (PFN_vkVoidFunction) vkGetInstanceProcAddr; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5711 | } |
Courtney Goeltzenleuchter | 3c9f6ec | 2015-06-01 14:29:58 -0600 | [diff] [blame] | 5712 | if (!strcmp(funcName, "vkCreateInstance")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5713 | return (PFN_vkVoidFunction) vkCreateInstance; |
Jon Ashburn | e0fa228 | 2015-05-20 09:00:28 -0600 | [diff] [blame] | 5714 | if (!strcmp(funcName, "vkDestroyInstance")) |
Courtney Goeltzenleuchter | a4c8c71 | 2015-07-12 14:35:22 -0600 | [diff] [blame] | 5715 | return (PFN_vkVoidFunction) vkDestroyInstance; |
Courtney Goeltzenleuchter | 74c4ce9 | 2015-09-14 17:22:16 -0600 | [diff] [blame] | 5716 | if (!strcmp(funcName, "vkEnumerateInstanceLayerProperties")) |
| 5717 | return (PFN_vkVoidFunction) vkEnumerateInstanceLayerProperties; |
| 5718 | if (!strcmp(funcName, "vkEnumerateInstanceExtensionProperties")) |
| 5719 | return (PFN_vkVoidFunction) vkEnumerateInstanceExtensionProperties; |
| 5720 | if (!strcmp(funcName, "vkEnumerateDeviceLayerProperties")) |
| 5721 | return (PFN_vkVoidFunction) vkEnumerateDeviceLayerProperties; |
| 5722 | if (!strcmp(funcName, "vkEnumerateDeviceExtensionProperties")) |
| 5723 | return (PFN_vkVoidFunction) vkEnumerateDeviceExtensionProperties; |
Courtney Goeltzenleuchter | cc899fe | 2015-06-01 14:33:14 -0600 | [diff] [blame] | 5724 | |
Tobin Ehlis | 3247935 | 2015-12-01 09:48:58 -0700 | [diff] [blame] | 5725 | my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); |
Tobin Ehlis | fde4dce | 2015-06-16 15:50:44 -0600 | [diff] [blame] | 5726 | fptr = debug_report_get_instance_proc_addr(my_data->report_data, funcName); |
Courtney Goeltzenleuchter | cc899fe | 2015-06-01 14:33:14 -0600 | [diff] [blame] | 5727 | if (fptr) |
| 5728 | return fptr; |
| 5729 | |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5730 | { |
Tobin Ehlis | e6ab55a | 2015-10-07 09:38:40 -0600 | [diff] [blame] | 5731 | VkLayerInstanceDispatchTable* pTable = my_data->instance_dispatch_table; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5732 | if (pTable->GetInstanceProcAddr == NULL) |
Jon Ashburn | 79b78ac | 2015-05-05 14:22:52 -0600 | [diff] [blame] | 5733 | return NULL; |
Jon Ashburn | 4f2575f | 2015-05-28 16:25:02 -0600 | [diff] [blame] | 5734 | return pTable->GetInstanceProcAddr(instance, funcName); |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5735 | } |
Tobin Ehlis | 63bb948 | 2015-03-17 16:24:32 -0600 | [diff] [blame] | 5736 | } |