Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-05-29 16:58:46 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-05-30 13:25:20 +0300
commit7e8fd563c60774e8e29de1fa48da17b0bbcde100 (patch)
tree927ae60878ec3fca0660d025f91ccc31454aca96 /source/blender/draw/intern/draw_manager_shader.c
parent93de6ca2dbaee10482fa20de6a7ad384b232dd87 (diff)
DRW: Add compile option to disable deferred compilation.
This maybe usefull for debugging.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_shader.c')
-rw-r--r--source/blender/draw/intern/draw_manager_shader.c3
1 files changed, 2 insertions, 1 deletions
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);