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_disk_cache.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/video_core/renderer_opengl/gl_shader_disk_cache.h')

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 f11693789..c44a776d9 100644
--- a/src/video_core/renderer_opengl/gl_shader_disk_cache.h
+++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.h
@@ -4,9 +4,11 @@
 
 #pragma once
 
+#include <optional>
 #include <set>
 #include <string>
 #include <tuple>
+#include <utility>
 #include <vector>
 
 #include <glad/glad.h>
@@ -142,13 +144,14 @@ struct ShaderDiskCacheDump {
 
 class ShaderDiskCacheOpenGL {
 public:
-    /// Loads transferable cache. If file has a old version, it deletes it. Returns true on success.
-    bool LoadTransferable(std::vector<ShaderDiskCacheRaw>& raws,
-                          std::vector<ShaderDiskCacheUsage>& usages);
-
-    /// Loads current game's precompiled cache. Invalidates if emulator's version has changed.
-    bool LoadPrecompiled(std::map<u64, ShaderDiskCacheDecompiled>& decompiled,
-                         std::map<ShaderDiskCacheUsage, ShaderDiskCacheDump>& dumps);
+    /// Loads transferable cache. If file has a old version or on failure, it deletes the file.
+    std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>>
+    LoadTransferable();
+
+    /// Loads current game's precompiled cache. Invalidates on failure.
+    std::pair<std::map<u64, ShaderDiskCacheDecompiled>,
+              std::map<ShaderDiskCacheUsage, ShaderDiskCacheDump>>
+    LoadPrecompiled();
 
     /// Removes the transferable (and precompiled) cache file.
     void InvalidateTransferable() const;
-- 
cgit v1.2.3