diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp index 6592dd4da9..72341ea521 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp @@ -499,7 +499,7 @@ namespace gl { auto data = std::make_shared(); - auto post_create_hook = [=](glsl::program* prog) + auto post_create_hook = [=, this](glsl::program* prog) { build_fs(compiler_options, *data); build_vs(compiler_options, *data); @@ -508,7 +508,7 @@ namespace gl attach(*data->fragment_shader); }; - auto storage_hook = [=](std::unique_ptr& prog) + auto storage_hook = [=, this](std::unique_ptr& prog) { data->prog = std::move(prog); post_init_hook(data, compiler_options); diff --git a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h b/rpcs3/Emu/RSX/Program/ShaderInterpreter.h index 26f4877bac..e6a3282448 100644 --- a/rpcs3/Emu/RSX/Program/ShaderInterpreter.h +++ b/rpcs3/Emu/RSX/Program/ShaderInterpreter.h @@ -51,7 +51,7 @@ namespace program_common CACHED_PIPE_RECOMPILING = (1 << 1), }; - static std::string get_vertex_interpreter() + [[maybe_unused]] static std::string get_vertex_interpreter() { const char* s = #include "../Program/GLSLInterpreter/VertexInterpreter.glsl" @@ -59,7 +59,7 @@ namespace program_common return s; } - static std::string get_fragment_interpreter() + [[maybe_unused]] static std::string get_fragment_interpreter() { const char* s = #include "../Program/GLSLInterpreter/FragmentInterpreter.glsl" diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index f1943f8712..dd51e22631 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" #include "VKShaderInterpreter.h" -#include "VKCommonPipelineLayout.h" #include "VKVertexProgram.h" #include "VKFragmentProgram.h" #include "VKHelpers.h" @@ -12,6 +11,8 @@ #include "../Program/ShaderInterpreter.h" #include "../rsx_methods.h" +#include + namespace vk { using enum program_common::interpreter::compiler_option; @@ -489,7 +490,7 @@ namespace vk return context.compile(); }; - auto callback_fn = [=](std::unique_ptr& prog) + auto callback_fn = [=, this](std::unique_ptr& prog) { if (!async) {