OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 08:00:05 +00:00
Code Issues Projects Releases Wiki Activity

Formatting fixes

Browse Source
This commit is contained in:
Wunkolo 2023-11-20 09:15:17 -08:00
parent cc7d2f6576
commit aebd108328
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/rasterizer_cache/surface_params.cpp
View File

@ -222,9 +222,10 @@ u32 SurfaceParams::LevelOf(PAddr level_addr) const {
std::string SurfaceParams::DebugName(bool scaled, bool custom, u8 sample_count) const noexcept { std::string SurfaceParams::DebugName(bool scaled, bool custom, u8 sample_count) const noexcept {
const u32 scaled_width = scaled ? GetScaledWidth() : width; const u32 scaled_width = scaled ? GetScaledWidth() : width;
const u32 scaled_height = scaled ? GetScaledHeight() : height; const u32 scaled_height = scaled ? GetScaledHeight() : height;
return fmt::format("Surface: {}x{} {} samples {} levels from {:#x} to {:#x} ({}{})", scaled_width, return fmt::format("Surface: {}x{} {} samples {} levels from {:#x} to {:#x} ({}{})",
scaled_height, PixelFormatAsString(pixel_format), static_cast<u32>(sample_count), levels, addr, scaled_width, scaled_height, PixelFormatAsString(pixel_format),
end, custom ? "custom," : "", scaled ? "scaled" : "unscaled"); static_cast<u32>(sample_count), levels, addr, end, custom ? "custom," : "",
scaled ? "scaled" : "unscaled");
} }
bool SurfaceParams::operator==(const SurfaceParams& other) const noexcept { bool SurfaceParams::operator==(const SurfaceParams& other) const noexcept {

4
src/video_core/renderer_vulkan/vk_texture_runtime.cpp
View File

@ -1487,8 +1487,8 @@ void Surface::BlitScale(const VideoCore::TextureBlit& blit, bool up_scale) {
Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferParams& params, Framebuffer::Framebuffer(TextureRuntime& runtime, const VideoCore::FramebufferParams& params,
Surface* color, Surface* depth) Surface* color, Surface* depth)
: VideoCore::FramebufferParams{params}, : VideoCore::FramebufferParams{params}, res_scale{color ? color->res_scale
res_scale{color ? color->res_scale : (depth ? depth->res_scale : 1u)}, : (depth ? depth->res_scale : 1u)},
sample_count{params.sample_count} { sample_count{params.sample_count} {
auto& renderpass_cache = runtime.GetRenderpassCache(); auto& renderpass_cache = runtime.GetRenderpassCache();
if (shadow_rendering && !color) { if (shadow_rendering && !color) {