VERY experimental Nintendo Switch 2 emulator
C++
video_core: Better defined ImageInfo parameters
FengChen0f336df1ea39
diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cppindex a1296b5745..0b231887c9 100644--- a/src/video_core/texture_cache/image_info.cpp+++ b/src/video_core/texture_cache/image_info.cpp@@ -114,78 +114,79 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {}}-ImageInfo::ImageInfo(const Maxwell3D::Regs& regs, size_t index) noexcept {- const auto& rt = regs.rt[index];- format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(rt.format);+ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& ct,+ Tegra::Texture::MsaaMode msaa_mode) noexcept {+ format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(ct.format);rescaleable = false;- if (rt.tile_mode.is_pitch_linear) {- ASSERT(rt.tile_mode.dim_control ==+ if (ct.tile_mode.is_pitch_linear) {+ ASSERT(ct.tile_mode.dim_control ==Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);type = ImageType::Linear;- pitch = rt.width;+ pitch = ct.width;size = Extent3D{.width = pitch / BytesPerBlock(format),- .height = rt.height,+ .height = ct.height,.depth = 1,};return;}- size.width = rt.width;- size.height = rt.height;- layer_stride = rt.array_pitch * 4;+ size.width = ct.width;+ size.height = ct.height;+ layer_stride = ct.array_pitch * 4;maybe_unaligned_layer_stride = layer_stride;- num_samples = NumSamples(regs.anti_alias_samples_mode);+ num_samples = NumSamples(msaa_mode);block = Extent3D{- .width = rt.tile_mode.block_width,- .height = rt.tile_mode.block_height,- .depth = rt.tile_mode.block_depth,+ .width = ct.tile_mode.block_width,+ .height = ct.tile_mode.block_height,+ .depth = ct.tile_mode.block_depth,};- if (rt.tile_mode.dim_control ==+ if (ct.tile_mode.dim_control ==Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) {type = ImageType::e3D;- size.depth = rt.depth;+ size.depth = ct.depth;} else {rescaleable = block.depth == 0;rescaleable &= size.height > 256;downscaleable = size.height > 512;type = ImageType::e2D;- resources.layers = rt.depth;+ resources.layers = ct.depth;}}-ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept {- format = VideoCore::Surface::PixelFormatFromDepthFormat(regs.zeta.format);- size.width = regs.zeta_size.width;- size.height = regs.zeta_size.height;+ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt,+ const Tegra::Engines::Maxwell3D::Regs::ZetaSize& zt_size,+ Tegra::Texture::MsaaMode msaa_mode) noexcept {+ format = VideoCore::Surface::PixelFormatFromDepthFormat(zt.format);+ size.width = zt_size.width;+ size.height = zt_size.height;rescaleable = false;resources.levels = 1;- layer_stride = regs.zeta.array_pitch * 4;+ layer_stride = zt.array_pitch * 4;maybe_unaligned_layer_stride = layer_stride;- num_samples = NumSamples(regs.anti_alias_samples_mode);+ num_samples = NumSamples(msaa_mode);block = Extent3D{- .width = regs.zeta.tile_mode.block_width,- .height = regs.zeta.tile_mode.block_height,- .depth = regs.zeta.tile_mode.block_depth,+ .width = zt.tile_mode.block_width,+ .height = zt.tile_mode.block_height,+ .depth = zt.tile_mode.block_depth,};- if (regs.zeta.tile_mode.is_pitch_linear) {- ASSERT(regs.zeta.tile_mode.dim_control ==+ if (zt.tile_mode.is_pitch_linear) {+ ASSERT(zt.tile_mode.dim_control ==Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);type = ImageType::Linear;pitch = size.width * BytesPerBlock(format);- } else if (regs.zeta.tile_mode.dim_control ==+ } else if (zt.tile_mode.dim_control ==Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) {- ASSERT(regs.zeta.tile_mode.is_pitch_linear == 0);- ASSERT(regs.zeta_size.dim_control ==- Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne);+ ASSERT(zt.tile_mode.is_pitch_linear == 0);+ ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne);type = ImageType::e3D;- size.depth = regs.zeta_size.depth;+ size.depth = zt_size.depth;} else {- ASSERT(regs.zeta_size.dim_control ==+ ASSERT(zt_size.dim_control ==Maxwell3D::Regs::ZetaSize::DimensionControl::DepthDefinesArray);rescaleable = block.depth == 0;downscaleable = size.height > 512;type = ImageType::e2D;- resources.layers = regs.zeta_size.depth;+ resources.layers = zt_size.depth;}}diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.hindex a12f5b44f0..4b7dfa315c 100644--- a/src/video_core/texture_cache/image_info.h+++ b/src/video_core/texture_cache/image_info.h@@ -17,8 +17,11 @@ using VideoCore::Surface::PixelFormat;struct ImageInfo {ImageInfo() = default;explicit ImageInfo(const TICEntry& config) noexcept;- explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs, size_t index) noexcept;- explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept;+ explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& ct,+ Tegra::Texture::MsaaMode msaa_mode) noexcept;+ explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt,+ const Tegra::Engines::Maxwell3D::Regs::ZetaSize& zt_size,+ Tegra::Texture::MsaaMode msaa_mode) noexcept;explicit ImageInfo(const Tegra::Engines::Fermi2D::Surface& config) noexcept;explicit ImageInfo(const Tegra::DMA::ImageOperand& config) noexcept;diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.hindex 8e8b9a5e66..c09eecd1a1 100644--- a/src/video_core/texture_cache/texture_cache.h+++ b/src/video_core/texture_cache/texture_cache.h@@ -1503,7 +1503,7 @@ ImageViewId TextureCache<P>::FindColorBuffer(size_t index, bool is_clear) {if (rt.format == Tegra::RenderTargetFormat::NONE) {return ImageViewId{};}- const ImageInfo info(regs, index);+ const ImageInfo info(regs.rt[index], regs.anti_alias_samples_mode);return FindRenderTargetView(info, gpu_addr, is_clear);}@@ -1517,7 +1517,7 @@ ImageViewId TextureCache<P>::FindDepthBuffer(bool is_clear) {if (gpu_addr == 0) {return ImageViewId{};}- const ImageInfo info(regs);+ const ImageInfo info(regs.zeta, regs.zeta_size, regs.anti_alias_samples_mode);return FindRenderTargetView(info, gpu_addr, is_clear);}