diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index c89969bb45..6c19354e1d 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -856,8 +856,8 @@ public:
struct ZetaSize {
enum class DimensionControl : u32 {
- DepthDefinesArray = 0,
- ArraySizeOne = 1,
+ DefineArraySize = 0,
+ ArraySizeIsOne = 1,
};
u32 width;
@@ -1104,8 +1104,8 @@ public:
struct TileMode {
enum class DimensionControl : u32 {
- DepthDefinesArray = 0,
- DepthDefinesDepth = 1,
+ DefineArraySize = 0,
+ DefineDepthSize = 1,
};
union {
BitField<0, 4, u32> block_width;
diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp
index a1296b5745..11f3f78a15 100644
--- a/src/video_core/texture_cache/image_info.cpp
+++ b/src/video_core/texture_cache/image_info.cpp
@@ -14,6 +14,7 @@
namespace VideoCommon {
+using Tegra::Engines::Fermi2D;
using Tegra::Engines::Maxwell3D;
using Tegra::Texture::TextureType;
using Tegra::Texture::TICEntry;
@@ -114,86 +115,89 @@ 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 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 ==
- Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);
+ if (ct.tile_mode.is_pitch_linear) {
+ ASSERT(ct.tile_mode.dim_control ==
+ Maxwell3D::Regs::TileMode::DimensionControl::DefineArraySize);
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 ==
- Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) {
+ if (ct.tile_mode.dim_control == Maxwell3D::Regs::TileMode::DimensionControl::DefineDepthSize) {
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 Maxwell3D::Regs::Zeta& zt, const 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 ==
- Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);
+ if (zt.tile_mode.is_pitch_linear) {
+ ASSERT(zt.tile_mode.dim_control ==
+ Maxwell3D::Regs::TileMode::DimensionControl::DefineArraySize);
type = ImageType::Linear;
pitch = size.width * BytesPerBlock(format);
- } else if (regs.zeta.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);
+ } else if (zt.tile_mode.dim_control ==
+ Maxwell3D::Regs::TileMode::DimensionControl::DefineDepthSize) {
+ ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeIsOne);
type = ImageType::e3D;
- size.depth = regs.zeta_size.depth;
+ size.depth = zt_size.depth;
} else {
- ASSERT(regs.zeta_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;
+ switch (zt_size.dim_control) {
+ case Maxwell3D::Regs::ZetaSize::DimensionControl::DefineArraySize:
+ resources.layers = zt_size.depth;
+ break;
+ case Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeIsOne:
+ resources.layers = 1;
+ break;
+ }
}
}
-ImageInfo::ImageInfo(const Tegra::Engines::Fermi2D::Surface& config) noexcept {
+ImageInfo::ImageInfo(const Fermi2D::Surface& config) noexcept {
UNIMPLEMENTED_IF_MSG(config.layer != 0, "Surface layer is not zero");
format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(config.format);
rescaleable = false;
- if (config.linear == Tegra::Engines::Fermi2D::MemoryLayout::Pitch) {
+ if (config.linear == Fermi2D::MemoryLayout::Pitch) {
type = ImageType::Linear;
size = Extent3D{
.width = config.pitch / VideoCore::Surface::BytesPerBlock(format),
diff --git a/src/video_core/texture_cache/image_info.h b/src/video_core/texture_cache/image_info.h
index 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.h
index 62fb98b55f..ed5c768d8f 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);
}