From 4681b9b43e236aee1d7fc49414f3bee53cc3b444 Mon Sep 17 00:00:00 2001 From: qbojj <105227351+qbojj@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:03:05 +0100 Subject: [PATCH] add VK_KHR_maintenance5 support --- .../VulkanPipelineStateViewer.cpp | 4 +- renderdoc/api/replay/pipestate.inl | 2 +- renderdoc/api/replay/vk_pipestate.h | 3 + renderdoc/driver/vulkan/extension_support.md | 2 +- renderdoc/driver/vulkan/vk_common.h | 1 + renderdoc/driver/vulkan/vk_core.cpp | 4 + renderdoc/driver/vulkan/vk_core.h | 14 ++ renderdoc/driver/vulkan/vk_dispatchtables.cpp | 36 ++-- renderdoc/driver/vulkan/vk_hookset_defs.h | 202 ++++++++++-------- renderdoc/driver/vulkan/vk_layer.cpp | 22 +- renderdoc/driver/vulkan/vk_overlay.cpp | 16 +- renderdoc/driver/vulkan/vk_postvs.cpp | 9 +- renderdoc/driver/vulkan/vk_replay.cpp | 1 + renderdoc/driver/vulkan/vk_state.cpp | 15 +- renderdoc/driver/vulkan/vk_state.h | 1 + renderdoc/driver/vulkan/vk_stringise.cpp | 3 +- .../driver/vulkan/wrappers/vk_cmd_funcs.cpp | 92 ++++++++ .../driver/vulkan/wrappers/vk_get_funcs.cpp | 22 ++ renderdoc/replay/renderdoc_serialise.inl | 7 +- 19 files changed, 323 insertions(+), 133 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index f1136fd5ea4..167f8ab8fe3 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -2411,7 +2411,7 @@ void VulkanPipelineStateViewer::setState() BufferDescription *buf = m_Ctx.GetBuffer(state.inputAssembly.indexBuffer.resourceId); if(buf) - length = buf->length; + length = qMin(buf->length, state.inputAssembly.indexBuffer.byteSize); RDTreeWidgetItem *node = new RDTreeWidgetItem( {tr("Index"), state.inputAssembly.indexBuffer.resourceId, tr("Index"), lit("-"), @@ -3802,7 +3802,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const VKPipe:: if(ib) { name = m_Ctx.GetResourceName(ia.indexBuffer.resourceId); - length = ib->length; + length = qMin(ib->length, ia.indexBuffer.byteSize); } QString ifmt = lit("UNKNOWN"); diff --git a/renderdoc/api/replay/pipestate.inl b/renderdoc/api/replay/pipestate.inl index 1724d378a34..f4e23163ef7 100644 --- a/renderdoc/api/replay/pipestate.inl +++ b/renderdoc/api/replay/pipestate.inl @@ -582,7 +582,7 @@ BoundVBuffer PipeState::GetIBuffer() const ret.resourceId = m_Vulkan->inputAssembly.indexBuffer.resourceId; ret.byteOffset = m_Vulkan->inputAssembly.indexBuffer.byteOffset; ret.byteStride = m_Vulkan->inputAssembly.indexBuffer.byteStride; - ret.byteSize = ~0ULL; + ret.byteSize = m_Vulkan->inputAssembly.indexBuffer.byteSize; } } diff --git a/renderdoc/api/replay/vk_pipestate.h b/renderdoc/api/replay/vk_pipestate.h index 248f93d67b8..8c262911de0 100644 --- a/renderdoc/api/replay/vk_pipestate.h +++ b/renderdoc/api/replay/vk_pipestate.h @@ -411,6 +411,9 @@ struct IndexBuffer DOCUMENT("The byte offset from the start of the buffer to the beginning of the index data."); uint64_t byteOffset = 0; + DOCUMENT("The number of bytes in the index buffer."); + uint64_t byteSize = 0; + DOCUMENT(R"(The number of bytes for each index in the index buffer. Typically 2 or 4 bytes but it can be 0 if no index buffer is bound. )"); diff --git a/renderdoc/driver/vulkan/extension_support.md b/renderdoc/driver/vulkan/extension_support.md index 59cc683d7f5..a49791c3687 100644 --- a/renderdoc/driver/vulkan/extension_support.md +++ b/renderdoc/driver/vulkan/extension_support.md @@ -171,6 +171,7 @@ Maintainers can update this file by updating vk.xml in this folder and running ` * `VK_KHR_maintenance2` * `VK_KHR_maintenance3` * `VK_KHR_maintenance4` +* `VK_KHR_maintenance5` * `VK_KHR_multiview` * `VK_KHR_performance_query` * `VK_KHR_pipeline_executable_properties` @@ -235,7 +236,6 @@ KHR extensions will definitely be implemented at some point, though KHR extensio * `VK_KHR_cooperative_matrix` * `VK_KHR_dynamic_rendering_local_read` -* `VK_KHR_maintenance5` * `VK_KHR_maintenance6` * `VK_KHR_map_memory2` * `VK_KHR_shader_expect_assume` diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h index 7ad7d80b538..44f23119734 100644 --- a/renderdoc/driver/vulkan/vk_common.h +++ b/renderdoc/driver/vulkan/vk_common.h @@ -978,6 +978,7 @@ enum class VulkanChunk : uint32_t vkCmdDrawMeshTasksEXT, vkCmdDrawMeshTasksIndirectEXT, vkCmdDrawMeshTasksIndirectCountEXT, + vkCmdBindIndexBuffer2KHR, Max, }; diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 6c9943e498a..2271ccc55d8 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -3989,6 +3989,10 @@ bool WrappedVulkan::ProcessChunk(ReadSerialiser &ser, VulkanChunk chunk) return Serialise_vkCmdSetTessellationDomainOriginEXT(ser, VK_NULL_HANDLE, VK_TESSELLATION_DOMAIN_ORIGIN_MAX_ENUM); + case VulkanChunk::vkCmdBindIndexBuffer2KHR: + return Serialise_vkCmdBindIndexBuffer2KHR(ser, VK_NULL_HANDLE, VK_NULL_HANDLE, 0, 0, + VK_INDEX_TYPE_MAX_ENUM); + // chunks that are reserved but not yet serialised case VulkanChunk::vkResetCommandPool: case VulkanChunk::vkCreateDepthTargetView: diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h index 854ba15103f..e911e61f73f 100644 --- a/renderdoc/driver/vulkan/vk_core.h +++ b/renderdoc/driver/vulkan/vk_core.h @@ -2812,4 +2812,18 @@ class WrappedVulkan : public IFrameCapturer VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride); + + // VK_KHR_maintenance5 + IMPLEMENT_FUNCTION_SERIALISED(void, vkCmdBindIndexBuffer2KHR, VkCommandBuffer commandBuffer, + VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, + VkIndexType indexType); + IMPLEMENT_FUNCTION_SERIALISED(void, vkGetDeviceImageSubresourceLayoutKHR, VkDevice device, + const VkDeviceImageSubresourceInfoKHR *pInfo, + VkSubresourceLayout2KHR *pLayout); + IMPLEMENT_FUNCTION_SERIALISED(void, vkGetImageSubresourceLayout2KHR, VkDevice device, + VkImage image, const VkImageSubresource2KHR *pSubresource, + VkSubresourceLayout2KHR *pLayout); + IMPLEMENT_FUNCTION_SERIALISED(void, vkGetRenderingAreaGranularityKHR, VkDevice device, + const VkRenderingAreaInfoKHR *pRenderingAreaInfo, + VkExtent2D *pGranularity); }; diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.cpp b/renderdoc/driver/vulkan/vk_dispatchtables.cpp index b2fcc812715..1de66ab944d 100644 --- a/renderdoc/driver/vulkan/vk_dispatchtables.cpp +++ b/renderdoc/driver/vulkan/vk_dispatchtables.cpp @@ -90,15 +90,15 @@ void InitInstanceExtensionTables(VkInstance instance, InstanceDeviceInfo *info) } #undef HookInitPromotedExtension -#define HookInitPromotedExtension(cond, func, suffix) \ - if(cond) \ - { \ - InstanceGPA(func); \ - InstanceGPA(CONCAT(func, suffix)); \ - if(table->func == NULL) \ - table->func = table->CONCAT(func, suffix); \ - if(table->CONCAT(func, suffix) == NULL) \ - table->CONCAT(func, suffix) = table->func; \ +#define HookInitPromotedExtension(cond, version, func, suffix) \ + if(cond) \ + { \ + InstanceGPA(func); \ + InstanceGPA(CONCAT(func, suffix)); \ + if(table->func == NULL) \ + table->func = table->CONCAT(func, suffix); \ + if(table->CONCAT(func, suffix) == NULL) \ + table->CONCAT(func, suffix) = table->func; \ } #undef HookInitExtensionEXTtoKHR @@ -140,15 +140,15 @@ void InitDeviceExtensionTables(VkDevice device, InstanceDeviceInfo *info) } #undef HookInitPromotedExtension -#define HookInitPromotedExtension(cond, func, suffix) \ - if(cond) \ - { \ - DeviceGPA(func); \ - DeviceGPA(CONCAT(func, suffix)); \ - if(table->func == NULL) \ - table->func = table->CONCAT(func, suffix); \ - if(table->CONCAT(func, suffix) == NULL) \ - table->CONCAT(func, suffix) = table->func; \ +#define HookInitPromotedExtension(cond, version, func, suffix) \ + if(cond) \ + { \ + DeviceGPA(func); \ + DeviceGPA(CONCAT(func, suffix)); \ + if(table->func == NULL) \ + table->func = table->CONCAT(func, suffix); \ + if(table->CONCAT(func, suffix) == NULL) \ + table->CONCAT(func, suffix) = table->func; \ } #undef HookInitExtensionEXTtoKHR diff --git a/renderdoc/driver/vulkan/vk_hookset_defs.h b/renderdoc/driver/vulkan/vk_hookset_defs.h index 0eebcebaa29..fdedcdc4f68 100644 --- a/renderdoc/driver/vulkan/vk_hookset_defs.h +++ b/renderdoc/driver/vulkan/vk_hookset_defs.h @@ -554,7 +554,8 @@ DeclExt(EXT_scalar_block_layout); \ DeclExt(KHR_vertex_attribute_divisor); \ DeclExt(KHR_line_rasterization); \ - DeclExt(KHR_calibrated_timestamps); + DeclExt(KHR_calibrated_timestamps); \ + DeclExt(KHR_maintenance5); // for simplicity and since the check itself is platform agnostic, // these aren't protected in platform defines @@ -679,7 +680,8 @@ CheckExt(EXT_scalar_block_layout, VK12); \ CheckExt(KHR_vertex_attribute_divisor, VKXX); \ CheckExt(KHR_line_rasterization, VKXX); \ - CheckExt(KHR_calibrated_timestamps, VKXX); + CheckExt(KHR_calibrated_timestamps, VKXX); \ + CheckExt(KHR_maintenance5, VKXX); #define HookInitVulkanInstanceExts_PhysDev() \ HookInitExtension(KHR_surface, GetPhysicalDeviceSurfaceSupportKHR); \ @@ -694,25 +696,27 @@ HookInitExtension(KHR_display, GetDisplayPlaneCapabilitiesKHR); \ HookInitExtension(NV_external_memory_capabilities, \ GetPhysicalDeviceExternalImageFormatPropertiesNV); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, GetPhysicalDeviceFeatures2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, GetPhysicalDeviceProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ + GetPhysicalDeviceFeatures2, KHR); \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ + GetPhysicalDeviceProperties2, KHR); \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceFormatProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceImageFormatProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceQueueFamilyProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceMemoryProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceSparseImageFormatProperties2, KHR); \ HookInitExtension(EXT_direct_mode_display, ReleaseDisplayEXT); \ HookInitExtension(EXT_display_surface_counter, GetPhysicalDeviceSurfaceCapabilities2EXT); \ - HookInitPromotedExtension(KHR_external_memory_capabilities, \ + HookInitPromotedExtension(KHR_external_memory_capabilities, VK11, \ GetPhysicalDeviceExternalBufferProperties, KHR); \ - HookInitPromotedExtension(KHR_external_semaphore_capabilities, \ + HookInitPromotedExtension(KHR_external_semaphore_capabilities, VK11, \ GetPhysicalDeviceExternalSemaphoreProperties, KHR); \ - HookInitPromotedExtension(KHR_external_fence_capabilities, \ + HookInitPromotedExtension(KHR_external_fence_capabilities, VK11, \ GetPhysicalDeviceExternalFenceProperties, KHR); \ HookInitExtension(KHR_device_group_creation &&KHR_surface, GetPhysicalDevicePresentRectanglesKHR); \ HookInitExtension(KHR_get_surface_capabilities2, GetPhysicalDeviceSurfaceFormats2KHR); \ @@ -724,7 +728,7 @@ HookInitExtension(KHR_performance_query, \ EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR); \ HookInitExtension(KHR_performance_query, GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR); \ - HookInitPromotedExtension(EXT_tooling_info, GetPhysicalDeviceToolProperties, EXT); \ + HookInitPromotedExtension(EXT_tooling_info, VK13, GetPhysicalDeviceToolProperties, EXT); \ HookInitExtension(KHR_fragment_shading_rate, GetPhysicalDeviceFragmentShadingRatesKHR); \ HookInitExtension(EXT_acquire_drm_display, AcquireDrmDisplayEXT); \ HookInitExtension(EXT_acquire_drm_display, GetDrmDisplayEXT); \ @@ -753,30 +757,32 @@ HookInitExtension(KHR_display, CreateDisplayPlaneSurfaceKHR); \ HookInitExtension(NV_external_memory_capabilities, \ GetPhysicalDeviceExternalImageFormatPropertiesNV); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, GetPhysicalDeviceFeatures2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, GetPhysicalDeviceProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ + GetPhysicalDeviceFeatures2, KHR); \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ + GetPhysicalDeviceProperties2, KHR); \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceFormatProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceImageFormatProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceQueueFamilyProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceMemoryProperties2, KHR); \ - HookInitPromotedExtension(KHR_get_physical_device_properties2, \ + HookInitPromotedExtension(KHR_get_physical_device_properties2, VK11, \ GetPhysicalDeviceSparseImageFormatProperties2, KHR); \ HookInitExtension(EXT_direct_mode_display, ReleaseDisplayEXT); \ HookInitExtension(EXT_display_surface_counter, GetPhysicalDeviceSurfaceCapabilities2EXT); \ - HookInitPromotedExtension(KHR_external_memory_capabilities, \ + HookInitPromotedExtension(KHR_external_memory_capabilities, VK11, \ GetPhysicalDeviceExternalBufferProperties, KHR); \ - HookInitPromotedExtension(KHR_external_semaphore_capabilities, \ + HookInitPromotedExtension(KHR_external_semaphore_capabilities, VK11, \ GetPhysicalDeviceExternalSemaphoreProperties, KHR); \ - HookInitPromotedExtension(KHR_external_fence_capabilities, \ + HookInitPromotedExtension(KHR_external_fence_capabilities, VK11, \ GetPhysicalDeviceExternalFenceProperties, KHR); \ HookInitExtension(EXT_debug_utils, CreateDebugUtilsMessengerEXT); \ HookInitExtension(EXT_debug_utils, DestroyDebugUtilsMessengerEXT); \ HookInitExtension(EXT_debug_utils, SubmitDebugUtilsMessageEXT); \ - HookInitPromotedExtension(KHR_device_group_creation, EnumeratePhysicalDeviceGroups, KHR); \ + HookInitPromotedExtension(KHR_device_group_creation, VK11, EnumeratePhysicalDeviceGroups, KHR); \ /* Not technically accurate - part of KHR_device_group - but these extensions are linked and */ \ /* should always be present/not present together. Keying from the instance extension ensures */ \ /* we'll load this function correctly when populating dispatch tables. */ \ @@ -793,7 +799,7 @@ HookInitExtension(KHR_performance_query, \ EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR); \ HookInitExtension(KHR_performance_query, GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR); \ - HookInitPromotedExtension(EXT_tooling_info, GetPhysicalDeviceToolProperties, EXT); \ + HookInitPromotedExtension(EXT_tooling_info, VK13, GetPhysicalDeviceToolProperties, EXT); \ HookInitExtension(KHR_fragment_shading_rate, GetPhysicalDeviceFragmentShadingRatesKHR); \ HookInitExtension(KHR_calibrated_timestamps, GetPhysicalDeviceCalibrateableTimeDomainsKHR); \ HookInitExtension_Instance_Win32(); \ @@ -814,7 +820,7 @@ HookInitExtension(KHR_swapchain, AcquireNextImageKHR); \ HookInitExtension(KHR_swapchain, QueuePresentKHR); \ HookInitExtension(KHR_display_swapchain, CreateSharedSwapchainsKHR); \ - HookInitPromotedExtension(KHR_maintenance1, TrimCommandPool, KHR); \ + HookInitPromotedExtension(KHR_maintenance1, VK11, TrimCommandPool, KHR); \ HookInitExtension(EXT_display_control, DisplayPowerControlEXT); \ HookInitExtension(EXT_display_control, RegisterDeviceEventEXT); \ HookInitExtension(EXT_display_control, RegisterDisplayEventEXT); \ @@ -825,19 +831,23 @@ HookInitExtension(KHR_external_semaphore_fd, GetSemaphoreFdKHR); \ HookInitExtension(KHR_external_fence_fd, ImportFenceFdKHR); \ HookInitExtension(KHR_external_fence_fd, GetFenceFdKHR); \ - HookInitPromotedExtension(KHR_get_memory_requirements2, GetBufferMemoryRequirements2, KHR); \ - HookInitPromotedExtension(KHR_get_memory_requirements2, GetImageMemoryRequirements2, KHR); \ - HookInitPromotedExtension(KHR_get_memory_requirements2, GetImageSparseMemoryRequirements2, KHR); \ + HookInitPromotedExtension(KHR_get_memory_requirements2, VK11, GetBufferMemoryRequirements2, KHR);\ + HookInitPromotedExtension(KHR_get_memory_requirements2, VK11, GetImageMemoryRequirements2, KHR); \ + HookInitPromotedExtension(KHR_get_memory_requirements2, VK11, \ + GetImageSparseMemoryRequirements2, KHR); \ HookInitExtension(AMD_shader_info, GetShaderInfoAMD); \ HookInitExtension(KHR_push_descriptor, CmdPushDescriptorSetKHR); \ - HookInitPromotedExtension(KHR_descriptor_update_template, CreateDescriptorUpdateTemplate, KHR); \ - HookInitPromotedExtension(KHR_descriptor_update_template, DestroyDescriptorUpdateTemplate, KHR); \ - HookInitPromotedExtension(KHR_descriptor_update_template, UpdateDescriptorSetWithTemplate, KHR); \ + HookInitPromotedExtension(KHR_descriptor_update_template, VK11, \ + CreateDescriptorUpdateTemplate, KHR); \ + HookInitPromotedExtension(KHR_descriptor_update_template, VK11, \ + DestroyDescriptorUpdateTemplate, KHR); \ + HookInitPromotedExtension(KHR_descriptor_update_template, VK11, \ + UpdateDescriptorSetWithTemplate, KHR); \ HookInitExtension(KHR_push_descriptor &&KHR_descriptor_update_template, \ CmdPushDescriptorSetWithTemplateKHR); \ - HookInitPromotedExtension(KHR_bind_memory2, BindBufferMemory2, KHR); \ - HookInitPromotedExtension(KHR_bind_memory2, BindImageMemory2, KHR); \ - HookInitPromotedExtension(KHR_maintenance3, GetDescriptorSetLayoutSupport, KHR); \ + HookInitPromotedExtension(KHR_bind_memory2, VK11, BindBufferMemory2, KHR); \ + HookInitPromotedExtension(KHR_bind_memory2, VK11, BindImageMemory2, KHR); \ + HookInitPromotedExtension(KHR_maintenance3, VK11, GetDescriptorSetLayoutSupport, KHR); \ HookInitExtension(AMD_buffer_marker, CmdWriteBufferMarkerAMD); \ HookInitExtension(EXT_debug_utils, SetDebugUtilsObjectNameEXT); \ HookInitExtension(EXT_debug_utils, SetDebugUtilsObjectTagEXT); \ @@ -847,26 +857,27 @@ HookInitExtension(EXT_debug_utils, CmdBeginDebugUtilsLabelEXT); \ HookInitExtension(EXT_debug_utils, CmdEndDebugUtilsLabelEXT); \ HookInitExtension(EXT_debug_utils, CmdInsertDebugUtilsLabelEXT); \ - HookInitPromotedExtension(KHR_sampler_ycbcr_conversion, CreateSamplerYcbcrConversion, KHR); \ - HookInitPromotedExtension(KHR_sampler_ycbcr_conversion, DestroySamplerYcbcrConversion, KHR); \ - HookInitPromotedExtension(KHR_device_group, GetDeviceGroupPeerMemoryFeatures, KHR); \ - HookInitPromotedExtension(KHR_device_group, CmdSetDeviceMask, KHR); \ - HookInitPromotedExtension(KHR_device_group, CmdDispatchBase, KHR); \ + HookInitPromotedExtension(KHR_sampler_ycbcr_conversion, VK11, CreateSamplerYcbcrConversion, KHR);\ + HookInitPromotedExtension(KHR_sampler_ycbcr_conversion, VK11, \ + DestroySamplerYcbcrConversion, KHR); \ + HookInitPromotedExtension(KHR_device_group, VK11, GetDeviceGroupPeerMemoryFeatures, KHR); \ + HookInitPromotedExtension(KHR_device_group, VK11, CmdSetDeviceMask, KHR); \ + HookInitPromotedExtension(KHR_device_group, VK11, CmdDispatchBase, KHR); \ HookInitExtension(KHR_device_group &&KHR_surface, GetDeviceGroupPresentCapabilitiesKHR); \ HookInitExtension(KHR_device_group &&KHR_surface, GetDeviceGroupSurfacePresentModesKHR); \ HookInitExtension(KHR_device_group &&KHR_swapchain, AcquireNextImage2KHR); \ HookInitExtension(protected_memory, GetDeviceQueue2); \ - HookInitPromotedExtension(KHR_draw_indirect_count, CmdDrawIndirectCount, KHR); \ - HookInitPromotedExtension(KHR_draw_indirect_count, CmdDrawIndexedIndirectCount, KHR); \ + HookInitPromotedExtension(KHR_draw_indirect_count, VK12, CmdDrawIndirectCount, KHR); \ + HookInitPromotedExtension(KHR_draw_indirect_count, VK12, CmdDrawIndexedIndirectCount, KHR); \ HookInitExtension(EXT_validation_cache, CreateValidationCacheEXT); \ HookInitExtension(EXT_validation_cache, DestroyValidationCacheEXT); \ HookInitExtension(EXT_validation_cache, MergeValidationCachesEXT); \ HookInitExtension(EXT_validation_cache, GetValidationCacheDataEXT); \ HookInitExtension(KHR_shared_presentable_image, GetSwapchainStatusKHR); \ - HookInitPromotedExtension(KHR_create_renderpass2, CreateRenderPass2, KHR); \ - HookInitPromotedExtension(KHR_create_renderpass2, CmdBeginRenderPass2, KHR); \ - HookInitPromotedExtension(KHR_create_renderpass2, CmdNextSubpass2, KHR); \ - HookInitPromotedExtension(KHR_create_renderpass2, CmdEndRenderPass2, KHR); \ + HookInitPromotedExtension(KHR_create_renderpass2, VK12, CreateRenderPass2, KHR); \ + HookInitPromotedExtension(KHR_create_renderpass2, VK12, CmdBeginRenderPass2, KHR); \ + HookInitPromotedExtension(KHR_create_renderpass2, VK12, CmdNextSubpass2, KHR); \ + HookInitPromotedExtension(KHR_create_renderpass2, VK12, CmdEndRenderPass2, KHR); \ HookInitExtension(EXT_transform_feedback, CmdBindTransformFeedbackBuffersEXT); \ HookInitExtension(EXT_transform_feedback, CmdBeginTransformFeedbackEXT); \ HookInitExtension(EXT_transform_feedback, CmdEndTransformFeedbackEXT); \ @@ -878,7 +889,7 @@ HookInitExtension(EXT_sample_locations, CmdSetSampleLocationsEXT); \ HookInitExtension(EXT_discard_rectangles, CmdSetDiscardRectangleEXT); \ HookInitExtension(EXT_calibrated_timestamps, GetCalibratedTimestampsEXT); \ - HookInitPromotedExtension(EXT_host_query_reset, ResetQueryPool, EXT); \ + HookInitPromotedExtension(EXT_host_query_reset, VK12, ResetQueryPool, EXT); \ HookInitExtension(EXT_buffer_device_address, GetBufferDeviceAddressEXT); \ HookInitExtension(EXT_hdr_metadata, SetHdrMetadataEXT); \ HookInitExtension(AMD_display_native_hdr, SetLocalDimmingAMD); \ @@ -889,57 +900,58 @@ HookInitExtension(EXT_line_rasterization, CmdSetLineStippleEXT); \ HookInitExtension(GOOGLE_display_timing, GetRefreshCycleDurationGOOGLE); \ HookInitExtension(GOOGLE_display_timing, GetPastPresentationTimingGOOGLE); \ - HookInitPromotedExtension(KHR_timeline_semaphore, GetSemaphoreCounterValue, KHR); \ - HookInitPromotedExtension(KHR_timeline_semaphore, WaitSemaphores, KHR); \ - HookInitPromotedExtension(KHR_timeline_semaphore, SignalSemaphore, KHR); \ + HookInitPromotedExtension(KHR_timeline_semaphore, VK12, GetSemaphoreCounterValue, KHR); \ + HookInitPromotedExtension(KHR_timeline_semaphore, VK12, WaitSemaphores, KHR); \ + HookInitPromotedExtension(KHR_timeline_semaphore, VK12, SignalSemaphore, KHR); \ HookInitExtension(KHR_performance_query, AcquireProfilingLockKHR); \ HookInitExtension(KHR_performance_query, ReleaseProfilingLockKHR); \ - HookInitPromotedExtension(KHR_buffer_device_address, GetBufferDeviceAddress, KHR); \ - HookInitPromotedExtension(KHR_buffer_device_address, GetBufferOpaqueCaptureAddress, KHR); \ - HookInitPromotedExtension(KHR_buffer_device_address, GetDeviceMemoryOpaqueCaptureAddress, KHR); \ - HookInitPromotedExtension(EXT_private_data, CreatePrivateDataSlot, EXT); \ - HookInitPromotedExtension(EXT_private_data, DestroyPrivateDataSlot, EXT); \ - HookInitPromotedExtension(EXT_private_data, SetPrivateData, EXT); \ - HookInitPromotedExtension(EXT_private_data, GetPrivateData, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetCullMode, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetFrontFace, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetPrimitiveTopology, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetViewportWithCount, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetScissorWithCount, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdBindVertexBuffers2, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthTestEnable, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthWriteEnable, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthCompareOp, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetDepthBoundsTestEnable, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetStencilTestEnable, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state, CmdSetStencilOp, EXT); \ - HookInitPromotedExtension(KHR_copy_commands2, CmdCopyBuffer2, KHR); \ - HookInitPromotedExtension(KHR_copy_commands2, CmdCopyImage2, KHR); \ - HookInitPromotedExtension(KHR_copy_commands2, CmdCopyBufferToImage2, KHR); \ - HookInitPromotedExtension(KHR_copy_commands2, CmdCopyImageToBuffer2, KHR); \ - HookInitPromotedExtension(KHR_copy_commands2, CmdBlitImage2, KHR); \ - HookInitPromotedExtension(KHR_copy_commands2, CmdResolveImage2, KHR); \ - HookInitPromotedExtension(KHR_synchronization2, CmdSetEvent2, KHR); \ - HookInitPromotedExtension(KHR_synchronization2, CmdResetEvent2, KHR); \ - HookInitPromotedExtension(KHR_synchronization2, CmdWaitEvents2, KHR); \ - HookInitPromotedExtension(KHR_synchronization2, CmdPipelineBarrier2, KHR); \ - HookInitPromotedExtension(KHR_synchronization2, CmdWriteTimestamp2, KHR); \ - HookInitPromotedExtension(KHR_synchronization2, QueueSubmit2, KHR); \ + HookInitPromotedExtension(KHR_buffer_device_address, VK12, GetBufferDeviceAddress, KHR); \ + HookInitPromotedExtension(KHR_buffer_device_address, VK12, GetBufferOpaqueCaptureAddress, KHR); \ + HookInitPromotedExtension(KHR_buffer_device_address, VK12, \ + GetDeviceMemoryOpaqueCaptureAddress, KHR); \ + HookInitPromotedExtension(EXT_private_data, VK13, CreatePrivateDataSlot, EXT); \ + HookInitPromotedExtension(EXT_private_data, VK13, DestroyPrivateDataSlot, EXT); \ + HookInitPromotedExtension(EXT_private_data, VK13, SetPrivateData, EXT); \ + HookInitPromotedExtension(EXT_private_data, VK13, GetPrivateData, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetCullMode, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetFrontFace, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetPrimitiveTopology, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetViewportWithCount, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetScissorWithCount, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdBindVertexBuffers2, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetDepthTestEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetDepthWriteEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetDepthCompareOp, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetDepthBoundsTestEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetStencilTestEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state, VK13, CmdSetStencilOp, EXT); \ + HookInitPromotedExtension(KHR_copy_commands2, VK13, CmdCopyBuffer2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, VK13, CmdCopyImage2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, VK13, CmdCopyBufferToImage2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, VK13, CmdCopyImageToBuffer2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, VK13, CmdBlitImage2, KHR); \ + HookInitPromotedExtension(KHR_copy_commands2, VK13, CmdResolveImage2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, VK13, CmdSetEvent2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, VK13, CmdResetEvent2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, VK13, CmdWaitEvents2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, VK13, CmdPipelineBarrier2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, VK13, CmdWriteTimestamp2, KHR); \ + HookInitPromotedExtension(KHR_synchronization2, VK13, QueueSubmit2, KHR); \ HookInitExtension(KHR_synchronization2 &&AMD_buffer_marker, CmdWriteBufferMarker2AMD); \ /* No GetQueueCheckpointData2NV without VK_NV_device_diagnostic_checkpoints */ \ HookInitExtension(KHR_present_wait, WaitForPresentKHR); \ - HookInitPromotedExtension(KHR_maintenance4, GetDeviceBufferMemoryRequirements, KHR); \ - HookInitPromotedExtension(KHR_maintenance4, GetDeviceImageMemoryRequirements, KHR); \ - HookInitPromotedExtension(KHR_maintenance4, GetDeviceImageSparseMemoryRequirements, KHR); \ + HookInitPromotedExtension(KHR_maintenance4, VK13, GetDeviceBufferMemoryRequirements, KHR); \ + HookInitPromotedExtension(KHR_maintenance4, VK13, GetDeviceImageMemoryRequirements, KHR); \ + HookInitPromotedExtension(KHR_maintenance4, VK13, GetDeviceImageSparseMemoryRequirements, KHR); \ HookInitExtension(EXT_color_write_enable, CmdSetColorWriteEnableEXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state2, CmdSetDepthBiasEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state2, VK13, CmdSetDepthBiasEnable, EXT); \ HookInitExtension(EXT_extended_dynamic_state2, CmdSetLogicOpEXT); \ HookInitExtension(EXT_extended_dynamic_state2, CmdSetPatchControlPointsEXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state2, CmdSetPrimitiveRestartEnable, EXT); \ - HookInitPromotedExtension(EXT_extended_dynamic_state2, CmdSetRasterizerDiscardEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state2, VK13, CmdSetPrimitiveRestartEnable, EXT); \ + HookInitPromotedExtension(EXT_extended_dynamic_state2, VK13, CmdSetRasterizerDiscardEnable, EXT);\ HookInitExtension(EXT_vertex_input_dynamic_state, CmdSetVertexInputEXT); \ - HookInitPromotedExtension(KHR_dynamic_rendering, CmdBeginRendering, KHR); \ - HookInitPromotedExtension(KHR_dynamic_rendering, CmdEndRendering, KHR); \ + HookInitPromotedExtension(KHR_dynamic_rendering, VK13, CmdBeginRendering, KHR); \ + HookInitPromotedExtension(KHR_dynamic_rendering, VK13, CmdEndRendering, KHR); \ HookInitExtension(KHR_fragment_shading_rate, CmdSetFragmentShadingRateKHR); \ HookInitExtension(EXT_pageable_device_local_memory, SetDeviceMemoryPriorityEXT); \ HookInitExtension(EXT_swapchain_maintenance1, ReleaseSwapchainImagesEXT); \ @@ -982,6 +994,10 @@ HookInitExtension(KHR_calibrated_timestamps, GetCalibratedTimestampsKHR); \ HookInitExtension(KHR_line_rasterization, CmdSetLineStippleKHR); \ HookInitExtensionEXTtoKHR(CmdSetLineStipple); \ + HookInitExtension(KHR_maintenance5, CmdBindIndexBuffer2KHR); \ + HookInitExtension(KHR_maintenance5, GetDeviceImageSubresourceLayoutKHR); \ + HookInitExtension(KHR_maintenance5, GetImageSubresourceLayout2KHR); \ + HookInitExtension(KHR_maintenance5, GetRenderingAreaGranularityKHR); \ HookInitExtension_Device_Win32(); \ HookInitExtension_Device_Linux(); \ HookInitExtension_Device_GGP(); \ @@ -1790,6 +1806,14 @@ uint64_t *, pMaxDeviation); \ HookDefine3(void, vkCmdSetLineStippleKHR, VkCommandBuffer, commandBuffer, uint32_t, \ lineStippleFactor, uint16_t, lineStipplePattern); \ + HookDefine5(void, vkCmdBindIndexBuffer2KHR, VkCommandBuffer, commandBuffer, VkBuffer, buffer, \ + VkDeviceSize, offset, VkDeviceSize, size, VkIndexType, indexType); \ + HookDefine3(void, vkGetDeviceImageSubresourceLayoutKHR, VkDevice, device, \ + const VkDeviceImageSubresourceInfoKHR *, pInfo, VkSubresourceLayout2KHR *, pLayout); \ + HookDefine4(void, vkGetImageSubresourceLayout2KHR, VkDevice, device, VkImage, image, \ + const VkImageSubresource2KHR *, pSubresource, VkSubresourceLayout2KHR *, pLayout); \ + HookDefine3(void, vkGetRenderingAreaGranularityKHR, VkDevice, device, \ + const VkRenderingAreaInfoKHR *, pRenderingAreaInfo, VkExtent2D *, pGranularity); \ HookDefine_Win32(); \ HookDefine_Linux(); \ HookDefine_GGP(); \ diff --git a/renderdoc/driver/vulkan/vk_layer.cpp b/renderdoc/driver/vulkan/vk_layer.cpp index 487618ed0d0..dd9be2de098 100644 --- a/renderdoc/driver/vulkan/vk_layer.cpp +++ b/renderdoc/driver/vulkan/vk_layer.cpp @@ -397,12 +397,16 @@ VK_LAYER_RENDERDOC_CaptureEnumerateInstanceExtensionProperties( // for promoted extensions, we return the function pointer for either name as an alias. #undef HookInitPromotedExtension -#define HookInitPromotedExtension(cond, function, suffix) \ - if(!strcmp(pName, STRINGIZE(CONCAT(vk, function))) || \ - !strcmp(pName, STRINGIZE(CONCAT(vk, CONCAT(function, suffix))))) \ +#define HookInitPromotedExtension(cond, version, function, suffix) \ + if(!strcmp(pName, STRINGIZE(CONCAT(vk, CONCAT(function, suffix))))) \ { \ if(cond) \ return (PFN_vkVoidFunction)&CONCAT(hooked_vk, function); \ + } \ + if(!strcmp(pName, STRINGIZE(CONCAT(vk, function)))) \ + { \ + if(instDevInfo->vulkanVersion >= version) \ + return (PFN_vkVoidFunction)&CONCAT(hooked_vk, function); \ } #undef HookInitExtensionEXTtoKHR @@ -413,18 +417,18 @@ VK_LAYER_RENDERDOC_CaptureEnumerateInstanceExtensionProperties( VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL VK_LAYER_RENDERDOC_CaptureGetDeviceProcAddr(VkDevice device, const char *pName) { + if(device == VK_NULL_HANDLE || pName == NULL) + return NULL; + if(!strcmp("vkGetDeviceProcAddr", pName)) return (PFN_vkVoidFunction)&VK_LAYER_RENDERDOC_CaptureGetDeviceProcAddr; if(!strcmp("vkCreateDevice", pName)) return (PFN_vkVoidFunction)&hooked_vkCreateDevice; if(!strcmp("vkDestroyDevice", pName)) return (PFN_vkVoidFunction)&hooked_vkDestroyDevice; - + HookInitVulkanDevice(); - if(device == VK_NULL_HANDLE) - return NULL; - InstanceDeviceInfo *instDevInfo = GetRecord(device)->instDevInfo; DeclExts(); @@ -512,7 +516,7 @@ VK_LAYER_RENDERDOC_CaptureGetInstanceProcAddr(VkInstance instance, const char *p return (PFN_vkVoidFunction)&CONCAT(hooked_vk, function); #undef HookInitPromotedExtension -#define HookInitPromotedExtension(cond, function, suffix) \ +#define HookInitPromotedExtension(cond, version, function, suffix) \ if(!strcmp(pName, STRINGIZE(CONCAT(vk, function))) || \ !strcmp(pName, STRINGIZE(CONCAT(vk, CONCAT(function, suffix))))) \ return (PFN_vkVoidFunction)&CONCAT(hooked_vk, function); @@ -593,7 +597,7 @@ VK_LAYER_RENDERDOC_Capture_layerGetPhysicalDeviceProcAddr(VkInstance instance, c return NULL; #undef HookInitPromotedExtension -#define HookInitPromotedExtension(cond, function, suffix) \ +#define HookInitPromotedExtension(cond, version, function, suffix) \ if(!strcmp(pName, STRINGIZE(CONCAT(vk, function))) || \ !strcmp(pName, STRINGIZE(CONCAT(vk, CONCAT(function, suffix))))) \ return NULL; diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp index fdc1907db1d..83770a5fcc2 100644 --- a/renderdoc/driver/vulkan/vk_overlay.cpp +++ b/renderdoc/driver/vulkan/vk_overlay.cpp @@ -364,9 +364,19 @@ void VulkanDebugManager::PatchLineStripIndexBuffer(const ActionDescription *acti if(action->flags & ActionFlags::Indexed) { - GetBufferData(rs.ibuffer.buf, - rs.ibuffer.offs + uint64_t(action->indexOffset) * rs.ibuffer.bytewidth, - uint64_t(action->numIndices) * rs.ibuffer.bytewidth, indices); + uint64_t offset = uint64_t(action->indexOffset) * rs.ibuffer.bytewidth; + uint64_t data_len = uint64_t(action->numIndices) * rs.ibuffer.bytewidth; + + uint64_t len = RDCMIN(data_len, rs.ibuffer.size - offset); + + GetBufferData(rs.ibuffer.buf, rs.ibuffer.offs + offset, len, indices); + + if(len < data_len) + { + // fill the rest with 0s + indices.resize((size_t)data_len); + memset(indices.data() + len, 0, (size_t)(data_len - len)); + } if(rs.ibuffer.bytewidth == 4) idx32 = (uint32_t *)indices.data(); diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp index 9c6c93713aa..57ec51e7237 100644 --- a/renderdoc/driver/vulkan/vk_postvs.cpp +++ b/renderdoc/driver/vulkan/vk_postvs.cpp @@ -4331,8 +4331,13 @@ void VulkanReplay::FetchVSOut(uint32_t eventId, VulkanRenderState &state) // fetch ibuffer if(state.ibuffer.buf != ResourceId()) - GetBufferData(state.ibuffer.buf, state.ibuffer.offs + action->indexOffset * idxsize, - uint64_t(action->numIndices) * idxsize, idxdata); + { + uint64_t offset = uint64_t(action->indexOffset) * idxsize; + uint64_t data_len = uint64_t(action->numIndices) * idxsize; + + uint64_t len = RDCMIN(data_len, state.ibuffer.size - offset); + GetBufferData(state.ibuffer.buf, state.ibuffer.offs + offset, len, idxdata); + } // figure out what the maximum index could be, so we can clamp our index buffer to something // sane diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 107779623d8..25d04f4fd20 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -1185,6 +1185,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId) ret.inputAssembly.indexBuffer.resourceId = rm->GetOriginalID(state.ibuffer.buf); ret.inputAssembly.indexBuffer.byteOffset = state.ibuffer.offs; ret.inputAssembly.indexBuffer.byteStride = state.ibuffer.bytewidth; + ret.inputAssembly.indexBuffer.byteSize = state.ibuffer.size; ret.inputAssembly.primitiveRestartEnable = state.primRestartEnable != VK_FALSE; ret.inputAssembly.topology = MakePrimitiveTopology(state.primitiveTopology, state.patchControlPoints); diff --git a/renderdoc/driver/vulkan/vk_state.cpp b/renderdoc/driver/vulkan/vk_state.cpp index 3ebc509c96c..e00384a9596 100644 --- a/renderdoc/driver/vulkan/vk_state.cpp +++ b/renderdoc/driver/vulkan/vk_state.cpp @@ -138,7 +138,6 @@ void setupRenderingInfo(const VulkanRenderState::DynamicRendering &dynamicRender VulkanRenderState::VulkanRenderState() { - RDCEraseEl(ibuffer); } void VulkanRenderState::BeginRenderPassAndApplyState(WrappedVulkan *vk, VkCommandBuffer cmd, @@ -606,9 +605,17 @@ void VulkanRenderState::BindPipeline(WrappedVulkan *vk, VkCommandBuffer cmd, else if(ibuffer.bytewidth == 1) type = VK_INDEX_TYPE_UINT8_KHR; - ObjDisp(cmd)->CmdBindIndexBuffer( - Unwrap(cmd), Unwrap(vk->GetResourceManager()->GetCurrentHandle(ibuffer.buf)), - ibuffer.offs, type); + VkBuffer idxBufferUnwrapped = + Unwrap(vk->GetResourceManager()->GetCurrentHandle(ibuffer.buf)); + if(ibuffer.size == VK_WHOLE_SIZE) + { + ObjDisp(cmd)->CmdBindIndexBuffer(Unwrap(cmd), idxBufferUnwrapped, ibuffer.offs, type); + } + else + { + ObjDisp(cmd)->CmdBindIndexBuffer2KHR(Unwrap(cmd), idxBufferUnwrapped, ibuffer.offs, + ibuffer.size, type); + } } if(vk->DynamicVertexInput() && dynamicStates[VkDynamicVertexInputEXT]) diff --git a/renderdoc/driver/vulkan/vk_state.h b/renderdoc/driver/vulkan/vk_state.h index b639a7fa44c..650a6f68487 100644 --- a/renderdoc/driver/vulkan/vk_state.h +++ b/renderdoc/driver/vulkan/vk_state.h @@ -150,6 +150,7 @@ struct VulkanRenderState { ResourceId buf; VkDeviceSize offs = 0; + VkDeviceSize size = VK_WHOLE_SIZE; int bytewidth = 0; } ibuffer; diff --git a/renderdoc/driver/vulkan/vk_stringise.cpp b/renderdoc/driver/vulkan/vk_stringise.cpp index a046586bfb9..505330d69e8 100644 --- a/renderdoc/driver/vulkan/vk_stringise.cpp +++ b/renderdoc/driver/vulkan/vk_stringise.cpp @@ -28,7 +28,7 @@ template <> rdcstr DoStringise(const VulkanChunk &el) { - RDCCOMPILE_ASSERT((uint32_t)VulkanChunk::Max == 1201, "Chunks changed without updating names"); + RDCCOMPILE_ASSERT((uint32_t)VulkanChunk::Max == 1202, "Chunks changed without updating names"); BEGIN_ENUM_STRINGISE(VulkanChunk) { @@ -233,6 +233,7 @@ rdcstr DoStringise(const VulkanChunk &el) STRINGISE_ENUM_CLASS(vkCmdDrawMeshTasksEXT) STRINGISE_ENUM_CLASS(vkCmdDrawMeshTasksIndirectEXT) STRINGISE_ENUM_CLASS(vkCmdDrawMeshTasksIndirectCountEXT) + STRINGISE_ENUM_CLASS(vkCmdBindIndexBuffer2KHR) STRINGISE_ENUM_CLASS_NAMED(Max, "Max Chunk"); } END_ENUM_STRINGISE() diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index 738979709cc..62773d0a7a1 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -3893,6 +3893,94 @@ void WrappedVulkan::vkCmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer } } +template +bool WrappedVulkan::Serialise_vkCmdBindIndexBuffer2KHR(SerialiserType &ser, + VkCommandBuffer commandBuffer, + VkBuffer buffer, VkDeviceSize offset, + VkDeviceSize size, VkIndexType indexType) +{ + SERIALISE_ELEMENT(commandBuffer); + SERIALISE_ELEMENT(buffer).Important(); + SERIALISE_ELEMENT(offset).OffsetOrSize(); + SERIALISE_ELEMENT(size).OffsetOrSize(); + SERIALISE_ELEMENT(indexType).Important(); + + Serialise_DebugMessages(ser); + + SERIALISE_CHECK_READ_ERRORS(); + + if(IsReplayingAndReading()) + { + m_LastCmdBufferID = GetResourceManager()->GetOriginalID(GetResID(commandBuffer)); + + if(IsActiveReplaying(m_State)) + { + if(InRerecordRange(m_LastCmdBufferID)) + { + commandBuffer = RerecordCmdBuf(m_LastCmdBufferID); + ObjDisp(commandBuffer) + ->CmdBindIndexBuffer2KHR(Unwrap(commandBuffer), Unwrap(buffer), offset, size, indexType); + + { + VulkanRenderState &renderstate = GetCmdRenderState(); + renderstate.ibuffer.buf = GetResID(buffer); + renderstate.ibuffer.offs = offset; + renderstate.ibuffer.size = size; + + if(indexType == VK_INDEX_TYPE_UINT32) + renderstate.ibuffer.bytewidth = 4; + else if(indexType == VK_INDEX_TYPE_UINT8_KHR) + renderstate.ibuffer.bytewidth = 1; + else + renderstate.ibuffer.bytewidth = 2; + } + } + } + else + { + // track while reading, as we need to bind current topology & index byte width in AddAction + if(indexType == VK_INDEX_TYPE_UINT32) + m_BakedCmdBufferInfo[m_LastCmdBufferID].state.ibuffer.bytewidth = 4; + else if(indexType == VK_INDEX_TYPE_UINT8_KHR) + m_BakedCmdBufferInfo[m_LastCmdBufferID].state.ibuffer.bytewidth = 1; + else + m_BakedCmdBufferInfo[m_LastCmdBufferID].state.ibuffer.bytewidth = 2; + + // track while reading, as we need to track resource usage + m_BakedCmdBufferInfo[m_LastCmdBufferID].state.ibuffer.buf = GetResID(buffer); + + ObjDisp(commandBuffer) + ->CmdBindIndexBuffer2KHR(Unwrap(commandBuffer), Unwrap(buffer), offset, size, indexType); + } + } + + return true; +} + +void WrappedVulkan::vkCmdBindIndexBuffer2KHR(VkCommandBuffer commandBuffer, VkBuffer buffer, + VkDeviceSize offset, VkDeviceSize size, + VkIndexType indexType) +{ + SCOPED_DBG_SINK(); + + SERIALISE_TIME_CALL( + ObjDisp(commandBuffer) + ->CmdBindIndexBuffer2KHR(Unwrap(commandBuffer), Unwrap(buffer), offset, size, indexType)); + + if(IsCaptureMode(m_State)) + { + VkResourceRecord *record = GetRecord(commandBuffer); + + CACHE_THREAD_SERIALISER(); + + SCOPED_SERIALISE_CHUNK(VulkanChunk::vkCmdBindIndexBuffer2KHR); + Serialise_vkCmdBindIndexBuffer2KHR(ser, commandBuffer, buffer, offset, size, indexType); + + record->AddChunk(scope.Get(&record->cmdInfo->alloc)); + record->MarkBufferFrameReferenced(GetRecord(buffer), 0, VK_WHOLE_SIZE, eFrameRef_Read); + } +} + template bool WrappedVulkan::Serialise_vkCmdPushConstants(SerialiserType &ser, VkCommandBuffer commandBuffer, VkPipelineLayout layout, @@ -7733,3 +7821,7 @@ INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBeginRendering, VkCommandBuffer comma const VkRenderingInfo *pRenderingInfo); INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdEndRendering, VkCommandBuffer commandBuffer); + +INSTANTIATE_FUNCTION_SERIALISED(void, vkCmdBindIndexBuffer2KHR, VkCommandBuffer commandBuffer, + VkBuffer buffer, VkDeviceSize offset, VkDeviceSize size, + VkIndexType indexType); diff --git a/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp index 779cf784b6b..a48c856ea46 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_get_funcs.cpp @@ -1171,3 +1171,25 @@ VkResult WrappedVulkan::vkGetPhysicalDeviceFragmentShadingRatesKHR( ->GetPhysicalDeviceFragmentShadingRatesKHR(Unwrap(physicalDevice), pFragmentShadingRateCount, pFragmentShadingRates); } + +void WrappedVulkan::vkGetDeviceImageSubresourceLayoutKHR(VkDevice device, + const VkDeviceImageSubresourceInfoKHR *pInfo, + VkSubresourceLayout2KHR *pLayout) +{ + ObjDisp(device)->GetDeviceImageSubresourceLayoutKHR(Unwrap(device), pInfo, pLayout); +} + +void WrappedVulkan::vkGetImageSubresourceLayout2KHR(VkDevice device, VkImage image, + const VkImageSubresource2KHR *pSubresource, + VkSubresourceLayout2KHR *pLayout) +{ + ObjDisp(device)->GetImageSubresourceLayout2KHR(Unwrap(device), Unwrap(image), pSubresource, + pLayout); +} + +void WrappedVulkan::vkGetRenderingAreaGranularityKHR(VkDevice device, + const VkRenderingAreaInfoKHR *pRenderingAreaInfo, + VkExtent2D *pGranularity) +{ + ObjDisp(device)->GetRenderingAreaGranularityKHR(Unwrap(device), pRenderingAreaInfo, pGranularity); +} diff --git a/renderdoc/replay/renderdoc_serialise.inl b/renderdoc/replay/renderdoc_serialise.inl index 1a3ca2459d4..51937c60331 100644 --- a/renderdoc/replay/renderdoc_serialise.inl +++ b/renderdoc/replay/renderdoc_serialise.inl @@ -2058,9 +2058,10 @@ void DoSerialise(SerialiserType &ser, VKPipe::IndexBuffer &el) { SERIALISE_MEMBER(resourceId); SERIALISE_MEMBER(byteOffset); + SERIALISE_MEMBER(byteSize); SERIALISE_MEMBER(byteStride); - SIZE_CHECK(24); + SIZE_CHECK(32); } template @@ -2070,7 +2071,7 @@ void DoSerialise(SerialiserType &ser, VKPipe::InputAssembly &el) SERIALISE_MEMBER(indexBuffer); SERIALISE_MEMBER(topology); - SIZE_CHECK(40); + SIZE_CHECK(48); } template @@ -2409,7 +2410,7 @@ void DoSerialise(SerialiserType &ser, VKPipe::State &el) SERIALISE_MEMBER(conditionalRendering); - SIZE_CHECK(2712); + SIZE_CHECK(2720); } #pragma endregion Vulkan pipeline state