diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-01 21:22:50 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-01 21:22:50 +0300 |
| commit | 83b6c8f2b1e3899680e807ced8ebd8d7ae77ce2d (patch) | |
| tree | be379830306599342ce9eb988d61932cf219e82b /source/blender/gpu/opengl/gl_shader.cc | |
| parent | ffb0ecb4985b133af7d97d61130a93f716c31f9e (diff) | |
Fix T95278: Crash on startup because of GLSL recursion
Bypassing the defines which are only there for error checking.
Diffstat (limited to 'source/blender/gpu/opengl/gl_shader.cc')
| -rw-r--r-- | source/blender/gpu/opengl/gl_shader.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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(); } |