archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 19:31:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9881 from blaahaj/postprocessing-fix

Browse source 
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
commit 9b17805be9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/VideoCommon/PostProcessing.cpp
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;