[Bf-blender-cvs] [5cab93d89f8] draw-colormanagement: DRW: Remove drw_engines_draw_overlays routine

[Clément Foucault]

Commit: 5cab93d89f8a892655d9571596ffaef4e9fb2d07
Author: Clément Foucault
Date:   Mon Jan 27 01:28:41 2020 +0100
Branches: draw-colormanagement
https://developer.blender.org/rB5cab93d89f8a892655d9571596ffaef4e9fb2d07

DRW: Remove drw_engines_draw_overlays routine

It makes no sense to have it separate now.

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

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

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 746705d223a..3271aa6bc80 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -990,11 +990,6 @@ static void drw_engines_draw_scene(void)
 {
   for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
     DrawEngineType *engine = link->data;
-    if (engine == &draw_engine_overlay_type) {
-      /* Overlays are drawn afterward, in display linear space. */
-      continue;
-    }
-
     ViewportEngineData *data = drw_viewport_engine_data_ensure(engine);
     PROFILE_START(stime);
 
@@ -1029,28 +1024,6 @@ static void drw_engines_draw_text(void)
   }
 }
 
-static void drw_engines_draw_overlays(void)
-{
-  for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
-    DrawEngineType *engine = link->data;
-    if (engine == &draw_engine_overlay_type) {
-      ViewportEngineData *data = drw_viewport_engine_data_ensure(engine);
-      PROFILE_START(stime);
-      if (engine->draw_scene) {
-        /* Overlays are drawn afterward, in display linear space. */
-        DRW_stats_group_start(engine->idname);
-        engine->draw_scene(data);
-        /* Restore for next engine */
-        if (DRW_state_is_fbo()) {
-          GPU_framebuffer_bind(DST.default_framebuffer);
-        }
-        DRW_stats_group_end();
-      }
-      PROFILE_END_UPDATE(data->render_time, stime);
-    }
-  }
-}
-
 /* Draw render engine info. */
 void DRW_draw_region_engine_info(int xoffset, int yoffset)
 {
@@ -1515,8 +1488,6 @@ void DRW_draw_render_loop_ex(struct Depsgraph *depsgraph,
 
   drw_engines_draw_scene();
 
-  drw_engines_draw_overlays();
-
   /* Fix 3D view being "laggy" on macos and win+nvidia. (See T56996, T61474) */
   GPU_flush();
 
@@ -2177,7 +2148,6 @@ void DRW_draw_select_loop(struct Depsgraph *depsgraph,
     }
 
     drw_engines_draw_scene();
-    drw_engines_draw_overlays();
 
     if (!select_pass_fn(DRW_SELECT_PASS_POST, select_pass_user_data)) {
       break;
@@ -2290,7 +2260,6 @@ static void drw_draw_depth_loop_imp(struct Depsgraph *depsgraph,
   DRW_hair_update();
 
   drw_engines_draw_scene();
-  drw_engines_draw_overlays();
 
   DRW_state_reset();
 
@@ -2412,7 +2381,6 @@ void DRW_draw_select_id(Depsgraph *depsgraph, ARegion *ar, View3D *v3d, const rc
   /* Start Drawing */
   DRW_state_reset();
   drw_engines_draw_scene();
-  drw_engines_draw_overlays();
   DRW_state_reset();
 
   drw_engines_disable();