From 539891c67f459399f6c412c3804a0eab6b94df44 Mon Sep 17 00:00:00 2001 From: codereader Date: Sat, 13 Jan 2024 07:41:10 +0100 Subject: [PATCH] Revert "#6351: remove RenderSystem::setShaderProgramsAvailable()". The removal of the check getCurrentShaderProgram() != SHADER_PROGRAM_NONE caused the GLSL programs to be created at the wrong point in time (in Windows at least). This reverts commit 98b7058922e6bd814111598cd671e33358c43def. --- radiantcore/rendersystem/OpenGLRenderSystem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radiantcore/rendersystem/OpenGLRenderSystem.cpp b/radiantcore/rendersystem/OpenGLRenderSystem.cpp index e76c3a26cd..09de63dcbf 100644 --- a/radiantcore/rendersystem/OpenGLRenderSystem.cpp +++ b/radiantcore/rendersystem/OpenGLRenderSystem.cpp @@ -213,8 +213,8 @@ void OpenGLRenderSystem::realise() _realised = true; - // Make sure we realise the shaders even if a shader program is not active to begin with - if (shaderProgramsAvailable()) { + if (shaderProgramsAvailable() && getCurrentShaderProgram() != SHADER_PROGRAM_NONE) + { _glProgramFactory->realise(); }