diff options
| author | 2019-05-19 02:50:47 -0400 | |
|---|---|---|
| committer | 2019-05-19 02:50:50 -0400 | |
| commit | 634b78a4c6db225e71799107da913799d84450cd (patch) | |
| tree | 7d530afd62d04f4f0ffabed75ca33399a6b722ec /src | |
| parent | gl_shader_disk_cache: Make hash specializations noexcept (diff) | |
| download | yuzu-634b78a4c6db225e71799107da913799d84450cd.tar.gz yuzu-634b78a4c6db225e71799107da913799d84450cd.tar.xz yuzu-634b78a4c6db225e71799107da913799d84450cd.zip | |
gl_shader_disk_cache: Default ShaderDiskCacheOpenGL's destructor in the cpp file
Given the disk shader cache contains non-trivial types, we should
default it in the cpp file in order to prevent inlining of the
complex destruction logic.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_disk_cache.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_disk_cache.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp index 4cfb88557..c446945ee 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp | |||
| @@ -107,6 +107,8 @@ bool ShaderDiskCacheRaw::Save(FileUtil::IOFile& file) const { | |||
| 107 | ShaderDiskCacheOpenGL::ShaderDiskCacheOpenGL(Core::System& system) | 107 | ShaderDiskCacheOpenGL::ShaderDiskCacheOpenGL(Core::System& system) |
| 108 | : system{system}, precompiled_cache_virtual_file_offset{0} {} | 108 | : system{system}, precompiled_cache_virtual_file_offset{0} {} |
| 109 | 109 | ||
| 110 | ShaderDiskCacheOpenGL::~ShaderDiskCacheOpenGL() = default; | ||
| 111 | |||
| 110 | std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>> | 112 | std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>> |
| 111 | ShaderDiskCacheOpenGL::LoadTransferable() { | 113 | ShaderDiskCacheOpenGL::LoadTransferable() { |
| 112 | // Skip games without title id | 114 | // Skip games without title id |
diff --git a/src/video_core/renderer_opengl/gl_shader_disk_cache.h b/src/video_core/renderer_opengl/gl_shader_disk_cache.h index 7a7183f21..bafd3b3f2 100644 --- a/src/video_core/renderer_opengl/gl_shader_disk_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.h | |||
| @@ -162,6 +162,7 @@ struct ShaderDiskCacheDump { | |||
| 162 | class ShaderDiskCacheOpenGL { | 162 | class ShaderDiskCacheOpenGL { |
| 163 | public: | 163 | public: |
| 164 | explicit ShaderDiskCacheOpenGL(Core::System& system); | 164 | explicit ShaderDiskCacheOpenGL(Core::System& system); |
| 165 | ~ShaderDiskCacheOpenGL(); | ||
| 165 | 166 | ||
| 166 | /// Loads transferable cache. If file has a old version or on failure, it deletes the file. | 167 | /// Loads transferable cache. If file has a old version or on failure, it deletes the file. |
| 167 | std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>> | 168 | std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>> |