[Bf-blender-cvs] [03cb991618b] master: Fix T72240: GLSL error with some old NVIDIA drivers, causing crash at startup
Brecht Van Lommel
noreply at git.blender.org
Sun Dec 8 15:10:39 CET 2019
Commit: 03cb991618b5ca0263c2fb4b3487b49143cf18fa
Author: Brecht Van Lommel
Date: Sun Dec 8 14:59:07 2019 +0100
Branches: master
https://developer.blender.org/rB03cb991618b5ca0263c2fb4b3487b49143cf18fa
Fix T72240: GLSL error with some old NVIDIA drivers, causing crash at startup
===================================================================
M source/blender/draw/intern/shaders/common_view_lib.glsl
===================================================================
diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl
index 1a28a307163..6605e1165d4 100644
--- a/source/blender/draw/intern/shaders/common_view_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_view_lib.glsl
@@ -115,8 +115,10 @@ flat in int resourceIDFrag;
# define resource_id resourceIDFrag
#endif
-#if !defined(GPU_INTEL) && !defined(GPU_DEPRECATED_AMD_DRIVER) && !defined(OS_MAC) && \
- !defined(INSTANCED_ATTRIB)
+/* Breaking this across multiple lines causes issues for some older GLSL compilers. */
+/* clang-format off */
+#if !defined(GPU_INTEL) && !defined(GPU_DEPRECATED_AMD_DRIVER) && !defined(OS_MAC) && !defined(INSTANCED_ATTRIB)
+/* clang-format on */
struct ObjectMatrices {
mat4 drw_modelMatrix;
mat4 drw_modelMatrixInverse;
More information about the Bf-blender-cvs
mailing list