summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Liam2023-07-01 23:37:50 -0400
committerGravatar Liam2023-07-01 23:37:50 -0400
commit34c448bad405632484ac0129057319c1a37a0e84 (patch)
tree5d5660b3efecb3c5c54aff61b7bfa7ebb95d1281
parentMerge pull request #10984 from comex/cob (diff)
downloadyuzu-34c448bad405632484ac0129057319c1a37a0e84.tar.gz
yuzu-34c448bad405632484ac0129057319c1a37a0e84.tar.xz
yuzu-34c448bad405632484ac0129057319c1a37a0e84.zip
Revert "texture_cache: Fix incorrect logic for AccelerateDMA"
This reverts commit 1fc47361a12afd91d8ea0b76378e0b3d4feb93a6.
-rw-r--r--src/video_core/texture_cache/texture_cache.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 8190f3ba1..79f158db4 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -865,11 +865,15 @@ void TextureCache<P>::PopAsyncFlushes() {
865template <class P> 865template <class P>
866ImageId TextureCache<P>::DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload) { 866ImageId TextureCache<P>::DmaImageId(const Tegra::DMA::ImageOperand& operand, bool is_upload) {
867 const ImageInfo dst_info(operand); 867 const ImageInfo dst_info(operand);
868 const ImageId image_id = FindDMAImage(dst_info, operand.address); 868 const ImageId dst_id = FindDMAImage(dst_info, operand.address);
869 if (!image_id) { 869 if (!dst_id) {
870 return NULL_IMAGE_ID;
871 }
872 auto& image = slot_images[dst_id];
873 if (False(image.flags & ImageFlagBits::GpuModified)) {
874 // No need to waste time on an image that's synced with guest
870 return NULL_IMAGE_ID; 875 return NULL_IMAGE_ID;
871 } 876 }
872 auto& image = slot_images[image_id];
873 if (image.info.type == ImageType::e3D) { 877 if (image.info.type == ImageType::e3D) {
874 // Don't accelerate 3D images. 878 // Don't accelerate 3D images.
875 return NULL_IMAGE_ID; 879 return NULL_IMAGE_ID;
@@ -883,7 +887,7 @@ ImageId TextureCache<P>::DmaImageId(const Tegra::DMA::ImageOperand& operand, boo
883 if (!base) { 887 if (!base) {
884 return NULL_IMAGE_ID; 888 return NULL_IMAGE_ID;
885 } 889 }
886 return image_id; 890 return dst_id;
887} 891}
888 892
889template <class P> 893template <class P>