diff options
| author | bunnei <bunneidev@gmail.com> | 2021-12-28 09:46:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-28 09:46:37 +0100 |
| commit | f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d (patch) | |
| tree | a14f73749158e0ad38e99d0c222d401441376911 /src/video_core/renderer_opengl | |
| parent | Merge pull request #7621 from bunnei/set-mem-perm (diff) | |
| parent | vk_texture_cache: Fix invalidated pointer access (diff) | |
| download | yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.gz yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.bz2 yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.lz yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.xz yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.tar.zst yuzu-f67605e6aa5ec3a5e7a7e44ab30a24991bac6e6d.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 14e6522f2..3c1f79a27 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -1047,7 +1047,7 @@ bool Image::ScaleDown(bool ignore) { } ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewInfo& info, - ImageId image_id_, Image& image) + ImageId image_id_, Image& image, const SlotVector<Image>&) : VideoCommon::ImageViewBase{info, image.info, image_id_}, views{runtime.null_image_views} { const Device& device = runtime.device; if (True(image.flags & ImageFlagBits::Converted)) { diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.h index dbf1df79c..7f425631f 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.h +++ b/src/video_core/renderer_opengl/gl_texture_cache.h @@ -36,6 +36,7 @@ using VideoCommon::ImageViewType; using VideoCommon::NUM_RT; using VideoCommon::Region2D; using VideoCommon::RenderTargets; +using VideoCommon::SlotVector; struct ImageBufferMap { ~ImageBufferMap(); @@ -234,7 +235,8 @@ class ImageView : public VideoCommon::ImageViewBase { friend Image; public: - explicit ImageView(TextureCacheRuntime&, const VideoCommon::ImageViewInfo&, ImageId, Image&); + explicit ImageView(TextureCacheRuntime&, const VideoCommon::ImageViewInfo&, ImageId, Image&, + const SlotVector<Image>&); explicit ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo&, const VideoCommon::ImageViewInfo&, GPUVAddr); explicit ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info, |