From 4ea3c994f62cb8c48bde84e1185bebf8e72c47dd Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 4 Apr 2020 00:52:04 +1000 Subject: [PATCH] GL/ShaderCache: Linux build fix --- src/common/gl/shader_cache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/gl/shader_cache.cpp b/src/common/gl/shader_cache.cpp index f289e7ac1..5c09a2274 100644 --- a/src/common/gl/shader_cache.cpp +++ b/src/common/gl/shader_cache.cpp @@ -249,7 +249,7 @@ std::optional ShaderCache::GetProgram(const std::string_view vertex_sha Program prog; if (prog.CreateFromBinary(data.data(), static_cast(data.size()), iter->second.blob_format)) - return prog; + return std::optional(std::move(prog)); Log_WarningPrintf( "Failed to create program from binary, this may be due to a driver or GPU Change. Recreating cache."); @@ -276,7 +276,7 @@ std::optional ShaderCache::CompileProgram(const std::string_view& verte if (!prog.Link()) return std::nullopt; - return prog; + return std::optional(std::move(prog)); } std::optional ShaderCache::CompileAndAddProgram(const CacheIndexKey& key, @@ -324,4 +324,4 @@ std::optional ShaderCache::CompileAndAddProgram(const CacheIndexKey& ke return prog; } -} // namespace GL \ No newline at end of file +} // namespace GL