raster pushed a commit to branch master.
commit 3cdd10e0708329e4dd1fee22de262ddaa2934539
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Wed Apr 10 08:36:33 2013 +0900
add gl buffer age support fully now for default automatic mode: query
extensions correctly in egl and glx too. need to hunt a partial swap
for glx now...
---
ChangeLog | 5 +++
NEWS | 1 +
src/modules/evas/engines/gl_x11/evas_engine.c | 58 +++++++++++++++++++--------
3 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index be52bcb..7b9f00b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
* Edje: When cursor is located to each edge, entry now doesn't grab
events for cursor movement.
+2013-04-10 Carsten Haitzler (The Rasterman)
+
+ * Evas: Add glx buffer age support for automatic partial
+ redraw in glx.
+
2013-04-09 Jérémy Zurcher (jeyzu)
* Eina: Add eina_inlist_first and eina_inlist_last
diff --git a/NEWS b/NEWS
index b5e99a7..88e029c 100644
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,7 @@ Additions:
- Add EVAS_GL_DIRECT_MEM_OPT to enable on-demand fallback memory
allocation policy for EvasGL direct rendering.
- Add engine specific alpha_get.
- Add multiple output support API.
+ - Add buffer age support to gl for automatic partial redraws.
* Add ecore_audio API
* Add eet_mmap.
* added eet_data_descriptor_name_get()
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index 3d70f53..e47bbc2 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -42,6 +42,7 @@ struct _Render_Engine
static int initted = 0;
static int gl_wins = 0;
+static int extn_have_buffer_age = 1;
typedef void (*_eng_fn) (void);
typedef _eng_fn (*glsym_func_eng_fn) ();
@@ -57,8 +58,9 @@ typedef const char *(*glsym_func_const_char_ptr) ();
# define EGL_NATIVE_PIXMAP_KHR 0x30b0
#endif
#ifndef EGL_BUFFER_AGE_EXT
-#define EGL_BUFFER_AGE_EXT 0x313d
+# define EGL_BUFFER_AGE_EXT 0x313d
#endif
+
_eng_fn (*glsym_eglGetProcAddress) (const char *a) = NULL;
void *(*glsym_eglCreateImage) (EGLDisplay a, EGLContext b,
EGLenum c, EGLClientBuffer d, const int *e) = NULL;
void (*glsym_eglDestroyImage) (EGLDisplay a, void *b) = NULL;
@@ -69,6 +71,11 @@ const char *(*glsym_eglQueryString) (EGLDisplay
a, int name) = NULL;
void (*glsym_eglSwapBuffersRegion) (EGLDisplay a, void *b, EGLint
c, const EGLint *d) = NULL;
#else
+
+#ifndef GLX_BACK_BUFFER_AGE_EXT
+# define GLX_BACK_BUFFER_AGE_EXT 0x20f4
+#endif
+
typedef XID (*glsym_func_xid) ();
_eng_fn (*glsym_glXGetProcAddress) (const char *a) = NULL;
@@ -615,6 +622,10 @@ gl_extn_veto(Render_Engine *re)
{
if (getenv("EVAS_GL_INFO"))
printf("EGL EXTN:\n%s\n", str);
+ if (!strstr(str, "EGL_EXT_buffer_age"))
+ {
+ extn_have_buffer_age = 0;
+ }
// if (!strstr(str, ""))
// {
// }
@@ -637,6 +648,10 @@ gl_extn_veto(Render_Engine *re)
glsym_glXGetVideoSync = NULL;
glsym_glXWaitVideoSync = NULL;
}
+ if (!strstr(str, "GLX_EXT_buffer_age"))
+ {
+ extn_have_buffer_age = 0;
+ }
}
#endif
}
@@ -1081,24 +1096,33 @@ eng_output_redraws_next_update_get(void *data, int *x,
int *y, int *w, int *h, i
re->rects = evas_common_tilebuf_get_render_rects(re->tb);
if (re->rects)
{
-#ifdef GL_GLES
- if (re->info->swap_mode == EVAS_ENGINE_GL_X11_SWAP_MODE_AUTO)
- {
- EGLint age = 0;
-
- if (eglQuerySurface(re->win->egl_disp, re->win->egl_surface[0],
- EGL_BUFFER_AGE_EXT, &age))
+ if (re->info->swap_mode == EVAS_ENGINE_GL_X11_SWAP_MODE_AUTO)
{
- if (age == 1) re->mode = MODE_COPY;
- else if (age == 2) re->mode = MODE_DOUBLE;
- else if (age == 3) re->mode = MODE_TRIPLE;
+#ifdef GL_GLES
+ EGLint age = 0;
+
+ if (!eglQuerySurface(re->win->egl_disp,
+ re->win->egl_surface[0],
+ EGL_BUFFER_AGE_EXT, &age))
+ age = 0;
+#else
+ unsigned int age = 0;
+
+ if (glsym_glXQueryDrawable)
+ glsym_glXQueryDrawable(re->win->disp, re->win->win,
+ GLX_BACK_BUFFER_AGE_EXT, &age);
+#endif
+ if (extn_have_buffer_age)
+ {
+ if (age == 1) re->mode = MODE_COPY;
+ else if (age == 2) re->mode = MODE_DOUBLE;
+ else if (age == 3) re->mode = MODE_TRIPLE;
+ else re->mode = MODE_FULL;
+ if (age != re->prev_age) re->mode = MODE_FULL;
+ re->prev_age = age;
+ }
else re->mode = MODE_FULL;
- if (age != re->prev_age) re->mode = MODE_FULL;
- re->prev_age = age;
}
- else re->mode = MODE_FULL;
- }
-#endif
if (re->lost_back)
{
/* if we lost our backbuffer since the last frame redraw all
*/
@@ -1109,7 +1133,7 @@ eng_output_redraws_next_update_get(void *data, int *x,
int *y, int *w, int *h, i
}
/* ensure we get rid of previous rect lists we dont need if mode
* changed/is appropriate */
- evas_common_tilebuf_clear(re->tb);
+ evas_common_tilebuf_clear(re->tb);
CLEAR_PREV_RECTS(2);
re->rects_prev[2] = re->rects_prev[1];
re->rects_prev[1] = re->rects_prev[0];
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
