[Bf-blender-cvs] [7e8fd563c60] blender2.8: DRW: Add compile option to disable deferred compilation.
Clément Foucault
noreply at git.blender.org
Wed May 30 12:25:42 CEST 2018
Commit: 7e8fd563c60774e8e29de1fa48da17b0bbcde100
Author: Clément Foucault
Date: Tue May 29 15:58:46 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7e8fd563c60774e8e29de1fa48da17b0bbcde100
DRW: Add compile option to disable deferred compilation.
This maybe usefull for debugging.
===================================================================
M source/blender/draw/intern/draw_manager_shader.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 77fcb766743..56a7c5db08e 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -47,6 +47,7 @@ extern char datatoc_gpu_shader_2D_vert_glsl[];
extern char datatoc_gpu_shader_3D_vert_glsl[];
extern char datatoc_common_fullscreen_vert_glsl[];
+#define USE_DEFERRED_COMPILATION 1
/* -------------------------------------------------------------------- */
@@ -168,7 +169,7 @@ static void drw_deferred_shader_add(
GPUMaterial *mat, const char *vert, const char *geom, const char *frag_lib, const char *defines)
{
/* Do not deferre the compilation if we are rendering for image. */
- if (DRW_state_is_image_render()) {
+ if (DRW_state_is_image_render() || !USE_DEFERRED_COMPILATION) {
/* Double checking that this GPUMaterial is not going to be
* compiled by another thread. */
DRW_deferred_shader_remove(mat);
More information about the Bf-blender-cvs
mailing list