From 93e85f9a7c655de44bf113eeff986efe422d15e5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 3 Dec 2017 18:47:14 -0500 Subject: [PATCH 1/2] OGL/TextureConverter: Resolve -Wmissing-variable-declaration warnings --- .../Core/VideoBackends/OGL/TextureConverter.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 88c46efc33..0b89ec2fdd 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -34,19 +34,22 @@ namespace TextureConverter { using OGL::TextureCache; -std::unique_ptr s_encoding_render_texture; -std::unique_ptr s_encoding_readback_texture; - -const int renderBufferWidth = EFB_WIDTH * 4; -const int renderBufferHeight = 1024; - +namespace +{ struct EncodingProgram { SHADER program; GLint copy_position_uniform; GLint y_scale_uniform; }; -static std::map s_encoding_programs; + +std::map s_encoding_programs; +std::unique_ptr s_encoding_render_texture; +std::unique_ptr s_encoding_readback_texture; + +const int renderBufferWidth = EFB_WIDTH * 4; +const int renderBufferHeight = 1024; +} static EncodingProgram& GetOrCreateEncodingShader(const EFBCopyParams& params) { From 050440fd5b81767f5674fb2b9616df449dd8c390 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 3 Dec 2017 18:49:43 -0500 Subject: [PATCH 2/2] OGL/TextureConverter: Remove unnecessary using declaration --- Source/Core/VideoBackends/OGL/TextureConverter.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 0b89ec2fdd..427f1ab6ad 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -32,8 +32,6 @@ namespace OGL { namespace TextureConverter { -using OGL::TextureCache; - namespace { struct EncodingProgram