summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorblåhaj <blaahaj@hotmail.com>2021-07-07 21:26:46 +0200
committerblåhaj <blaahaj@hotmail.com>2021-07-07 21:28:22 +0200
commitdebeb09dee9ee69fed5c109319a0d1198352011b (patch)
tree8aff1c8759b8535837f79c9352f84c7056ef99a9 /Source
parentde1289058885233be1fb29b16a239530b9c697d6 (diff)
PostProcessing: Fix OpenGL UBO linking with configuration options
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/VideoCommon/PostProcessing.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp
index ec10b9f108..6cf1397416 100644
--- a/Source/Core/VideoCommon/PostProcessing.cpp
+++ b/Source/Core/VideoCommon/PostProcessing.cpp
@@ -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;