From 750abcc23d0b9584b716ab93110383209b0971f8 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Tue, 15 Jan 2019 02:42:25 -0300
Subject: gl_shader_disk_cache: Address miscellaneous feedback

---
 .../renderer_opengl/gl_shader_disk_cache.cpp       | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

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

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 7783e3c01..5157e319a 100644
--- a/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
@@ -49,7 +49,7 @@ std::string GetTitleID() {
 std::string GetShaderHash() {
     std::array<char, ShaderHashSize> hash{};
     std::strncpy(hash.data(), Common::g_shader_cache_version, ShaderHashSize);
-    return std::string(hash.data());
+    return std::string(hash.data(), hash.size());
 }
 
 template <typename T>
@@ -86,7 +86,8 @@ ShaderDiskCacheRaw::ShaderDiskCacheRaw(FileUtil::IOFile& file) {
     file.ReadBytes(&unique_identifier, sizeof(u64));
     file.ReadBytes(&program_type, sizeof(u32));
 
-    u32 program_code_size{}, program_code_size_b{};
+    u32 program_code_size{};
+    u32 program_code_size_b{};
     file.ReadBytes(&program_code_size, sizeof(u32));
     file.ReadBytes(&program_code_size_b, sizeof(u32));
 
@@ -99,6 +100,15 @@ ShaderDiskCacheRaw::ShaderDiskCacheRaw(FileUtil::IOFile& file) {
     }
 }
 
+ShaderDiskCacheRaw::ShaderDiskCacheRaw(u64 unique_identifier, Maxwell::ShaderProgram program_type,
+                                       u32 program_code_size, u32 program_code_size_b,
+                                       ProgramCode program_code, ProgramCode program_code_b)
+    : unique_identifier{unique_identifier}, program_type{program_type},
+      program_code_size{program_code_size}, program_code_size_b{program_code_size_b},
+      program_code{std::move(program_code)}, program_code_b{std::move(program_code_b)} {}
+
+ShaderDiskCacheRaw::~ShaderDiskCacheRaw() = default;
+
 void ShaderDiskCacheRaw::Save(FileUtil::IOFile& file) const {
     file.WriteObject(unique_identifier);
     file.WriteObject(static_cast<u32>(program_type));
@@ -186,7 +196,7 @@ ShaderDiskCacheOpenGL::LoadPrecompiled() {
 
     char precompiled_hash[ShaderHashSize];
     file.ReadBytes(&precompiled_hash, ShaderHashSize);
-    if (std::string(precompiled_hash) != GetShaderHash()) {
+    if (precompiled_hash != GetShaderHash()) {
         LOG_INFO(Render_OpenGL, "Precompiled cache is from another version of yuzu - removing");
         file.Close();
         InvalidatePrecompiled();
@@ -311,13 +321,13 @@ ShaderDiskCacheOpenGL::LoadPrecompiled() {
     return {decompiled, dumps};
 }
 
-void ShaderDiskCacheOpenGL::InvalidateTransferable() const {
-    FileUtil::Delete(GetTransferablePath());
-    InvalidatePrecompiled();
+bool ShaderDiskCacheOpenGL::InvalidateTransferable() const {
+    const bool success = FileUtil::Delete(GetTransferablePath());
+    return InvalidatePrecompiled() && success;
 }
 
-void ShaderDiskCacheOpenGL::InvalidatePrecompiled() const {
-    FileUtil::Delete(GetPrecompiledPath());
+bool ShaderDiskCacheOpenGL::InvalidatePrecompiled() const {
+    return FileUtil::Delete(GetPrecompiledPath());
 }
 
 void ShaderDiskCacheOpenGL::SaveRaw(const ShaderDiskCacheRaw& entry) {
-- 
cgit v1.2.3