From 1ffa4747dbb08bcb7ed5bd0d2b479b197ca67802 Mon Sep 17 00:00:00 2001 From: gibbed Date: Sun, 13 May 2018 08:42:36 -0500 Subject: [PATCH] [Vulkan] Better debug object names. --- src/xenia/gpu/vulkan/render_cache.cc | 2 +- src/xenia/gpu/vulkan/texture_cache.cc | 8 +++++--- src/xenia/gpu/vulkan/vulkan_shader.cc | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/xenia/gpu/vulkan/render_cache.cc b/src/xenia/gpu/vulkan/render_cache.cc index 2b7d20a7b..8288706e0 100644 --- a/src/xenia/gpu/vulkan/render_cache.cc +++ b/src/xenia/gpu/vulkan/render_cache.cc @@ -220,7 +220,7 @@ VkResult CachedTileView::Initialize(VkCommandBuffer command_buffer) { device_->DbgSetObjectName( reinterpret_cast(image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, - xe::format_string("RT %.8X %.8X(%d)", key.tile_offset, key.tile_width, + xe::format_string("RT: 0x%.8X 0x%.8X(%d)", key.tile_offset, key.tile_width, key.tile_width)); VkMemoryRequirements memory_requirements; diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc index 9444d244c..5c89059e8 100644 --- a/src/xenia/gpu/vulkan/texture_cache.cc +++ b/src/xenia/gpu/vulkan/texture_cache.cc @@ -457,7 +457,7 @@ TextureCache::Texture* TextureCache::DemandResolveTexture( reinterpret_cast(texture->image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, xe::format_string( - "0x%.8X - 0x%.8X", texture_info.guest_address, + "RT: 0x%.8X - 0x%.8X", texture_info.guest_address, texture_info.guest_address + texture_info.input_length)); // Setup an access watch. If this texture is touched, it is destroyed. @@ -535,8 +535,10 @@ TextureCache::Texture* TextureCache::Demand(const TextureInfo& texture_info, reinterpret_cast(texture->image), VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, xe::format_string( - "0x%.8X - 0x%.8X", texture_info.guest_address, - texture_info.guest_address + texture_info.input_length)); + "T: 0x%.8X - 0x%.8X (%s, %s)", texture_info.guest_address, + texture_info.guest_address + texture_info.input_length, + texture_info.format_info()->name, + get_dimension_name(texture_info.dimension))); textures_[texture_hash] = texture; COUNT_profile_set("gpu/texture_cache/textures", textures_.size()); diff --git a/src/xenia/gpu/vulkan/vulkan_shader.cc b/src/xenia/gpu/vulkan/vulkan_shader.cc index 6f1fe6eee..13b291310 100644 --- a/src/xenia/gpu/vulkan/vulkan_shader.cc +++ b/src/xenia/gpu/vulkan/vulkan_shader.cc @@ -51,7 +51,7 @@ bool VulkanShader::Prepare() { device_->DbgSetObjectName(uint64_t(shader_module_), VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT, - xe::format_string("%.16llX", ucode_data_hash())); + xe::format_string("S: %.16llX", ucode_data_hash())); return status == VK_SUCCESS; }