diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-02-01 21:25:36 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-02-01 21:25:36 +0300 |
| commit | 2b01964e6cea2fabee585395f7b85aa8ad4837b0 (patch) | |
| tree | 9c09f955fd237e0b72fc76a0156cf1ba3e318ddb /source/blender/gpu/opengl | |
| parent | f39ade9e00fc24be6f45b33b391b3d6bfa6fee9f (diff) | |
| parent | 83b6c8f2b1e3899680e807ced8ebd8d7ae77ce2d (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/gpu/opengl')
| -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 3a212eb165c..3ab3b11d1f4 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(); } |