diff options
| author | 2021-12-28 00:46:37 -0800 | |
|---|---|---|
| committer | 2021-12-28 00:46:37 -0800 | |
| commit | f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d (patch) | |
| tree | a14f73749158e0ad38e99d0c222d401441376911 /src/video_core/texture_cache | |
| parent | Merge pull request #7621 from bunnei/set-mem-perm (diff) | |
| parent | vk_texture_cache: Fix invalidated pointer access (diff) | |
| download | yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.gz yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.xz yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.zip | |
Merge pull request #7622 from ameerj/vk-rescale-invalid-ptr
vk_texture_cache: Fix invalidated pointer access
Diffstat (limited to 'src/video_core/texture_cache')
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 2e19fced2..b494152b8 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h | |||
| @@ -1397,7 +1397,8 @@ ImageViewId TextureCache<P>::FindOrEmplaceImageView(ImageId image_id, const Imag | |||
| 1397 | if (const ImageViewId image_view_id = image.FindView(info); image_view_id) { | 1397 | if (const ImageViewId image_view_id = image.FindView(info); image_view_id) { |
| 1398 | return image_view_id; | 1398 | return image_view_id; |
| 1399 | } | 1399 | } |
| 1400 | const ImageViewId image_view_id = slot_image_views.insert(runtime, info, image_id, image); | 1400 | const ImageViewId image_view_id = |
| 1401 | slot_image_views.insert(runtime, info, image_id, image, slot_images); | ||
| 1401 | image.InsertView(info, image_view_id); | 1402 | image.InsertView(info, image_view_id); |
| 1402 | return image_view_id; | 1403 | return image_view_id; |
| 1403 | } | 1404 | } |