NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jean-Philippe Andre 2015-04-06 17:26:31 +09:00
parent f9cb86cdd9
commit 9b97c6cc43
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/elementary/src/lib/elm_glview.c
View File

@ -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);

1
legacy/elementary/src/lib/elm_widget_glview.h
View File

@ -47,6 +47,7 @@ struct _Elm_Glview_Data
Eina_Bool initialized : 1;
Eina_Bool resized : 1;
Eina_Bool warned_about_dr : 1;
};
/**