blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T63698: Eevee crash after recent clang-format changes 

Some GLSL compilers seem to not have problems with \ to break preprocessor
directives. I couldn't find other places with similar code, but fixing this
case by case is not ideal and the same issue may come up again.
This commit is contained in:
Brecht Van Lommel 2019-04-21 11:32:48 +02:00
parent 93c19a5a2c
commit c8fc23fdbe
Notes: blender-bot 2023-06-21 19:23:24 +02:00 
Referenced by issue #72240, Blender Crashes Upon Startup in Windows 7 x64 with GPUShader Compile Error
Referenced by issue #64046, "Convert to Geometry" option is not present in latest Blender 2.8 for Mac OSX
Referenced by issue #63698, Selecting Materials after creating a new file throws EXCEPTION_ACCESS_VIOLATION
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl
View File

@ -870,8 +870,10 @@ Closure closure_emission(vec3 rgb)
return cl;
}
# if defined(MESH_SHADER) && !defined(USE_ALPHA_HASH) && !defined(USE_ALPHA_CLIP) && \
!defined(SHADOW_SHADER) && !defined(USE_MULTIPLY)
/* Breaking this across multiple lines causes issues for some older GLSL compilers. */
/* clang-format off */
# if defined(MESH_SHADER) && !defined(USE_ALPHA_HASH) && !defined(USE_ALPHA_CLIP) && !defined(SHADOW_SHADER) && !defined(USE_MULTIPLY)
/* clang-format on */
layout(location = 0) out vec4 fragColor;
layout(location = 1) out vec4 ssrNormals;
layout(location = 2) out vec4 ssrData;