From 8ee3666a3c19c3522fc980c5bed8a519e99e0d95 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 15 Jan 2019 02:17:38 -0300
Subject: gl_shader_disk_cache: Pass return values returning instead of by
 parameters

---
 src/video_core/renderer_opengl/gl_shader_cache.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/video_core/renderer_opengl/gl_shader_cache.cpp')

diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 761b355e4..49b872c44 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -344,17 +344,15 @@ ShaderDiskCacheUsage CachedShader::GetUsage(GLenum primitive_mode,
 ShaderCacheOpenGL::ShaderCacheOpenGL(RasterizerOpenGL& rasterizer) : RasterizerCache{rasterizer} {}
 
 void ShaderCacheOpenGL::LoadDiskCache() {
-    std::vector<ShaderDiskCacheRaw> raws;
-    std::vector<ShaderDiskCacheUsage> usages;
-    if (!disk_cache.LoadTransferable(raws, usages)) {
+    const auto transferable = disk_cache.LoadTransferable();
+    if (!transferable) {
         return;
     }
+    const auto [raws, usages] = *transferable;
 
-    std::map<u64, ShaderDiskCacheDecompiled> decompiled;
-    std::map<ShaderDiskCacheUsage, ShaderDiskCacheDump> dumps;
-    disk_cache.LoadPrecompiled(decompiled, dumps);
+    auto [decompiled, dumps] = disk_cache.LoadPrecompiled();
 
-    const std::set<GLenum> supported_formats{GetSupportedFormats()};
+    const auto supported_formats{GetSupportedFormats()};
     const auto unspecialized{GenerateUnspecializedShaders(raws, decompiled)};
 
     // Build shaders
-- 
cgit v1.2.3