[EGIT] [core/efl] master 01/01: gl_drm: simplify outbuf_reconfigure

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=661e44c38d4dc9fd8c82fb3b49189ae3bebae0bf

commit 661e44c38d4dc9fd8c82fb3b49189ae3bebae0bf
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Wed Dec 7 15:53:08 2016 -0600

    gl_drm: simplify outbuf_reconfigure
    
    Calling render_engine_software_generic_update from eng_setup lets us
    remove a bunch of stuff from evas_outbuf_reconfigure.
---
 src/modules/evas/engines/gl_drm/evas_engine.c |  4 ++++
 src/modules/evas/engines/gl_drm/evas_outbuf.c | 15 ---------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c 
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 0b37659..d840e2b 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1018,6 +1018,10 @@ eng_setup(Evas *evas, void *in)
                                           epd->output.w, epd->output.h,
                                           info->info.rotation,
                                           info->info.depth);
+                  
evas_render_engine_software_generic_update(&re->generic.software,
+                                                             
re->generic.software.ob,
+                                                             epd->output.w,
+                                                             epd->output.h);
                }
           }
      }
diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c 
b/src/modules/evas/engines/gl_drm/evas_outbuf.c
index a26b418..2304889 100644
--- a/src/modules/evas/engines/gl_drm/evas_outbuf.c
+++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c
@@ -540,19 +540,8 @@ evas_outbuf_unsurf(Outbuf *ob)
 void
 evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth)
 {
-   Evas_Public_Data *epd;
-   Render_Engine *re;
-
    if (depth == OUTBUF_DEPTH_INHERIT) depth = ob->depth;
 
-   epd = efl_data_scope_get(ob->evas, EVAS_CANVAS_CLASS);
-   EINA_SAFETY_ON_NULL_RETURN(epd);
-
-   re = epd->engine.data.output;
-   EINA_SAFETY_ON_NULL_RETURN(re);
-
-   re->generic.software.ob->gl_context->references++;
-
    while (ecore_drm2_fb_release(ob->priv.output, EINA_TRUE));
 
    _evas_outbuf_gbm_surface_destroy(ob);
@@ -562,10 +551,6 @@ evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, 
Outbuf_Depth depth)
      _evas_outbuf_gbm_surface_create(ob, h, w);
    _evas_outbuf_egl_setup(ob);
 
-   evas_render_engine_software_generic_update(&re->generic.software, ob, w, h);
-
-   re->generic.software.ob->gl_context->references--;
-
    glsym_evas_gl_common_context_resize(ob->gl_context, w, h, rot);
 }
 

--