summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2017-12-04 08:52:04 +0100
committerGitHub <noreply@github.com>2017-12-04 08:52:04 +0100
commit0e8c883b24baec63c5e9973685cdcdb8afbf03d2 (patch)
tree6b14343b55e337ddd9360ed5d0fa346bfca1bed3 /Source/Core
parent8bcc392d5d2285b2bf1c26942ecedcb0672e8bc4 (diff)
parent050440fd5b81767f5674fb2b9616df449dd8c390 (diff)
Merge pull request #6236 from lioncash/missing-decl
OGL/TextureConverter: Resolve -Wmissing-variable-declaration warnings
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/VideoBackends/OGL/TextureConverter.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
index 88c46efc33..427f1ab6ad 100644
--- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
@@ -32,21 +32,22 @@ namespace OGL
{
namespace TextureConverter
{
-using OGL::TextureCache;
-
-std::unique_ptr<AbstractTexture> s_encoding_render_texture;
-std::unique_ptr<AbstractStagingTexture> 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<EFBCopyParams, EncodingProgram> s_encoding_programs;
+
+std::map<EFBCopyParams, EncodingProgram> s_encoding_programs;
+std::unique_ptr<AbstractTexture> s_encoding_render_texture;
+std::unique_ptr<AbstractStagingTexture> s_encoding_readback_texture;
+
+const int renderBufferWidth = EFB_WIDTH * 4;
+const int renderBufferHeight = 1024;
+}
static EncodingProgram& GetOrCreateEncodingShader(const EFBCopyParams& params)
{