diff options
| author | Stenzek <stenzek@users.noreply.github.com> | 2017-08-01 12:01:33 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 12:01:33 +1000 |
| commit | b93d118cef8dd8dd85bf662f5ad4abb083610d3e (patch) | |
| tree | 98fa798d411b437b0b478ee4112ca9e37c8f3c69 /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | |
| parent | 131c97e87c203f2ea54410bf3b3ee59489369bbe (diff) | |
| parent | d62dcd397d500d7b83b0994dadc189cae766361d (diff) | |
Merge pull request #5857 from stenzek/drop-force-ubershader-settings
VideoConfig: Drop force vertex/pixel ubershader settings
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 57d9705a7c..c467115534 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -271,19 +271,8 @@ SHADER* ProgramShaderCache::SetShader(u32 primitive_type, const GLVertexFormat* // Synchronous shader compiling. ShaderHostConfig host_config = ShaderHostConfig::GetCurrent(); - ShaderCode vcode; - if (!g_ActiveConfig.bForceVertexUberShaders) - vcode = GenerateVertexShaderCode(APIType::OpenGL, host_config, uid.vuid.GetUidData()); - else - vcode = UberShader::GenVertexShader(APIType::OpenGL, host_config, - UberShader::GetVertexShaderUid().GetUidData()); - ShaderCode pcode; - if (!g_ActiveConfig.bForcePixelUberShaders) - pcode = GeneratePixelShaderCode(APIType::OpenGL, host_config, uid.puid.GetUidData()); - else - pcode = UberShader::GenPixelShader(APIType::OpenGL, host_config, - UberShader::GetPixelShaderUid().GetUidData()); - + ShaderCode vcode = GenerateVertexShaderCode(APIType::OpenGL, host_config, uid.vuid.GetUidData()); + ShaderCode pcode = GeneratePixelShaderCode(APIType::OpenGL, host_config, uid.puid.GetUidData()); ShaderCode gcode; if (g_ActiveConfig.backend_info.bSupportsGeometryShaders && !uid.guid.GetUidData()->IsPassthrough()) |