From aa34706aacdab45847d7c0e3987b1de4ff0b8760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sun, 1 May 2022 22:42:07 +0200 Subject: Fix T97545 DRW: Crash cause by invalid `"` char in glsl source Some old compiler do not like this character even if inside an `#error` directive. --- source/blender/draw/intern/shaders/common_globals_lib.glsl | 2 +- source/blender/draw/intern/shaders/common_gpencil_lib.glsl | 2 +- source/blender/draw/intern/shaders/common_view_lib.glsl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/draw/intern/shaders') diff --git a/source/blender/draw/intern/shaders/common_globals_lib.glsl b/source/blender/draw/intern/shaders/common_globals_lib.glsl index 7ae77b11874..0460ba56e4c 100644 --- a/source/blender/draw/intern/shaders/common_globals_lib.glsl +++ b/source/blender/draw/intern/shaders/common_globals_lib.glsl @@ -1,7 +1,7 @@ #define COMMON_GLOBALS_LIB #ifdef USE_GPU_SHADER_CREATE_INFO -#error "Use draw_globals as additional_info instead of common_globals_lib.glsl" +# error Use draw_globals as additional_info instead of common_globals_lib.glsl #endif /* keep in sync with GlobalsUboStorage */ diff --git a/source/blender/draw/intern/shaders/common_gpencil_lib.glsl b/source/blender/draw/intern/shaders/common_gpencil_lib.glsl index d63b9917973..e58cfaae40d 100644 --- a/source/blender/draw/intern/shaders/common_gpencil_lib.glsl +++ b/source/blender/draw/intern/shaders/common_gpencil_lib.glsl @@ -3,7 +3,7 @@ #pragma BLENDER_REQUIRE(common_math_lib.glsl) #ifndef DRW_GPENCIL_INFO -# error "Missing additional info draw_gpencil" +# error Missing additional info draw_gpencil #endif #ifdef GPU_FRAGMENT_SHADER diff --git a/source/blender/draw/intern/shaders/common_view_lib.glsl b/source/blender/draw/intern/shaders/common_view_lib.glsl index 4086162a530..8eecaa46b58 100644 --- a/source/blender/draw/intern/shaders/common_view_lib.glsl +++ b/source/blender/draw/intern/shaders/common_view_lib.glsl @@ -33,7 +33,7 @@ layout(std140) uniform viewBlock #ifdef USE_GPU_SHADER_CREATE_INFO # ifndef DRW_RESOURCE_CHUNK_LEN -# error "Missing draw_view additional create info on shader create info" +# error Missing draw_view additional create info on shader create info # endif #endif -- cgit v1.2.3