From aef8eb6afb9f74a98a796b04196711f24bda0dbb Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Mon, 13 Feb 2023 08:19:19 +0100 Subject: [PATCH] early-access version 3395 --- README.md | 2 +- src/common/settings.cpp | 4 ++++ src/video_core/texture_cache/image_info.cpp | 6 +----- src/video_core/texture_cache/util.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6acb97d5f..48440f19b 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3394. +This is the source code for early-access 3395. ## Legal Notice diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 8ab025979..40668abd2 100755 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -199,7 +199,11 @@ void RestoreGlobalState(bool is_powered_on) { values.renderer_backend.SetGlobal(true); values.renderer_force_max_clock.SetGlobal(true); values.vulkan_device.SetGlobal(true); + values.fullscreen_mode.SetGlobal(true); values.aspect_ratio.SetGlobal(true); + values.resolution_setup.SetGlobal(true); + values.scaling_filter.SetGlobal(true); + values.anti_aliasing.SetGlobal(true); values.max_anisotropy.SetGlobal(true); values.use_speed_limit.SetGlobal(true); values.speed_limit.SetGlobal(true); diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp index 130afe3e1..cb4876489 100755 --- a/src/video_core/texture_cache/image_info.cpp +++ b/src/video_core/texture_cache/image_info.cpp @@ -231,12 +231,8 @@ static PixelFormat ByteSizeToFormat(u32 bytes_per_pixel) { case 4: return PixelFormat::A8B8G8R8_UINT; case 8: - return PixelFormat::R16G16_UINT; - case 16: return PixelFormat::R16G16B16A16_UINT; - case 24: - return PixelFormat::R32G32B32_FLOAT; - case 32: + case 16: return PixelFormat::R32G32B32A32_UINT; default: UNIMPLEMENTED(); diff --git a/src/video_core/texture_cache/util.h b/src/video_core/texture_cache/util.h index 2ade36b0c..0e96da4a4 100755 --- a/src/video_core/texture_cache/util.h +++ b/src/video_core/texture_cache/util.h @@ -89,12 +89,12 @@ void SwizzleImage(Tegra::MemoryManager& gpu_memory, GPUVAddr gpu_addr, const Ima const ImageInfo& overlap_info, u32 new_level, u32 overlap_level, bool strict_size) noexcept; -[[nodiscard]] bool IsBlockLinearSizeCompatibleBPPRelaxed(const ImageInfo& lhs, const ImageInfo& rhs, - u32 lhs_level, u32 rhs_level) noexcept; - [[nodiscard]] bool IsPitchLinearSameSize(const ImageInfo& lhs, const ImageInfo& rhs, bool strict_size) noexcept; +[[nodiscard]] bool IsBlockLinearSizeCompatibleBPPRelaxed(const ImageInfo& lhs, const ImageInfo& rhs, + u32 lhs_level, u32 rhs_level) noexcept; + [[nodiscard]] std::optional ResolveOverlap(const ImageInfo& new_info, GPUVAddr gpu_addr, VAddr cpu_addr, const ImageBase& overlap,