From 03cb991618b5ca0263c2fb4b3487b49143cf18fa Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 8 Dec 2019 14:59:07 +0100 Subject: [PATCH] Fix T72240: GLSL error with some old NVIDIA drivers, causing crash at startup --- source/blender/draw/intern/shaders/common_view_lib.glsl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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;