VERY experimental Nintendo Switch 2 emulator
C++
texture_cache: Adjust image view sizes by MSAA samples
ameerjee53f833e764
diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cppindex 852ec25194..e9100091ea 100644--- a/src/video_core/texture_cache/image_info.cpp+++ b/src/video_core/texture_cache/image_info.cpp@@ -100,6 +100,10 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {ASSERT_MSG(false, "Invalid texture_type={}", static_cast<int>(config.texture_type.Value()));break;}+ if (num_samples > 1) {+ size.width *= NumSamplesX(config.msaa_mode);+ size.height *= NumSamplesY(config.msaa_mode);+ }if (type != ImageType::Linear) {// FIXME: Call this without passing *thislayer_stride = CalculateLayerStride(*this);diff --git a/src/video_core/texture_cache/samples_helper.h b/src/video_core/texture_cache/samples_helper.hindex d552bccf05..203ac1b11a 100644--- a/src/video_core/texture_cache/samples_helper.h+++ b/src/video_core/texture_cache/samples_helper.h@@ -51,4 +51,48 @@ namespace VideoCommon {return 1;}+[[nodiscard]] inline int NumSamplesX(Tegra::Texture::MsaaMode msaa_mode) {+ using Tegra::Texture::MsaaMode;+ switch (msaa_mode) {+ case MsaaMode::Msaa1x1:+ return 1;+ case MsaaMode::Msaa2x1:+ case MsaaMode::Msaa2x1_D3D:+ case MsaaMode::Msaa2x2:+ case MsaaMode::Msaa2x2_VC4:+ case MsaaMode::Msaa2x2_VC12:+ return 2;+ case MsaaMode::Msaa4x2:+ case MsaaMode::Msaa4x2_D3D:+ case MsaaMode::Msaa4x2_VC8:+ case MsaaMode::Msaa4x2_VC24:+ case MsaaMode::Msaa4x4:+ return 4;+ }+ ASSERT_MSG(false, "Invalid MSAA mode={}", static_cast<int>(msaa_mode));+ return 1;+}++[[nodiscard]] inline int NumSamplesY(Tegra::Texture::MsaaMode msaa_mode) {+ using Tegra::Texture::MsaaMode;+ switch (msaa_mode) {+ case MsaaMode::Msaa1x1:+ case MsaaMode::Msaa2x1:+ case MsaaMode::Msaa2x1_D3D:+ return 1;+ case MsaaMode::Msaa2x2:+ case MsaaMode::Msaa2x2_VC4:+ case MsaaMode::Msaa2x2_VC12:+ case MsaaMode::Msaa4x2:+ case MsaaMode::Msaa4x2_D3D:+ case MsaaMode::Msaa4x2_VC8:+ case MsaaMode::Msaa4x2_VC24:+ return 2;+ case MsaaMode::Msaa4x4:+ return 4;+ }+ ASSERT_MSG(false, "Invalid MSAA mode={}", static_cast<int>(msaa_mode));+ return 1;+}+} // namespace VideoCommon