diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-12-08 16:59:07 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-12-08 16:59:07 +0300 |
| commit | 03cb991618b5ca0263c2fb4b3487b49143cf18fa (patch) | |
| tree | fb37903b99fe4180f0394491785b3c8d1ff98d8e /source | |
| parent | 2901986b10bdaf12e050de18797f8a3e9d6a9a34 (diff) | |
Fix T72240: GLSL error with some old NVIDIA drivers, causing crash at startup
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/draw/intern/shaders/common_view_lib.glsl | 6 |
1 files 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; |