mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
video_core: Better defined ImageInfo parameters
This commit is contained in:
parent
05f26e1337
commit
11ffbee5ae
3 changed files with 43 additions and 39 deletions
|
@ -114,78 +114,79 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImageInfo::ImageInfo(const Maxwell3D::Regs& regs, size_t index) noexcept {
|
ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::RenderTargetConfig& ct,
|
||||||
const auto& rt = regs.rt[index];
|
Tegra::Texture::MsaaMode msaa_mode) noexcept {
|
||||||
format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(rt.format);
|
format = VideoCore::Surface::PixelFormatFromRenderTargetFormat(ct.format);
|
||||||
rescaleable = false;
|
rescaleable = false;
|
||||||
if (rt.tile_mode.is_pitch_linear) {
|
if (ct.tile_mode.is_pitch_linear) {
|
||||||
ASSERT(rt.tile_mode.dim_control ==
|
ASSERT(ct.tile_mode.dim_control ==
|
||||||
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);
|
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);
|
||||||
type = ImageType::Linear;
|
type = ImageType::Linear;
|
||||||
pitch = rt.width;
|
pitch = ct.width;
|
||||||
size = Extent3D{
|
size = Extent3D{
|
||||||
.width = pitch / BytesPerBlock(format),
|
.width = pitch / BytesPerBlock(format),
|
||||||
.height = rt.height,
|
.height = ct.height,
|
||||||
.depth = 1,
|
.depth = 1,
|
||||||
};
|
};
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
size.width = rt.width;
|
size.width = ct.width;
|
||||||
size.height = rt.height;
|
size.height = ct.height;
|
||||||
layer_stride = rt.array_pitch * 4;
|
layer_stride = ct.array_pitch * 4;
|
||||||
maybe_unaligned_layer_stride = layer_stride;
|
maybe_unaligned_layer_stride = layer_stride;
|
||||||
num_samples = NumSamples(regs.anti_alias_samples_mode);
|
num_samples = NumSamples(msaa_mode);
|
||||||
block = Extent3D{
|
block = Extent3D{
|
||||||
.width = rt.tile_mode.block_width,
|
.width = ct.tile_mode.block_width,
|
||||||
.height = rt.tile_mode.block_height,
|
.height = ct.tile_mode.block_height,
|
||||||
.depth = rt.tile_mode.block_depth,
|
.depth = ct.tile_mode.block_depth,
|
||||||
};
|
};
|
||||||
if (rt.tile_mode.dim_control ==
|
if (ct.tile_mode.dim_control ==
|
||||||
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) {
|
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) {
|
||||||
type = ImageType::e3D;
|
type = ImageType::e3D;
|
||||||
size.depth = rt.depth;
|
size.depth = ct.depth;
|
||||||
} else {
|
} else {
|
||||||
rescaleable = block.depth == 0;
|
rescaleable = block.depth == 0;
|
||||||
rescaleable &= size.height > 256;
|
rescaleable &= size.height > 256;
|
||||||
downscaleable = size.height > 512;
|
downscaleable = size.height > 512;
|
||||||
type = ImageType::e2D;
|
type = ImageType::e2D;
|
||||||
resources.layers = rt.depth;
|
resources.layers = ct.depth;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept {
|
ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs::Zeta& zt,
|
||||||
format = VideoCore::Surface::PixelFormatFromDepthFormat(regs.zeta.format);
|
const Tegra::Engines::Maxwell3D::Regs::ZetaSize& zt_size,
|
||||||
size.width = regs.zeta_size.width;
|
Tegra::Texture::MsaaMode msaa_mode) noexcept {
|
||||||
size.height = regs.zeta_size.height;
|
format = VideoCore::Surface::PixelFormatFromDepthFormat(zt.format);
|
||||||
|
size.width = zt_size.width;
|
||||||
|
size.height = zt_size.height;
|
||||||
rescaleable = false;
|
rescaleable = false;
|
||||||
resources.levels = 1;
|
resources.levels = 1;
|
||||||
layer_stride = regs.zeta.array_pitch * 4;
|
layer_stride = zt.array_pitch * 4;
|
||||||
maybe_unaligned_layer_stride = layer_stride;
|
maybe_unaligned_layer_stride = layer_stride;
|
||||||
num_samples = NumSamples(regs.anti_alias_samples_mode);
|
num_samples = NumSamples(msaa_mode);
|
||||||
block = Extent3D{
|
block = Extent3D{
|
||||||
.width = regs.zeta.tile_mode.block_width,
|
.width = zt.tile_mode.block_width,
|
||||||
.height = regs.zeta.tile_mode.block_height,
|
.height = zt.tile_mode.block_height,
|
||||||
.depth = regs.zeta.tile_mode.block_depth,
|
.depth = zt.tile_mode.block_depth,
|
||||||
};
|
};
|
||||||
if (regs.zeta.tile_mode.is_pitch_linear) {
|
if (zt.tile_mode.is_pitch_linear) {
|
||||||
ASSERT(regs.zeta.tile_mode.dim_control ==
|
ASSERT(zt.tile_mode.dim_control ==
|
||||||
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);
|
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesArray);
|
||||||
type = ImageType::Linear;
|
type = ImageType::Linear;
|
||||||
pitch = size.width * BytesPerBlock(format);
|
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) {
|
Maxwell3D::Regs::TileMode::DimensionControl::DepthDefinesDepth) {
|
||||||
ASSERT(regs.zeta.tile_mode.is_pitch_linear == 0);
|
ASSERT(zt.tile_mode.is_pitch_linear == 0);
|
||||||
ASSERT(regs.zeta_size.dim_control ==
|
ASSERT(zt_size.dim_control == Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne);
|
||||||
Maxwell3D::Regs::ZetaSize::DimensionControl::ArraySizeOne);
|
|
||||||
type = ImageType::e3D;
|
type = ImageType::e3D;
|
||||||
size.depth = regs.zeta_size.depth;
|
size.depth = zt_size.depth;
|
||||||
} else {
|
} else {
|
||||||
ASSERT(regs.zeta_size.dim_control ==
|
ASSERT(zt_size.dim_control ==
|
||||||
Maxwell3D::Regs::ZetaSize::DimensionControl::DepthDefinesArray);
|
Maxwell3D::Regs::ZetaSize::DimensionControl::DepthDefinesArray);
|
||||||
rescaleable = block.depth == 0;
|
rescaleable = block.depth == 0;
|
||||||
downscaleable = size.height > 512;
|
downscaleable = size.height > 512;
|
||||||
type = ImageType::e2D;
|
type = ImageType::e2D;
|
||||||
resources.layers = regs.zeta_size.depth;
|
resources.layers = zt_size.depth;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,11 @@ using VideoCore::Surface::PixelFormat;
|
||||||
struct ImageInfo {
|
struct ImageInfo {
|
||||||
ImageInfo() = default;
|
ImageInfo() = default;
|
||||||
explicit ImageInfo(const TICEntry& config) noexcept;
|
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::RenderTargetConfig& ct,
|
||||||
explicit ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs) noexcept;
|
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::Engines::Fermi2D::Surface& config) noexcept;
|
||||||
explicit ImageInfo(const Tegra::DMA::ImageOperand& config) noexcept;
|
explicit ImageInfo(const Tegra::DMA::ImageOperand& config) noexcept;
|
||||||
|
|
||||||
|
|
|
@ -1503,7 +1503,7 @@ ImageViewId TextureCache<P>::FindColorBuffer(size_t index, bool is_clear) {
|
||||||
if (rt.format == Tegra::RenderTargetFormat::NONE) {
|
if (rt.format == Tegra::RenderTargetFormat::NONE) {
|
||||||
return ImageViewId{};
|
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);
|
return FindRenderTargetView(info, gpu_addr, is_clear);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1517,7 +1517,7 @@ ImageViewId TextureCache<P>::FindDepthBuffer(bool is_clear) {
|
||||||
if (gpu_addr == 0) {
|
if (gpu_addr == 0) {
|
||||||
return ImageViewId{};
|
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);
|
return FindRenderTargetView(info, gpu_addr, is_clear);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue