From 83b6c8f2b1e3899680e807ced8ebd8d7ae77ce2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 1 Feb 2022 19:22:50 +0100 Subject: [PATCH] Fix T95278: Crash on startup because of GLSL recursion Bypassing the defines which are only there for error checking. --- source/blender/gpu/opengl/gl_shader.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 9bfb53885e2..e031047f844 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -415,11 +415,13 @@ std::string GLShader::resources_declare(const ShaderCreateInfo &info) const } ss << ";\n"; } +#if 0 /* T95278: This is not be enough to prevent some compilers think it is recursive. */ for (const ShaderCreateInfo::PushConst &uniform : info.push_constants_) { /* T95278: Double macro to avoid some compilers think it is recursive. */ ss << "#define " << uniform.name << "_ " << uniform.name << "\n"; ss << "#define " << uniform.name << " (" << uniform.name << "_)\n"; } +#endif ss << "\n"; return ss.str(); }