mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 07:23:23 +02:00
texture_cache: Correct copying between compressed and uncompressed formats
This commit is contained in:
parent
0966665fc2
commit
9251354152
@ -235,9 +235,8 @@ private:
|
|||||||
|
|
||||||
for (u32 layer = 0; layer < layers; layer++) {
|
for (u32 layer = 0; layer < layers; layer++) {
|
||||||
for (u32 level = 0; level < mipmaps; level++) {
|
for (u32 level = 0; level < mipmaps; level++) {
|
||||||
const u32 width{std::min(params.GetMipWidth(level), in_params.GetMipWidth(level))};
|
const u32 width = SurfaceParams::IntersectWidth(params, in_params, level, level);
|
||||||
const u32 height{
|
const u32 height = SurfaceParams::IntersectHeight(params, in_params, level, level);
|
||||||
std::min(params.GetMipHeight(level), in_params.GetMipHeight(level))};
|
|
||||||
result.emplace_back(width, height, layer, level);
|
result.emplace_back(width, height, layer, level);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -250,8 +249,8 @@ private:
|
|||||||
result.reserve(mipmaps);
|
result.reserve(mipmaps);
|
||||||
|
|
||||||
for (u32 level = 0; level < mipmaps; level++) {
|
for (u32 level = 0; level < mipmaps; level++) {
|
||||||
const u32 width{std::min(params.GetMipWidth(level), in_params.GetMipWidth(level))};
|
const u32 width = SurfaceParams::IntersectWidth(params, in_params, level, level);
|
||||||
const u32 height{std::min(params.GetMipHeight(level), in_params.GetMipHeight(level))};
|
const u32 height = SurfaceParams::IntersectHeight(params, in_params, level, level);
|
||||||
const u32 depth{std::min(params.GetMipDepth(level), in_params.GetMipDepth(level))};
|
const u32 depth{std::min(params.GetMipDepth(level), in_params.GetMipDepth(level))};
|
||||||
result.emplace_back(width, height, depth, level);
|
result.emplace_back(width, height, depth, level);
|
||||||
}
|
}
|
||||||
|
@ -140,6 +140,26 @@ public:
|
|||||||
return (height * bh2 + bh1 - 1) / bh1;
|
return (height * bh2 + bh1 - 1) / bh1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this finds the maximun possible width between 2 2D layers of different formats
|
||||||
|
static u32 IntersectWidth(const SurfaceParams& src_params, const SurfaceParams& dst_params,
|
||||||
|
const u32 src_level, const u32 dst_level) {
|
||||||
|
const u32 bw1 = src_params.GetDefaultBlockWidth();
|
||||||
|
const u32 bw2 = dst_params.GetDefaultBlockWidth();
|
||||||
|
const u32 t_src_width = (src_params.GetMipWidth(src_level) * bw2 + bw1 - 1) / bw1;
|
||||||
|
const u32 t_dst_width = (dst_params.GetMipWidth(dst_level) * bw1 + bw2 - 1) / bw2;
|
||||||
|
return std::min(t_src_width, t_dst_width);
|
||||||
|
}
|
||||||
|
|
||||||
|
// this finds the maximun possible height between 2 2D layers of different formats
|
||||||
|
static u32 IntersectHeight(const SurfaceParams& src_params, const SurfaceParams& dst_params,
|
||||||
|
const u32 src_level, const u32 dst_level) {
|
||||||
|
const u32 bh1 = src_params.GetDefaultBlockHeight();
|
||||||
|
const u32 bh2 = dst_params.GetDefaultBlockHeight();
|
||||||
|
const u32 t_src_height = (src_params.GetMipHeight(src_level) * bh2 + bh1 - 1) / bh1;
|
||||||
|
const u32 t_dst_height = (dst_params.GetMipHeight(dst_level) * bh1 + bh2 - 1) / bh2;
|
||||||
|
return std::min(t_src_height, t_dst_height);
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns the default block width.
|
/// Returns the default block width.
|
||||||
u32 GetDefaultBlockWidth() const {
|
u32 GetDefaultBlockWidth() const {
|
||||||
return VideoCore::Surface::GetDefaultBlockWidth(pixel_format);
|
return VideoCore::Surface::GetDefaultBlockWidth(pixel_format);
|
||||||
|
@ -444,11 +444,9 @@ private:
|
|||||||
}
|
}
|
||||||
modified |= surface->IsModified();
|
modified |= surface->IsModified();
|
||||||
// Now we got all the data set up
|
// Now we got all the data set up
|
||||||
const u32 dst_width{params.GetMipWidth(mipmap)};
|
const u32 width = SurfaceParams::IntersectWidth(src_params, params, 0, mipmap);
|
||||||
const u32 dst_height{params.GetMipHeight(mipmap)};
|
const u32 height = SurfaceParams::IntersectHeight(src_params, params, 0, mipmap);
|
||||||
const CopyParams copy_params(0, 0, 0, 0, 0, layer, 0, mipmap,
|
const CopyParams copy_params(0, 0, 0, 0, 0, layer, 0, mipmap, width, height, 1);
|
||||||
std::min(src_params.width, dst_width),
|
|
||||||
std::min(src_params.height, dst_height), 1);
|
|
||||||
passed_tests++;
|
passed_tests++;
|
||||||
ImageCopy(surface, new_surface, copy_params);
|
ImageCopy(surface, new_surface, copy_params);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user