ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6236 from lioncash/missing-decl 

OGL/TextureConverter: Resolve -Wmissing-variable-declaration warnings
This commit is contained in:
Markus Wick 2017-12-04 08:52:04 +01:00 committed by GitHub
parent 8bcc392d5d 050440fd5b
commit 0e8c883b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/VideoBackends/OGL/TextureConverter.cpp
View File

@ -32,21 +32,22 @@ namespace OGL
{ {
namespace TextureConverter namespace TextureConverter
{ {
using OGL::TextureCache; namespace
{
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;
struct EncodingProgram struct EncodingProgram
{ {
SHADER program; SHADER program;
GLint copy_position_uniform; GLint copy_position_uniform;
GLint y_scale_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) static EncodingProgram& GetOrCreateEncodingShader(const EFBCopyParams& params)
{ {