diff --git a/src/client/refresh/vk/header/qvk.h b/src/client/refresh/vk/header/qvk.h index aa3ccdeb..26c5276f 100644 --- a/src/client/refresh/vk/header/qvk.h +++ b/src/client/refresh/vk/header/qvk.h @@ -303,18 +303,11 @@ void QVk_DrawColorRect(float *ubo, VkDeviceSize uboSize, qvkrenderpasstype_t rp void QVk_DrawTexRect(const float *ubo, VkDeviceSize uboSize, qvktexture_t *texture); void QVk_BindPipeline(qvkpipeline_t *pipeline); void QVk_SubmitStagingBuffers(void); + // debug label related functions -#if defined(_DEBUG) || defined(ENABLE_DEBUG_LABELS) void QVk_DebugSetObjectName(uint64_t obj, VkObjectType objType, const char *objName); void QVk_DebugSetObjectTag(uint64_t obj, VkObjectType objType, uint64_t tagName, size_t tagSize, const void *tagData); void QVk_DebugLabelBegin(const VkCommandBuffer *cmdBuffer, const char *labelName, const float r, const float g, const float b); void QVk_DebugLabelEnd(const VkCommandBuffer *cmdBuffer); void QVk_DebugLabelInsert(const VkCommandBuffer *cmdBuffer, const char *labelName, const float r, const float g, const float b); -#else -#define QVk_DebugSetObjectName(a, b, c) -#define QVk_DebugSetObjectTag(a, b, c, d, e) -#define QVk_DebugLabelBegin(a, b, c, d, e) -#define QVk_DebugLabelEnd(a) -#define QVk_DebugLabelInsert(a, b, c, d, e) -#endif #endif diff --git a/src/client/refresh/vk/vk_common.c b/src/client/refresh/vk/vk_common.c index 25c72d9b..6891dbdf 100644 --- a/src/client/refresh/vk/vk_common.c +++ b/src/client/refresh/vk/vk_common.c @@ -16,8 +16,8 @@ See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ + /* ** VK_COMMON.C ** @@ -705,21 +705,21 @@ static void CreateDrawBuffers() QVk_CreateColorBuffer(vk_renderpasses[RP_WORLD].sampleCount, &vk_msaaColorbuffer, 0); R_Printf(PRINT_ALL, "...created MSAAx%d color buffer\n", vk_renderpasses[RP_WORLD].sampleCount); - QVk_DebugSetObjectName((uint64_t)vk_depthbuffer.image, VK_OBJECT_TYPE_IMAGE, "Depth Buffer: World"); + QVk_DebugSetObjectName((uint64_t)vk_depthbuffer.resource.image, VK_OBJECT_TYPE_IMAGE, "Depth Buffer: World"); QVk_DebugSetObjectName((uint64_t)vk_depthbuffer.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, "Image View: World Depth Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_depthbuffer.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: World Depth Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_ui_depthbuffer.image, VK_OBJECT_TYPE_IMAGE, "Depth Buffer: UI"); + QVk_DebugSetObjectName((uint64_t)vk_depthbuffer.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: World Depth Buffer"); + QVk_DebugSetObjectName((uint64_t)vk_ui_depthbuffer.resource.image, VK_OBJECT_TYPE_IMAGE, "Depth Buffer: UI"); QVk_DebugSetObjectName((uint64_t)vk_ui_depthbuffer.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, "Image View: UI Depth Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_ui_depthbuffer.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: UI Depth Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_colorbuffer.image, VK_OBJECT_TYPE_IMAGE, "Color Buffer: World"); + QVk_DebugSetObjectName((uint64_t)vk_ui_depthbuffer.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: UI Depth Buffer"); + QVk_DebugSetObjectName((uint64_t)vk_colorbuffer.resource.image, VK_OBJECT_TYPE_IMAGE, "Color Buffer: World"); QVk_DebugSetObjectName((uint64_t)vk_colorbuffer.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, "Image View: World Color Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_colorbuffer.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: World Color Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_colorbufferWarp.image, VK_OBJECT_TYPE_IMAGE, "Color Buffer: Warp Postprocess"); + QVk_DebugSetObjectName((uint64_t)vk_colorbuffer.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: World Color Buffer"); + QVk_DebugSetObjectName((uint64_t)vk_colorbufferWarp.resource.image, VK_OBJECT_TYPE_IMAGE, "Color Buffer: Warp Postprocess"); QVk_DebugSetObjectName((uint64_t)vk_colorbufferWarp.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, "Image View: Warp Postprocess Color Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_colorbufferWarp.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Warp Postprocess Color Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_msaaColorbuffer.image, VK_OBJECT_TYPE_IMAGE, "Color Buffer: MSAA"); + QVk_DebugSetObjectName((uint64_t)vk_colorbufferWarp.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Warp Postprocess Color Buffer"); + QVk_DebugSetObjectName((uint64_t)vk_msaaColorbuffer.resource.image, VK_OBJECT_TYPE_IMAGE, "Color Buffer: MSAA"); QVk_DebugSetObjectName((uint64_t)vk_msaaColorbuffer.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, "Image View: MSAA Color Buffer"); - QVk_DebugSetObjectName((uint64_t)vk_msaaColorbuffer.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: MSAA Color Buffer"); + QVk_DebugSetObjectName((uint64_t)vk_msaaColorbuffer.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: MSAA Color Buffer"); } // internal helper @@ -939,12 +939,12 @@ static void CreateDynamicBuffers() CreateUboDescriptorSet(&vk_uboDescriptorSets[i], vk_dynUniformBuffers[i].resource.buffer); QVk_DebugSetObjectName((uint64_t)vk_uboDescriptorSets[i], VK_OBJECT_TYPE_DESCRIPTOR_SET, va("Dynamic UBO Descriptor Set #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Vertex Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Vertex Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Index Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Index Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Uniform Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Uniform Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Vertex Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Vertex Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Index Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Index Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Uniform Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Uniform Buffer #%d", i)); } } @@ -1044,8 +1044,8 @@ static void CreateStagingBuffers() VK_VERIFY(QVk_BeginCommand(&vk_stagingBuffers[i].cmdBuffer)); QVk_DebugSetObjectName((uint64_t)vk_stagingBuffers[i].fence, VK_OBJECT_TYPE_FENCE, va("Fence: Staging Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_stagingBuffers[i].buffer.buffer, VK_OBJECT_TYPE_BUFFER, va("Staging Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_stagingBuffers[i].buffer.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Staging Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_stagingBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Staging Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_stagingBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Staging Buffer #%d", i)); QVk_DebugSetObjectName((uint64_t)vk_stagingBuffers[i].cmdBuffer, VK_OBJECT_TYPE_COMMAND_BUFFER, va("Command Buffer: Staging Buffer #%d", i)); } } @@ -1099,12 +1099,12 @@ static void CreateStaticBuffers() QVk_CreateVertexBuffer(colorVerts, sizeof(colorVerts), &vk_colorRectVbo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0); QVk_CreateIndexBuffer(indices, sizeof(indices), &vk_rectIbo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0); - QVk_DebugSetObjectName((uint64_t)vk_texRectVbo.buffer, VK_OBJECT_TYPE_BUFFER, "Static Buffer: Textured Rectangle VBO"); - QVk_DebugSetObjectName((uint64_t)vk_texRectVbo.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Textured Rectangle VBO"); - QVk_DebugSetObjectName((uint64_t)vk_colorRectVbo.buffer, VK_OBJECT_TYPE_BUFFER, "Static Buffer: Colored Rectangle VBO"); - QVk_DebugSetObjectName((uint64_t)vk_colorRectVbo.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Colored Rectangle VBO"); - QVk_DebugSetObjectName((uint64_t)vk_rectIbo.buffer, VK_OBJECT_TYPE_BUFFER, "Static Buffer: Rectangle IBO"); - QVk_DebugSetObjectName((uint64_t)vk_rectIbo.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Rectangle IBO"); + QVk_DebugSetObjectName((uint64_t)vk_texRectVbo.resource.buffer, VK_OBJECT_TYPE_BUFFER, "Static Buffer: Textured Rectangle VBO"); + QVk_DebugSetObjectName((uint64_t)vk_texRectVbo.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Textured Rectangle VBO"); + QVk_DebugSetObjectName((uint64_t)vk_colorRectVbo.resource.buffer, VK_OBJECT_TYPE_BUFFER, "Static Buffer: Colored Rectangle VBO"); + QVk_DebugSetObjectName((uint64_t)vk_colorRectVbo.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Colored Rectangle VBO"); + QVk_DebugSetObjectName((uint64_t)vk_rectIbo.resource.buffer, VK_OBJECT_TYPE_BUFFER, "Static Buffer: Rectangle IBO"); + QVk_DebugSetObjectName((uint64_t)vk_rectIbo.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: Rectangle IBO"); } // internal helper @@ -1540,6 +1540,7 @@ qboolean QVk_Init(SDL_Window *window) return false; } + // add space for validation layer if (vk_validation->value) extCount++; @@ -1957,7 +1958,7 @@ void QVk_BeginRenderpass(qvkrenderpasstype_t rpType) } }; -#if defined(_DEBUG) || defined(ENABLE_DEBUG_LABELS) +#if defined(_DEBUG) if (rpType == RP_WORLD) { QVk_DebugLabelBegin(&vk_commandbuffers[vk_activeBufferIdx], "Draw World", 0.f, 1.f, 0.f); } @@ -2014,8 +2015,8 @@ uint8_t *QVk_GetVertexBuffer(VkDeviceSize size, VkBuffer *dstBuffer, VkDeviceSiz QVk_CreateVertexBuffer(NULL, vk_config.vertex_buffer_size, &vk_dynVertexBuffers[i], VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_MEMORY_PROPERTY_HOST_CACHED_BIT); vk_dynVertexBuffers[i].pMappedData = buffer_map(&vk_dynVertexBuffers[i].resource); - QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Vertex Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Vertex Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Vertex Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynVertexBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Vertex Buffer #%d", i)); } } @@ -2057,8 +2058,8 @@ static uint8_t *QVk_GetIndexBuffer(VkDeviceSize size, VkDeviceSize *dstOffset) QVk_CreateIndexBuffer(NULL, vk_config.index_buffer_size, &vk_dynIndexBuffers[i], VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_MEMORY_PROPERTY_HOST_CACHED_BIT); vk_dynIndexBuffers[i].pMappedData = buffer_map(&vk_dynIndexBuffers[i].resource); - QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Index Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Index Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Index Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynIndexBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Index Buffer #%d", i)); } } @@ -2109,8 +2110,8 @@ uint8_t *QVk_GetUniformBuffer(VkDeviceSize size, uint32_t *dstOffset, VkDescript CreateUboDescriptorSet(&vk_uboDescriptorSets[i], vk_dynUniformBuffers[i].resource.buffer); QVk_DebugSetObjectName((uint64_t)vk_uboDescriptorSets[i], VK_OBJECT_TYPE_DESCRIPTOR_SET, va("Dynamic UBO Descriptor Set #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Uniform Buffer #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Uniform Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].resource.buffer, VK_OBJECT_TYPE_BUFFER, va("Dynamic Uniform Buffer #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_dynUniformBuffers[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: Dynamic Uniform Buffer #%d", i)); } } diff --git a/src/client/refresh/vk/vk_device.c b/src/client/refresh/vk/vk_device.c index 72f269da..62a92a16 100644 --- a/src/client/refresh/vk/vk_device.c +++ b/src/client/refresh/vk/vk_device.c @@ -285,10 +285,9 @@ qboolean QVk_CreateDevice(int preferredDeviceIdx) } // debug label related functions -#if defined(_DEBUG) || defined(ENABLE_DEBUG_LABELS) - void QVk_DebugSetObjectName(uint64_t obj, VkObjectType objType, const char *objName) { +#if defined(_DEBUG) VkDebugUtilsObjectNameInfoEXT oNameInf = { .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT, .pNext = NULL, @@ -298,10 +297,12 @@ void QVk_DebugSetObjectName(uint64_t obj, VkObjectType objType, const char *objN }; qvkSetDebugUtilsObjectNameEXT(vk_device.logical, &oNameInf); +#endif } void QVk_DebugSetObjectTag(uint64_t obj, VkObjectType objType, uint64_t tagName, size_t tagSize, const void *tagData) { +#if defined(_DEBUG) VkDebugUtilsObjectTagInfoEXT oTagInf = { .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT, .pNext = NULL, @@ -313,10 +314,12 @@ void QVk_DebugSetObjectTag(uint64_t obj, VkObjectType objType, uint64_t tagName, }; qvkSetDebugUtilsObjectTagEXT(vk_device.logical, &oTagInf); +#endif } void QVk_DebugLabelBegin(const VkCommandBuffer *cmdBuffer, const char *labelName, const float r, const float g, const float b) { +#if defined(_DEBUG) VkDebugUtilsLabelEXT labelInfo = { .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, .pNext = NULL, @@ -325,15 +328,19 @@ void QVk_DebugLabelBegin(const VkCommandBuffer *cmdBuffer, const char *labelName }; qvkCmdBeginDebugUtilsLabelEXT(*cmdBuffer, &labelInfo); +#endif } void QVk_DebugLabelEnd(const VkCommandBuffer *cmdBuffer) { +#if defined(_DEBUG) qvkCmdEndDebugUtilsLabelEXT(*cmdBuffer); +#endif } void QVk_DebugLabelInsert(const VkCommandBuffer *cmdBuffer, const char *labelName, const float r, const float g, const float b) { +#if defined(_DEBUG) VkDebugUtilsLabelEXT labelInfo = { .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT, .pNext = NULL, @@ -342,6 +349,5 @@ void QVk_DebugLabelInsert(const VkCommandBuffer *cmdBuffer, const char *labelNam }; qvkInsertDebugUtilsLabelEXT(*cmdBuffer, &labelInfo); -} - #endif +} diff --git a/src/client/refresh/vk/vk_draw.c b/src/client/refresh/vk/vk_draw.c index e521ac1b..158e858e 100644 --- a/src/client/refresh/vk/vk_draw.c +++ b/src/client/refresh/vk/vk_draw.c @@ -319,10 +319,10 @@ void Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte *data { QVVKTEXTURE_CLEAR(vk_rawTexture); QVk_CreateTexture(&vk_rawTexture, (unsigned char*)&image32, 256, 256, vk_current_sampler); - QVk_DebugSetObjectName((uint64_t)vk_rawTexture.image, VK_OBJECT_TYPE_IMAGE, "Image: raw texture"); + QVk_DebugSetObjectName((uint64_t)vk_rawTexture.resource.image, VK_OBJECT_TYPE_IMAGE, "Image: raw texture"); QVk_DebugSetObjectName((uint64_t)vk_rawTexture.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, "Image View: raw texture"); QVk_DebugSetObjectName((uint64_t)vk_rawTexture.descriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET, "Descriptor Set: raw texture"); - QVk_DebugSetObjectName((uint64_t)vk_rawTexture.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: raw texture"); + QVk_DebugSetObjectName((uint64_t)vk_rawTexture.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: raw texture"); } float imgTransform[] = { (float)x / vid.width, (float)y / vid.height, diff --git a/src/client/refresh/vk/vk_image.c b/src/client/refresh/vk/vk_image.c index ae929367..bd507b60 100644 --- a/src/client/refresh/vk/vk_image.c +++ b/src/client/refresh/vk/vk_image.c @@ -1283,10 +1283,10 @@ Vk_LoadPic(char *name, byte *pic, int width, int realwidth, int height, int real { QVVKTEXTURE_CLEAR(vk_scrapTextures[texnum]); QVk_CreateTexture(&vk_scrapTextures[texnum], texBuffer, image->upload_width, image->upload_height, samplerType ? *samplerType : vk_current_sampler); - QVk_DebugSetObjectName((uint64_t)vk_scrapTextures[texnum].image, VK_OBJECT_TYPE_IMAGE, va("Image: %s", name)); + QVk_DebugSetObjectName((uint64_t)vk_scrapTextures[texnum].resource.image, VK_OBJECT_TYPE_IMAGE, va("Image: %s", name)); QVk_DebugSetObjectName((uint64_t)vk_scrapTextures[texnum].imageView, VK_OBJECT_TYPE_IMAGE_VIEW, va("Image View: %s", name)); QVk_DebugSetObjectName((uint64_t)vk_scrapTextures[texnum].descriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET, va("Descriptor Set: %s", name)); - QVk_DebugSetObjectName((uint64_t)vk_scrapTextures[texnum].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: scrap texture"); + QVk_DebugSetObjectName((uint64_t)vk_scrapTextures[texnum].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: scrap texture"); } image->vk_texture = vk_scrapTextures[texnum]; @@ -1308,10 +1308,10 @@ Vk_LoadPic(char *name, byte *pic, int width, int realwidth, int height, int real image->th = 1; QVk_CreateTexture(&image->vk_texture, (unsigned char*)texBuffer, image->upload_width, image->upload_height, samplerType ? *samplerType : vk_current_sampler); - QVk_DebugSetObjectName((uint64_t)image->vk_texture.image, VK_OBJECT_TYPE_IMAGE, va("Image: %s", name)); + QVk_DebugSetObjectName((uint64_t)image->vk_texture.resource.image, VK_OBJECT_TYPE_IMAGE, va("Image: %s", name)); QVk_DebugSetObjectName((uint64_t)image->vk_texture.imageView, VK_OBJECT_TYPE_IMAGE_VIEW, va("Image View: %s", name)); QVk_DebugSetObjectName((uint64_t)image->vk_texture.descriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET, va("Descriptor Set: %s", name)); - QVk_DebugSetObjectName((uint64_t)image->vk_texture.allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: game textures"); + QVk_DebugSetObjectName((uint64_t)image->vk_texture.resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, "Memory: game textures"); } if (texBuffer) { diff --git a/src/client/refresh/vk/vk_rsurf.c b/src/client/refresh/vk/vk_rsurf.c index 2930e8dc..d5ca0b6d 100644 --- a/src/client/refresh/vk/vk_rsurf.c +++ b/src/client/refresh/vk/vk_rsurf.c @@ -1082,10 +1082,10 @@ static void LM_UploadBlock( qboolean dynamic ) { QVVKTEXTURE_CLEAR(vk_state.lightmap_textures[texture]); QVk_CreateTexture(&vk_state.lightmap_textures[texture], vk_lms.lightmap_buffer, BLOCK_WIDTH, BLOCK_HEIGHT, vk_current_lmap_sampler); - QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[texture].image, VK_OBJECT_TYPE_IMAGE, va("Image: dynamic lightmap #%d", texture)); + QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[texture].resource.image, VK_OBJECT_TYPE_IMAGE, va("Image: dynamic lightmap #%d", texture)); QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[texture].imageView, VK_OBJECT_TYPE_IMAGE_VIEW, va("Image View: dynamic lightmap #%d", texture)); QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[texture].descriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET, va("Descriptor Set: dynamic lightmap #%d", texture)); - QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[texture].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: dynamic lightmap #%d", texture)); + QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[texture].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: dynamic lightmap #%d", texture)); } if ( ++vk_lms.current_lightmap_texture == MAX_LIGHTMAPS ) ri.Sys_Error( ERR_DROP, "%s() - MAX_LIGHTMAPS exceeded\n", __func__); @@ -1279,10 +1279,10 @@ void Vk_BeginBuildingLightmaps (model_t *m) { QVVKTEXTURE_CLEAR(vk_state.lightmap_textures[i]); QVk_CreateTexture(&vk_state.lightmap_textures[i], (unsigned char*)dummy, BLOCK_WIDTH, BLOCK_HEIGHT, vk_current_lmap_sampler); - QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[i].image, VK_OBJECT_TYPE_IMAGE, va("Image: dynamic lightmap #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[i].resource.image, VK_OBJECT_TYPE_IMAGE, va("Image: dynamic lightmap #%d", i)); QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[i].imageView, VK_OBJECT_TYPE_IMAGE_VIEW, va("Image View: dynamic lightmap #%d", i)); QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[i].descriptorSet, VK_OBJECT_TYPE_DESCRIPTOR_SET, va("Descriptor Set: dynamic lightmap #%d", i)); - QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[i].allocInfo.deviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: dynamic lightmap #%d", i)); + QVk_DebugSetObjectName((uint64_t)vk_state.lightmap_textures[i].resource.memory, VK_OBJECT_TYPE_DEVICE_MEMORY, va("Memory: dynamic lightmap #%d", i)); } } }