piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

let us try normal c++ static init instead...

Browse Source
This commit is contained in:
Shawn Hoffman
2011-12-29 16:25:03 +01:00
committed by Sonicadvance1
parent 03b09bed5d
commit 210ecad15f
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
View File

@ -41,6 +41,7 @@ public:
struct PCacheEntry
{
GLuint prog_id;
static GLenum prog_format;
u8 *binary;
GLint binary_size;
GLuint vsid, psid;
@ -74,15 +75,26 @@ public:
glGetProgramiv(prog_id, GL_PROGRAM_BINARY_LENGTH, &binary_size);
}
// No idea how necessary this is
static GLenum SetProgramFormat()
{
GLint Supported;
glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &Supported);
GLint *Formats = new GLint[Supported];
glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, Formats);
// We don't really care about format
GLenum prog_format = (GLenum)Formats[0];
delete[] Formats;
return prog_format;
}
u8 *GetProgram()
{
UpdateSize();
FreeProgram();
binary = new u8[binary_size];
GLenum _form;
glGetProgramBinary(prog_id, binary_size, NULL, &_form, binary);
if (_form != prog_format)
ERROR_LOG(VIDEO, "Returned format not the same as expected! %d vs %d", _form, prog_format);
glGetProgramBinary(prog_id, binary_size, NULL, &prog_format, binary);
return binary;
}
@ -119,7 +131,8 @@ private:
// But it is fine, no need to worry about that
PCacheEntry entry;
entry.Create(key.first, key.second);
glProgramBinary(entry.prog_id, prog_format, value, value_size);
glProgramBinary(entry.prog_id, entry.prog_format, value, value_size);
GLint success;
glGetProgramiv(entry.prog_id, GL_LINK_STATUS, &success);
@ -141,9 +154,6 @@ private:
static GLuint s_ps_vs_ubo;
static GLintptr s_vs_data_offset;
static GLenum prog_format;
static void SetProgramVariables(PCacheEntry &entry);
};