diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-11-04 13:42:49 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-11-04 13:42:49 +1300 |
| commit | e161e714c76e64d7dee98c93df6e143eae73b41e (patch) | |
| tree | bdd03a63a59cd2b61c19403df9a71689e22a2353 /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | |
| parent | 9cc4cffa1d3618a875b0c9070c4e26cf3074036d (diff) | |
| parent | 71d1eb3c313535b5003884bb862635d4d2f8aae9 (diff) | |
Merge pull request #3226 from Tilka/shadergen
VideoCommon: return code/uid from shader gens
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index a8bc0e6e3c..93f6097f00 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -211,13 +211,11 @@ SHADER* ProgramShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 primitive_ last_entry = &newentry; newentry.in_cache = 0; - ShaderCode vcode; - ShaderCode pcode; + ShaderCode vcode = GenerateVertexShaderCode(API_OPENGL); + ShaderCode pcode = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL); ShaderCode gcode; - GenerateVertexShaderCode(vcode, API_OPENGL); - GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL); if (g_ActiveConfig.backend_info.bSupportsGeometryShaders && !uid.guid.GetUidData()->IsPassthrough()) - GenerateGeometryShaderCode(gcode, primitive_type, API_OPENGL); + gcode = GenerateGeometryShaderCode(primitive_type, API_OPENGL); if (g_ActiveConfig.bEnableShaderDebugging) { @@ -395,22 +393,19 @@ GLuint ProgramShaderCache::CompileSingleShader(GLuint type, const char* code) void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 primitive_type) { - GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL); - GetVertexShaderUid(uid->vuid, API_OPENGL); - GetGeometryShaderUid(uid->guid, primitive_type, API_OPENGL); + uid->puid = GetPixelShaderUid(dstAlphaMode, API_OPENGL); + uid->vuid = GetVertexShaderUid(API_OPENGL); + uid->guid = GetGeometryShaderUid(primitive_type, API_OPENGL); if (g_ActiveConfig.bEnableShaderDebugging) { - ShaderCode pcode; - GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL); + ShaderCode pcode = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL); pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p"); - ShaderCode vcode; - GenerateVertexShaderCode(vcode, API_OPENGL); + ShaderCode vcode = GenerateVertexShaderCode(API_OPENGL); vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v"); - ShaderCode gcode; - GenerateGeometryShaderCode(gcode, primitive_type, API_OPENGL); + ShaderCode gcode = GenerateGeometryShaderCode(primitive_type, API_OPENGL); geometry_uid_checker.AddToIndexAndCheck(gcode, uid->guid, "Geometry", "g"); } } |