From aebd1083286169aea29aa6a516f8bdf0630ea318 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Mon, 20 Nov 2023 09:15:17 -0800 Subject: [PATCH] Formatting fixes --- src/video_core/rasterizer_cache/surface_params.cpp | 7 ++++--- src/video_core/renderer_vulkan/vk_texture_runtime.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/video_core/rasterizer_cache/surface_params.cpp b/src/video_core/rasterizer_cache/surface_params.cpp index 97dde6e0a..fe1db9ca2 100644 --- a/src/video_core/rasterizer_cache/surface_params.cpp +++ b/src/video_core/rasterizer_cache/surface_params.cpp @@ -222,9 +222,10 @@ u32 SurfaceParams::LevelOf(PAddr level_addr) const { std::string SurfaceParams::DebugName(bool scaled, bool custom, u8 sample_count) const noexcept { const u32 scaled_width = scaled ? GetScaledWidth() : width; const u32 scaled_height = scaled ? GetScaledHeight() : height; - return fmt::format("Surface: {}x{} {} samples {} levels from {:#x} to {:#x} ({}{})", scaled_width, - scaled_height, PixelFormatAsString(pixel_format), static_cast(sample_count), levels, addr, - end, custom ? "custom," : "", scaled ? "scaled" : "unscaled"); + return fmt::format("Surface: {}x{} {} samples {} levels from {:#x} to {:#x} ({}{})", + scaled_width, scaled_height, PixelFormatAsString(pixel_format), + static_cast(sample_count), levels, addr, end, custom ? "custom," : "", + scaled ? "scaled" : "unscaled"); } bool SurfaceParams::operator==(const SurfaceParams& other) const noexcept { diff --git a/src/video_core/renderer_vulkan/vk_texture_runtime.cpp b/src/video_core/renderer_vulkan/vk_texture_runtime.cpp index c1622e83f..cdae7a647 100644 --- a/src/video_core/renderer_vulkan/vk_texture_runtime.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_runtime.cpp @@ -1487,8 +1487,8 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) { Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferParams& params, Surface* color, Surface* depth) - : VideoCore::FramebufferParams{params}, - res_scale{color ? color->res_scale : (depth ? depth->res_scale : 1u)}, + : VideoCore::FramebufferParams{params}, res_scale{color ? color->res_scale + : (depth ? depth->res_scale : 1u)}, sample_count{params.sample_count} { auto& renderpass_cache = runtime.GetRenderpassCache(); if (shadow_rendering && !color) {