Merge pull request #9881 from blaahaj/postprocessing-fix

PostProcessing: Fix OpenGL UBO linking with configuration options
This commit is contained in:
Connor McLaughlin
2021-07-14 13:14:17 +10:00
committed by GitHub

View File

@ -385,7 +385,10 @@ std::vector<std::string> PostProcessing::GetPassiveShaderList()
bool PostProcessing::Initialize(AbstractTextureFormat format)
{
m_framebuffer_format = format;
if (!CompileVertexShader() || !CompilePixelShader() || !CompilePipeline())
// CompilePixelShader must be run first if configuration options are used.
// Otherwise the UBO has a different member list between vertex and pixel
// shaders, which is a link error.
if (!CompilePixelShader() || !CompileVertexShader() || !CompilePipeline())
return false;
return true;