diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-07-25 21:47:07 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-07-25 21:47:07 +0200 |
| commit | 58dee5330566d8948783eb2246ed4e4cde316068 (patch) | |
| tree | 571f841260c66e10c0df2232e333cad19a157734 /src/video_core/texture_cache | |
| parent | 7b13113fbec7e3d37d064f1d30fb72a8a65467cc (diff) | |
[fmt] use {#:x} instead of 0x{:#x} (#4170)
continuation of #309 but applying to even more files than before :)
also makes them lowercase because `0xfafafa` is better as `0XFAFAFA`
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4170
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/formatter.cpp | 30 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 14 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/video_core/texture_cache/formatter.cpp b/src/video_core/texture_cache/formatter.cpp index 6e89864f45..2bdb811e90 100644 --- a/src/video_core/texture_cache/formatter.cpp +++ b/src/video_core/texture_cache/formatter.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project @@ -40,15 +40,15 @@ std::string Name(const ImageBase& image) { } switch (image.info.type) { case ImageType::e1D: - return fmt::format("Image 1D 0x{:x} {}{}", gpu_addr, width, resource); + return fmt::format("Image 1D {:#x} {}{}", gpu_addr, width, resource); case ImageType::e2D: - return fmt::format("Image 2D 0x{:x} {}x{}{}", gpu_addr, width, height, resource); + return fmt::format("Image 2D {:#x} {}x{}{}", gpu_addr, width, height, resource); case ImageType::e3D: - return fmt::format("Image 2D 0x{:x} {}x{}x{}{}", gpu_addr, width, height, depth, resource); + return fmt::format("Image 2D {:#x} {}x{}x{}{}", gpu_addr, width, height, depth, resource); case ImageType::Linear: - return fmt::format("Image Linear 0x{:x} {}x{}", gpu_addr, width, height); + return fmt::format("Image Linear {:#x} {}x{}", gpu_addr, width, height); case ImageType::Buffer: - return fmt::format("Buffer 0x{:x} {}", image.gpu_addr, image.info.size.width); + return fmt::format("Buffer {:#x} {}", image.gpu_addr, image.info.size.width); } return "Invalid"; } @@ -63,25 +63,25 @@ std::string Name(const ImageViewBase& image_view, GPUVAddr addr) { const std::string level = num_levels > 1 ? fmt::format(":{}", num_levels) : ""; switch (image_view.type) { case ImageViewType::e1D: - return fmt::format("ImageView 1D {:#X} {}{}", addr, width, level); + return fmt::format("ImageView 1D {:#x} {}{}", addr, width, level); case ImageViewType::e2D: - return fmt::format("ImageView 2D {:#X} {}x{}{}", addr, width, height, level); + return fmt::format("ImageView 2D {:#x} {}x{}{}", addr, width, height, level); case ImageViewType::Cube: - return fmt::format("ImageView Cube {:#X} {}x{}{}", addr, width, height, level); + return fmt::format("ImageView Cube {:#x} {}x{}{}", addr, width, height, level); case ImageViewType::e3D: - return fmt::format("ImageView 3D {:#X} {}x{}x{}{}", addr, width, height, depth, level); + return fmt::format("ImageView 3D {:#x} {}x{}x{}{}", addr, width, height, depth, level); case ImageViewType::e1DArray: - return fmt::format("ImageView 1DArray {:#X} {}{}|{}", addr, width, level, num_layers); + return fmt::format("ImageView 1DArray {:#x} {}{}|{}", addr, width, level, num_layers); case ImageViewType::e2DArray: - return fmt::format("ImageView 2DArray {:#X} {}x{}{}|{}", addr, width, height, level, + return fmt::format("ImageView 2DArray {:#x} {}x{}{}|{}", addr, width, height, level, num_layers); case ImageViewType::CubeArray: - return fmt::format("ImageView CubeArray {:#X} {}x{}{}|{}", addr, width, height, level, + return fmt::format("ImageView CubeArray {:#x} {}x{}{}|{}", addr, width, height, level, num_layers); case ImageViewType::Rect: - return fmt::format("ImageView Rect {:#X} {}x{}{}", addr, width, height, level); + return fmt::format("ImageView Rect {:#x} {}x{}{}", addr, width, height, level); case ImageViewType::Buffer: - return fmt::format("BufferView {:#X} {}", addr, width); + return fmt::format("BufferView {:#x} {}", addr, width); } return "Invalid"; } diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 2cfdb94359..98a5e053a7 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -1509,7 +1509,7 @@ ImageId TextureCache<P>::InsertImage(const ImageInfo& info, GPUVAddr gpu_addr, cpu_addr = std::optional<DAddr>(fake_addr); } } - ASSERT_MSG(cpu_addr, "Tried to insert an image to an invalid gpu_addr=0x{:x}", gpu_addr); + ASSERT_MSG(cpu_addr, "Tried to insert an image to an invalid gpu_addr={:#x}", gpu_addr); const ImageId image_id = JoinImages(info, gpu_addr, *cpu_addr); const Image& image = slot_images[image_id]; // Using "image.gpu_addr" instead of "gpu_addr" is important because it might be different @@ -2231,13 +2231,13 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) { [image_id](u64 page, ankerl::unordered_dense::map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>& selected_page_table) { const auto page_it = selected_page_table.find(page); if (page_it == selected_page_table.end()) { - ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS); + ASSERT_MSG(false, "Unregistering unregistered page={:#x}", page << YUZU_PAGEBITS); return; } std::vector<ImageId>& image_ids = page_it->second; const auto vector_it = std::ranges::find(image_ids, image_id); if (vector_it == image_ids.end()) { - ASSERT_MSG(false, "Unregistering unregistered image in page=0x{:x}", + ASSERT_MSG(false, "Unregistering unregistered image in page={:#x}", page << YUZU_PAGEBITS); return; } @@ -2251,13 +2251,13 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) { ForEachCPUPage(image.cpu_addr, image.guest_size_bytes, [this, map_id](u64 page) { const auto page_it = page_table.find(page); if (page_it == page_table.end()) { - ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS); + ASSERT_MSG(false, "Unregistering unregistered page={:#x}", page << YUZU_PAGEBITS); return; } std::vector<ImageMapId>& image_map_ids = page_it->second; const auto vector_it = std::ranges::find(image_map_ids, map_id); if (vector_it == image_map_ids.end()) { - ASSERT_MSG(false, "Unregistering unregistered image in page=0x{:x}", + ASSERT_MSG(false, "Unregistering unregistered image in page={:#x}", page << YUZU_PAGEBITS); return; } @@ -2279,7 +2279,7 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) { ForEachCPUPage(cpu_addr, size, [this, image_id](u64 page) { const auto page_it = page_table.find(page); if (page_it == page_table.end()) { - ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS); + ASSERT_MSG(false, "Unregistering unregistered page={:#x}", page << YUZU_PAGEBITS); return; } std::vector<ImageMapId>& image_map_ids = page_it->second; @@ -2367,7 +2367,7 @@ void TextureCache<P>::DeleteImage(ImageId image_id, bool immediate_delete) { const GPUVAddr gpu_addr = image.gpu_addr; const auto alloc_it = image_allocs_table.find(gpu_addr); if (alloc_it == image_allocs_table.end()) { - ASSERT_MSG(false, "Trying to delete an image alloc that does not exist in address 0x{:x}", + ASSERT_MSG(false, "Trying to delete an image alloc that does not exist in address {:#x}", gpu_addr); return; } |
