yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #10583 from ameerj/ill-logic 

AccelerateDMA: Fix incorrect check in Buffer<->Texture copies
This commit is contained in:
liamwhite 2023-06-07 14:03:40 -04:00 committed by GitHub
parent 219bd90152 1fc47361a1
commit 6907d30258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_core/texture_cache/texture_cache.h
View File

@ -850,15 +850,11 @@ void TextureCache<P>::PopAsyncFlushes() {
template <class P> template <class P>
ImageId TextureCache<P>::DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload) { ImageId TextureCache<P>::DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload) {
const ImageInfo dst_info(operand); const ImageInfo dst_info(operand);
const ImageId dst_id = FindDMAImage(dst_info, operand.address); const ImageId image_id = FindDMAImage(dst_info, operand.address);
if (!dst_id) { if (!image_id) {
return NULL_IMAGE_ID;
}
auto& image = slot_images[dst_id];
if (False(image.flags & ImageFlagBits::GpuModified)) {
// No need to waste time on an image that's synced with guest
return NULL_IMAGE_ID; return NULL_IMAGE_ID;
} }
auto& image = slot_images[image_id];
if (!is_upload && !image.info.dma_downloaded) { if (!is_upload && !image.info.dma_downloaded) {
// Force a full sync. // Force a full sync.
image.info.dma_downloaded = true; image.info.dma_downloaded = true;
@ -868,7 +864,7 @@ ImageId TextureCache<P>::DmaImageId(const Tegra::DMA::ImageOperand& operand, boo
if (!base) { if (!base) {
return NULL_IMAGE_ID; return NULL_IMAGE_ID;
} }
return dst_id; return image_id;
} }
template <class P> template <class P>