[EGIT] [core/elementary] master 01/03: elm_glview: Fix usage of direct rendering

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=5127758b146af24bbdd18823aef73ecb2514cf2e

commit 5127758b146af24bbdd18823aef73ecb2514cf2e
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Mon Apr 6 17:26:31 2015 +0900

    elm_glview: Fix usage of direct rendering
    
    You can't have direct rendering and ALWAYS render mode. It just
    didn't make sense.
    
    Also fix the test case.
---
 src/lib/elm_glview.c        | 17 +++++++++++++++++
 src/lib/elm_widget_glview.h |  1 +
 2 files changed, 18 insertions(+)

diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index b48d332..fb6a12f 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -48,6 +48,8 @@ static void
 _glview_update_surface(Evas_Object *obj)
 {
    Evas_Native_Surface ns = { 0 };
+   Evas_GL_Options_Bits opt;
+
    ELM_GLVIEW_DATA_GET(obj, sd);
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    if (!sd) return;
@@ -60,7 +62,20 @@ _glview_update_surface(Evas_Object *obj)
 
    evas_object_image_size_set(wd->resize_obj, sd->w, sd->h);
 
+   opt = sd->config->options_bits;
+   if ((opt & EVAS_GL_OPTIONS_DIRECT) &&
+       (sd->render_policy != ELM_GLVIEW_RENDER_POLICY_ON_DEMAND))
+     {
+        if (!sd->warned_about_dr)
+          {
+             WRN("App requested direct rendering but render policy is not 
ON_DEMAND. "
+                 "Disabling direct rendering...");
+             sd->warned_about_dr = EINA_TRUE;
+          }
+        sd->config->options_bits &= ~(EVAS_GL_OPTIONS_DIRECT);
+     }
    sd->surface = evas_gl_surface_create(sd->evasgl, sd->config, sd->w, sd->h);
+   sd->config->options_bits = opt;
    evas_gl_native_surface_get(sd->evasgl, sd->surface, &ns);
    evas_object_image_native_surface_set(wd->resize_obj, &ns);
    elm_glview_changed_set(obj);
@@ -385,6 +400,7 @@ _elm_glview_mode_set(Eo *obj, Elm_Glview_Data *sd, 
Elm_GLView_Mode mode)
      evas_object_image_alpha_set(wd->resize_obj, EINA_FALSE);
 
    sd->mode = mode;
+   sd->warned_about_dr = EINA_FALSE;
 
    _glview_update_surface(obj);
    if (!sd->surface)
@@ -429,6 +445,7 @@ _elm_glview_render_policy_set(Eo *obj, Elm_Glview_Data *sd, 
Elm_GLView_Render_Po
 
    if (sd->render_policy == policy) return EINA_TRUE;
 
+   sd->warned_about_dr = EINA_FALSE;
    sd->render_policy = policy;
    _set_render_policy_callback(obj);
 
diff --git a/src/lib/elm_widget_glview.h b/src/lib/elm_widget_glview.h
index 93ce2f8..4bc33b3 100644
--- a/src/lib/elm_widget_glview.h
+++ b/src/lib/elm_widget_glview.h
@@ -47,6 +47,7 @@ struct _Elm_Glview_Data
 
    Eina_Bool                initialized : 1;
    Eina_Bool                resized : 1;
+   Eina_Bool                warned_about_dr : 1;
 };
 
 /**

--