Get the program binary type correctly or else ATI makes massive (~400MB) shader caches. Also, don't need the line in the PixelShaderGen.
This commit is contained in:
parent
8a48b42e4c
commit
6a5b56d25f
|
@ -568,8 +568,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
|
||||||
|
|
||||||
if (g_ActiveConfig.backend_info.bSupportsGLSLATTRBind)
|
if (g_ActiveConfig.backend_info.bSupportsGLSLATTRBind)
|
||||||
WRITE(p, "#extension GL_ARB_explicit_attrib_location : enable\n");
|
WRITE(p, "#extension GL_ARB_explicit_attrib_location : enable\n");
|
||||||
if (g_ActiveConfig.backend_info.bSupportsGLSLBlend)
|
|
||||||
WRITE(p, "#extension GL_ARB_blend_func_extended : enable\n");
|
|
||||||
// Silly differences
|
// Silly differences
|
||||||
WRITE(p, "#define float2 vec2\n");
|
WRITE(p, "#define float2 vec2\n");
|
||||||
WRITE(p, "#define float3 vec3\n");
|
WRITE(p, "#define float3 vec3\n");
|
||||||
|
|
|
@ -25,6 +25,7 @@ GLuint ProgramShaderCache::CurrentFShader = 0, ProgramShaderCache::CurrentVShade
|
||||||
ProgramShaderCache::PCache ProgramShaderCache::pshaders;
|
ProgramShaderCache::PCache ProgramShaderCache::pshaders;
|
||||||
GLuint ProgramShaderCache::s_ps_vs_ubo;
|
GLuint ProgramShaderCache::s_ps_vs_ubo;
|
||||||
GLintptr ProgramShaderCache::s_vs_data_offset;
|
GLintptr ProgramShaderCache::s_vs_data_offset;
|
||||||
|
GLenum ProgramShaderCache::prog_format;
|
||||||
|
|
||||||
LinearDiskCache<ProgramShaderCache::ShaderUID, u8> g_program_disk_cache;
|
LinearDiskCache<ProgramShaderCache::ShaderUID, u8> g_program_disk_cache;
|
||||||
GLenum ProgramFormat;
|
GLenum ProgramFormat;
|
||||||
|
@ -213,6 +214,16 @@ void ProgramShaderCache::Init(void)
|
||||||
// Read our shader cache, only if supported
|
// Read our shader cache, only if supported
|
||||||
if (g_ActiveConfig.backend_info.bSupportsGLSLCache)
|
if (g_ActiveConfig.backend_info.bSupportsGLSLCache)
|
||||||
{
|
{
|
||||||
|
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
|
||||||
|
// We just need the correct data type
|
||||||
|
prog_format = (GLenum)Formats[0];
|
||||||
|
delete[] Formats;
|
||||||
|
|
||||||
char cache_filename[MAX_PATH];
|
char cache_filename[MAX_PATH];
|
||||||
sprintf(cache_filename, "%sogl-%s-shaders.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
|
sprintf(cache_filename, "%sogl-%s-shaders.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
|
||||||
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
|
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
|
||||||
|
|
|
@ -41,7 +41,6 @@ public:
|
||||||
struct PCacheEntry
|
struct PCacheEntry
|
||||||
{
|
{
|
||||||
GLuint prog_id;
|
GLuint prog_id;
|
||||||
GLenum prog_format;
|
|
||||||
u8 *binary;
|
u8 *binary;
|
||||||
GLint binary_size;
|
GLint binary_size;
|
||||||
GLuint vsid, psid;
|
GLuint vsid, psid;
|
||||||
|
@ -75,25 +74,15 @@ public:
|
||||||
glGetProgramiv(prog_id, GL_PROGRAM_BINARY_LENGTH, &binary_size);
|
glGetProgramiv(prog_id, GL_PROGRAM_BINARY_LENGTH, &binary_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
// No idea how necessary this is
|
|
||||||
void 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
|
|
||||||
prog_format = (GLenum)Formats[0];
|
|
||||||
delete[] Formats;
|
|
||||||
}
|
|
||||||
|
|
||||||
u8 *GetProgram()
|
u8 *GetProgram()
|
||||||
{
|
{
|
||||||
UpdateSize();
|
UpdateSize();
|
||||||
FreeProgram();
|
FreeProgram();
|
||||||
binary = new u8[binary_size];
|
binary = new u8[binary_size];
|
||||||
glGetProgramBinary(prog_id, binary_size, NULL, &prog_format, binary);
|
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);
|
||||||
return binary;
|
return binary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,8 +119,7 @@ private:
|
||||||
// But it is fine, no need to worry about that
|
// But it is fine, no need to worry about that
|
||||||
PCacheEntry entry;
|
PCacheEntry entry;
|
||||||
entry.Create(key.first, key.second);
|
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;
|
GLint success;
|
||||||
glGetProgramiv(entry.prog_id, GL_LINK_STATUS, &success);
|
glGetProgramiv(entry.prog_id, GL_LINK_STATUS, &success);
|
||||||
|
@ -153,6 +141,9 @@ private:
|
||||||
|
|
||||||
static GLuint s_ps_vs_ubo;
|
static GLuint s_ps_vs_ubo;
|
||||||
static GLintptr s_vs_data_offset;
|
static GLintptr s_vs_data_offset;
|
||||||
|
|
||||||
|
static GLenum prog_format;
|
||||||
|
|
||||||
static void SetProgramVariables(PCacheEntry &entry);
|
static void SetProgramVariables(PCacheEntry &entry);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue