remove previous changes already merged
This commit is contained in:
parent
16b85f7420
commit
9da57bcb5e
1 changed files with 0 additions and 6 deletions
|
@ -1377,17 +1377,11 @@ void TextureCacheRuntime::CopyImage(Image& dst, Image& src,
|
||||||
// As per the size-compatible formats section of vulkan, copy manually via ReinterpretImage
|
// As per the size-compatible formats section of vulkan, copy manually via ReinterpretImage
|
||||||
// these images that aren't size-compatible
|
// these images that aren't size-compatible
|
||||||
if (BytesPerBlock(src.info.format) != BytesPerBlock(dst.info.format)) {
|
if (BytesPerBlock(src.info.format) != BytesPerBlock(dst.info.format)) {
|
||||||
|
|
||||||
if (src.info.type == ImageType::Linear || dst.info.type == ImageType::Linear) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto oneCopy = VideoCommon::ImageCopy{.src_offset = VideoCommon::Offset3D(0, 0, 0),
|
auto oneCopy = VideoCommon::ImageCopy{.src_offset = VideoCommon::Offset3D(0, 0, 0),
|
||||||
.dst_offset = VideoCommon::Offset3D(0, 0, 0),
|
.dst_offset = VideoCommon::Offset3D(0, 0, 0),
|
||||||
.extent = dst.info.size};
|
.extent = dst.info.size};
|
||||||
return ReinterpretImage(dst, src, std::span{&oneCopy, 1});
|
return ReinterpretImage(dst, src, std::span{&oneCopy, 1});
|
||||||
}
|
}
|
||||||
|
|
||||||
boost::container::small_vector<VkImageCopy, 16> vk_copies(copies.size());
|
boost::container::small_vector<VkImageCopy, 16> vk_copies(copies.size());
|
||||||
const VkImageAspectFlags aspect_mask = dst.AspectMask();
|
const VkImageAspectFlags aspect_mask = dst.AspectMask();
|
||||||
ASSERT(aspect_mask == src.AspectMask());
|
ASSERT(aspect_mask == src.AspectMask());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue