[Bf-blender-cvs] [0ef7ccb4d75] blender2.8: Introduce functions/options to indicate the type of render

[Dalai Felinto]

Commit: 0ef7ccb4d753f08cbf31a9b8b22420b1f509b207
Author: Dalai Felinto
Date:   Tue Jun 20 18:33:58 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB0ef7ccb4d753f08cbf31a9b8b22420b1f509b207

Introduce functions/options to indicate the type of render

We should be able to differentiate between OpenGL render (viewport
render), offline render (F12), and view render (viewport draw).

This allows for us preventing offline render to skip mode drawings, grid, ...
Even OpenGL render can benefit from this forcing a higher quality
anti-alias and sampling than the viewport drawing.

I'm not sure if it's clever to keep the memset(0x00) outside the render
loop function as it is in this patch. An alternative is to just pass the
render "type" as a flag to the render function, and set DST.options
inside it. (I may change this tomorrow, I will wait to hear from
Campbell on that).

===================================================================

M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 7c47f47100b..aa6b836be17 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -378,6 +378,8 @@ void DRW_state_dfdy_factors_get(float dfdyfac[2]);
 bool DRW_state_is_fbo(void);
 bool DRW_state_is_select(void);
 bool DRW_state_is_depth(void);
+bool DRW_state_is_image_render(void);
+bool DRW_state_is_scene_render(void);
 bool DRW_state_show_text(void);
 
 struct DRWTextStore *DRW_state_text_cache_get(void);
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index bebb9fce590..6d41893e50e 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -301,6 +301,8 @@ static struct DRWGlobalState {
 	struct {
 		unsigned int is_select : 1;
 		unsigned int is_depth : 1;
+		unsigned int is_image_render : 1;
+		unsigned int is_scene_render : 1;
 	} options;
 
 	/* Current rendering context */
@@ -2725,7 +2727,10 @@ static void DRW_engines_enable(const Scene *scene, SceneLayer *sl, const View3D
 {
 	const int mode = CTX_data_mode_enum_ex(scene->obedit, OBACT_NEW);
 	DRW_engines_enable_from_engine(scene);
-	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+
+	if ((DRW_state_is_scene_render() == false) &&
+	    (v3d->flag2 & V3D_RENDER_OVERRIDE) == 0)
+	{
 		DRW_engines_enable_from_object_mode();
 		DRW_engines_enable_from_mode(mode);
 	}
@@ -2920,11 +2925,14 @@ void DRW_draw_view(const bContext *C)
 	ARegion *ar = CTX_wm_region(C);
 	View3D *v3d = CTX_wm_view3d(C);
 
+	/* Reset before using it. */
+	memset(&DST, 0x0, sizeof(DST));
 	DRW_draw_render_loop_ex(graph, ar, v3d, C);
 }
 
 /**
  * Used for both regular and off-screen drawing.
+ * Need to reset DST before calling this function
  */
 void DRW_draw_render_loop_ex(
         struct Depsgraph *graph,
@@ -2935,9 +2943,6 @@ void DRW_draw_render_loop_ex(
 	SceneLayer *sl = DEG_get_scene_layer(graph);
 	RegionView3D *rv3d = ar->regiondata;
 
-	/* Reset before using it. */
-	memset(&DST, 0x0, sizeof(DST));
-
 	DST.draw_ctx.evil_C = evil_C;
 
 	bool cache_is_dirty;
@@ -3028,6 +3033,8 @@ void DRW_draw_render_loop(
         struct Depsgraph *graph,
         ARegion *ar, View3D *v3d)
 {
+	/* Reset before using it. */
+	memset(&DST, 0x0, sizeof(DST));
 	DRW_draw_render_loop_ex(graph, ar, v3d, NULL);
 }
 
@@ -3044,9 +3051,10 @@ void DRW_draw_render_loop_offscreen(
 		rv3d->viewport = GPU_viewport_create_from_offscreen(ofs);
 	}
 
-	DST.draw_ctx.evil_C = NULL;
-
-	DRW_draw_render_loop(graph, ar, v3d);
+	/* Reset before using it. */
+	memset(&DST, 0x0, sizeof(DST));
+	DST.options.is_image_render = true;
+	DRW_draw_render_loop_ex(graph, ar, v3d, NULL);
 
 	/* restore */
 	{
@@ -3304,12 +3312,32 @@ bool DRW_state_is_depth(void)
 }
 
 /**
+ * Whether we are rendering for an image
+ */
+bool DRW_state_is_image_render(void)
+{
+	return DST.options.is_image_render;
+}
+
+/**
+ * Whether we are rendering only the render engine,
+ * or if we should also render the mode engines.
+ */
+bool DRW_state_is_scene_render(void)
+{
+	BLI_assert(DST.options.is_scene_render ?
+	           DST.options.is_image_render : true);
+	return DST.options.is_scene_render;
+}
+
+/**
  * Should text draw in this mode?
  */
 bool DRW_state_show_text(void)
 {
 	return (DST.options.is_select) == 0 &&
-	       (DST.options.is_depth) == 0;
+	       (DST.options.is_depth) == 0 &&
+	       (DST.options.is_scene_render) == 0;
 }
 
 /** \} */