diff options
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp | 268 |
1 files changed, 68 insertions, 200 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp index dbbb7ee29b..038021c490 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp @@ -26,7 +26,7 @@ #include "Render.h" #include "VertexShaderGen.h" #include "VertexShaderManager.h" -#include "VertexShaderCache.h" +#include "ProgramShaderCache.h" #include "VertexManager.h" #include "VertexLoader.h" #include "XFMemory.h" @@ -37,236 +37,104 @@ namespace OGL { -VertexShaderCache::VSCache VertexShaderCache::vshaders; -GLuint VertexShaderCache::CurrentShader; -bool VertexShaderCache::ShaderEnabled; - -VertexShaderCache::VSCacheEntry* VertexShaderCache::last_entry = NULL; -VERTEXSHADERUID VertexShaderCache::last_uid; - -static int s_nMaxVertexInstructions; - - -void VertexShaderCache::Init() +void SetVSConstant4fvByName(const char * name, unsigned int offset, const float *f, const unsigned int count = 1) { - glEnable(GL_VERTEX_PROGRAM_ARB); - ShaderEnabled = true; - CurrentShader = 0; - last_entry = NULL; - - glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions); - if (strstr((const char*)glGetString(GL_VENDOR), "Humper") != NULL) s_nMaxVertexInstructions = 4096; -#if CG_VERSION_NUM == 2100 - if (strstr((const char*)glGetString(GL_VENDOR), "ATI") != NULL) + ProgramShaderCache::PCacheEntry tmp = ProgramShaderCache::GetShaderProgram(); + for (int a = 0; a < NUM_UNIFORMS; ++a) { - s_nMaxVertexInstructions = 4096; + if (!strcmp(name, UniformNames[a])) + { + if (tmp.shader.UniformLocations[a] == -1) + return; + else + { + glUniform4fv(tmp.shader.UniformLocations[a] + offset, count, f); + return; + } + } } -#endif } -void VertexShaderCache::Shutdown() +void Renderer::SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) { - for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter) - iter->second.Destroy(); - vshaders.clear(); -} + float const buf[4] = {f1, f2, f3, f4}; - -VERTEXSHADER* VertexShaderCache::SetShader(u32 components) -{ - VERTEXSHADERUID uid; - GetVertexShaderId(&uid, components); - if (last_entry) + if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { - if (uid == last_uid) - { - GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - ValidateVertexShaderIDs(API_OPENGL, vshaders[uid].safe_uid, vshaders[uid].shader.strprog, components); - return &last_entry->shader; - } + ProgramShaderCache::SetMultiVSConstant4fv(const_number, buf, 1); + return; } - - last_uid = uid; - - VSCache::iterator iter = vshaders.find(uid); - if (iter != vshaders.end()) + for (unsigned int a = 0; a < 9; ++a) { - VSCacheEntry &entry = iter->second; - last_entry = &entry; - - GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - ValidateVertexShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, components); - return &last_entry->shader; - } - - // Make an entry in the table - VSCacheEntry& entry = vshaders[uid]; - last_entry = &entry; - const char *code = GenerateVertexShaderCode(components, API_OPENGL); - GetSafeVertexShaderId(&entry.safe_uid, components); - -#if defined(_DEBUG) || defined(DEBUGFAST) - if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) { - static int counter = 0; - char szTemp[MAX_PATH]; - sprintf(szTemp, "%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++); - - SaveData(szTemp, code); - } -#endif - - if (!code || !VertexShaderCache::CompileVertexShader(entry.shader, code)) { - GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true); - return NULL; + if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size)) + { + unsigned int offset = const_number - VSVar_Loc[a].reg; + SetVSConstant4fvByName(VSVar_Loc[a].name, offset, buf); + return; + } } - - INCSTAT(stats.numVertexShadersCreated); - SETSTAT(stats.numVertexShadersAlive, vshaders.size()); - GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true); - return &last_entry->shader; } -bool VertexShaderCache::CompileVertexShader(VERTEXSHADER& vs, const char* pstrprogram) +void Renderer::SetVSConstant4fv(unsigned int const_number, const float *f) { - // Reset GL error before compiling shaders. Yeah, we need to investigate the causes of these. - GLenum err = GL_REPORT_ERROR(); - if (err != GL_NO_ERROR) + if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { - ERROR_LOG(VIDEO, "glError %08x before VS!", err); - } - -#if defined HAVE_CG && HAVE_CG - char stropt[64]; - sprintf(stropt, "MaxLocalParams=256,MaxInstructions=%d", s_nMaxVertexInstructions); - const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL}; - CGprogram tempprog = cgCreateProgram(g_cgcontext, CG_SOURCE, pstrprogram, g_cgvProf, "main", opts); - if (!cgIsProgram(tempprog)) { - static int num_failures = 0; - char szTemp[MAX_PATH]; - sprintf(szTemp, "%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++); - std::ofstream file(szTemp); - file << pstrprogram; - file.close(); - - PanicAlert("Failed to compile vertex shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%d):\n%s", - szTemp, - g_cgfProf, - cgGetLastListing(g_cgcontext)); - - cgDestroyProgram(tempprog); - ERROR_LOG(VIDEO, "Failed to load vs %s:", cgGetLastListing(g_cgcontext)); - ERROR_LOG(VIDEO, "%s", pstrprogram); - return false; + ProgramShaderCache::SetMultiVSConstant4fv(const_number, f, 1); + return; } - - if (cgGetError() != CG_NO_ERROR) + for (unsigned int a = 0; a < 9; ++a) { - WARN_LOG(VIDEO, "Failed to load vs %s:", cgGetLastListing(g_cgcontext)); - WARN_LOG(VIDEO, "%s", pstrprogram); - } - - // This looks evil - we modify the program through the const char * we got from cgGetProgramString! - // It SHOULD not have any nasty side effects though - but you never know... - char *pcompiledprog = (char*)cgGetProgramString(tempprog, CG_COMPILED_PROGRAM); - char *plocal = strstr(pcompiledprog, "program.local"); - while (plocal != NULL) { - const char* penv = " program.env"; - memcpy(plocal, penv, 13); - plocal = strstr(plocal + 13, "program.local"); - } - glGenProgramsARB(1, &vs.glprogid); - SetCurrentShader(vs.glprogid); - - glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(pcompiledprog), pcompiledprog); - err = GL_REPORT_ERROR(); - if (err != GL_NO_ERROR) { - ERROR_LOG(VIDEO, "%s", pstrprogram); - ERROR_LOG(VIDEO, "%s", pcompiledprog); + if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size)) + { + unsigned int offset = const_number - VSVar_Loc[a].reg; + SetVSConstant4fvByName(VSVar_Loc[a].name, offset, f); + return; + } } - - cgDestroyProgram(tempprog); -#endif - - if (g_ActiveConfig.bEnableShaderDebugging) - vs.strprog = pstrprogram; - - return true; } -void VertexShaderCache::DisableShader() +void Renderer::SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f) { - if (ShaderEnabled) + if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { - glDisable(GL_VERTEX_PROGRAM_ARB); - ShaderEnabled = false; + ProgramShaderCache::SetMultiVSConstant4fv(const_number, f, count); + return; + } + for (unsigned int a = 0; a < 9; ++a) + { + if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size)) + { + unsigned int offset = const_number - VSVar_Loc[a].reg; + SetVSConstant4fvByName(VSVar_Loc[a].name, offset, f, count); + return; + } } } - -void VertexShaderCache::SetCurrentShader(GLuint Shader) +void Renderer::SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f) { - if (!ShaderEnabled) + float buf[4 * C_VENVCONST_END]; + for (unsigned int i = 0; i < count; i++) { - glEnable(GL_VERTEX_PROGRAM_ARB); - ShaderEnabled= true; + buf[4*i ] = *f++; + buf[4*i+1] = *f++; + buf[4*i+2] = *f++; + buf[4*i+3] = 0.f; } - if (CurrentShader != Shader) + if (g_ActiveConfig.backend_info.bSupportsGLSLUBO) { - if(Shader != 0) - CurrentShader = Shader; - glBindProgramARB(GL_VERTEX_PROGRAM_ARB, CurrentShader); + ProgramShaderCache::SetMultiVSConstant4fv(const_number, buf, count); + return; } -} - -void Renderer::SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4) -{ - glProgramEnvParameter4fARB(GL_VERTEX_PROGRAM_ARB, const_number, f1, f2, f3, f4); -} - -void Renderer::SetVSConstant4fv(unsigned int const_number, const float *f) -{ - glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, const_number, f); -} - -void Renderer::SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f) -{ - if(GLEW_EXT_gpu_program_parameters) - { - glProgramEnvParameters4fvEXT(GL_VERTEX_PROGRAM_ARB, const_number, count, f); - } - else - { - for (unsigned int i = 0; i < count; i++,f+=4) - glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, const_number + i, f); - } -} - -void Renderer::SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f) -{ - if(GLEW_EXT_gpu_program_parameters) + for (unsigned int a = 0; a < 9; ++a) { - float buf[4 * C_VENVCONST_END]; - for (unsigned int i = 0; i < count; i++) - { - buf[4*i ] = *f++; - buf[4*i+1] = *f++; - buf[4*i+2] = *f++; - buf[4*i+3] = 0.f; - } - glProgramEnvParameters4fvEXT(GL_VERTEX_PROGRAM_ARB, const_number, count, buf); - } - else - { - for (unsigned int i = 0; i < count; i++) - { - float buf[4]; - buf[0] = *f++; - buf[1] = *f++; - buf[2] = *f++; - buf[3] = 0.f; - glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, const_number + i, buf); - } - } + if (const_number >= VSVar_Loc[a].reg && const_number < ( VSVar_Loc[a].reg + VSVar_Loc[a].size)) + { + unsigned int offset = const_number - VSVar_Loc[a].reg; + SetVSConstant4fvByName(VSVar_Loc[a].name, offset, buf, count); + return; + } + } } } // namespace OGL |