enlightenment
/
efl
5
7
Fork 11
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

hm ooops - my multi-frame update tracking breaks WHEN the swap modes

Browse Source 
change from triple to double etc. buffered.



SVN revision: 79531
devs/devilhorns/wayland_egl
Carsten Haitzler 11 years ago
parent 69dff9f94a
commit abb71f7234
3 changed files with 197 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/modules/evas/engines/gl_x11/evas_engine.c
  2. 56
      src/modules/evas/engines/software_x11/evas_engine.c
  3. 182
      src/modules/evas/engines/software_x11/evas_xlib_swapper.c

27
src/modules/evas/engines/gl_x11/evas_engine.c
Unescape View File

@ -1008,14 +1008,13 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
{
Render_Engine *re;
Tilebuf_Rect *rect;
int i;
Eina_Bool first_rect = EINA_FALSE;
#define CLEAR_PREV_RECTS(x) \
do { \
if (re->rects_prev[i]) \
evas_common_tilebuf_free_render_rects(re->rects_prev[i]); \
re->rects_prev[i] = NULL; \
if (re->rects_prev[x]) \
evas_common_tilebuf_free_render_rects(re->rects_prev[x]); \
re->rects_prev[x] = NULL; \
} while (0)
re = (Render_Engine *)data;
@ -1040,35 +1039,31 @@ 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);
CLEAR_PREV_RECTS(2);
re->rects_prev[2] = re->rects_prev[1];
re->rects_prev[1] = re->rects_prev[0];
re->rects_prev[0] = re->rects;
re->rects = NULL;
switch (re->mode)
{
case MODE_FULL:
case MODE_COPY: // no prev rects needed
for (i = 0; i < 3; i++) CLEAR_PREV_RECTS(i);
re->rects = _merge_rects(re->tb, re->rects_prev[0], NULL, NULL);
break;
case MODE_DOUBLE: // double mode - only 1 level of prev rect
for (i = 1; i < 3; i++) CLEAR_PREV_RECTS(i);
re->rects_prev[1] = re->rects_prev[0];
re->rects_prev[0] = re->rects;
// merge prev[1] + prev[0] -> rects
re->rects = _merge_rects(re->tb, re->rects_prev[0], re->rects_prev[1], NULL);
break;
case MODE_TRIPLE: // keep all
for (i = 2; i < 3; i++) CLEAR_PREV_RECTS(i);
re->rects_prev[2] = re->rects_prev[1];
re->rects_prev[1] = re->rects_prev[0];
re->rects_prev[0] = re->rects;
re->rects = NULL;
// merge prev[2] + prev[1] + prev[0] -> rects
re->rects = _merge_rects(re->tb, re->rects_prev[0], re->rects_prev[1], re->rects_prev[2]);
break;
default:
break;
}
re->cur_rect = EINA_INLIST_GET(re->rects);
first_rect = EINA_TRUE;
}
evas_common_tilebuf_clear(re->tb);
re->cur_rect = EINA_INLIST_GET(re->rects);
}
if (!re->cur_rect) return NULL;
rect = (Tilebuf_Rect *)re->cur_rect;

56
src/modules/evas/engines/software_x11/evas_engine.c
Unescape View File

@ -453,19 +453,23 @@ eng_setup(Evas *eo_e, void *in)
#ifdef BUILD_ENGINE_SOFTWARE_XLIB
if (info->info.backend == EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XLIB)
{
// this is disabled for now as we should only use/need the
// swapper infra *IF* we can get direct access to the "backbuffer"
// of a window in x11.
if (0)
re = _output_swapbuf_setup(e->output.w, e->output.h,
info->info.rotation, info->info.connection,
info->info.drawable, info->info.visual,
info->info.colormap,
info->info.depth, info->info.debug,
info->info.alloc_grayscale,
info->info.alloc_colors_max,
info->info.mask, info->info.shape_dither,
info->info.destination_alpha);
static int try_swapbuf = -1;
if (try_swapbuf == -1)
{
if (getenv("EVAS_NO_DRI_SWAPBUF")) try_swapbuf = 0;
else try_swapbuf = 1;
}
if (try_swapbuf)
re = _output_swapbuf_setup(e->output.w, e->output.h,
info->info.rotation, info->info.connection,
info->info.drawable, info->info.visual,
info->info.colormap,
info->info.depth, info->info.debug,
info->info.alloc_grayscale,
info->info.alloc_colors_max,
info->info.mask, info->info.shape_dither,
info->info.destination_alpha);
if (re)
{
re->outbuf_free = evas_software_xlib_swapbuf_free;
@ -760,13 +764,12 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
RGBA_Image *surface;
Tilebuf_Rect *rect;
Eina_Bool first_rect = EINA_FALSE;
int i;
#define CLEAR_PREV_RECTS(x) \
do { \
if (re->rects_prev[i]) \
evas_common_tilebuf_free_render_rects(re->rects_prev[i]); \
re->rects_prev[i] = NULL; \
if (re->rects_prev[x]) \
evas_common_tilebuf_free_render_rects(re->rects_prev[x]); \
re->rects_prev[x] = NULL; \
} while (0)
re = (Render_Engine *)data;
@ -795,32 +798,27 @@ 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);
CLEAR_PREV_RECTS(2);
re->rects_prev[2] = re->rects_prev[1];
re->rects_prev[1] = re->rects_prev[0];
re->rects_prev[0] = re->rects;
re->rects = NULL;
switch (re->mode)
{
case MODE_FULL:
case MODE_COPY: // no prev rects needed
for (i = 0; i < 3; i++) CLEAR_PREV_RECTS(i);
re->rects = _merge_rects(re->tb, re->rects_prev[0], NULL, NULL);
break;
case MODE_DOUBLE: // double mode - only 1 level of prev rect
for (i = 1; i < 3; i++) CLEAR_PREV_RECTS(i);
re->rects_prev[1] = re->rects_prev[0];
re->rects_prev[0] = re->rects;
// merge prev[1] + prev[0] -> rects
re->rects = _merge_rects(re->tb, re->rects_prev[0], re->rects_prev[1], NULL);
break;
case MODE_TRIPLE: // keep all
for (i = 2; i < 3; i++) CLEAR_PREV_RECTS(i);
re->rects_prev[2] = re->rects_prev[1];
re->rects_prev[1] = re->rects_prev[0];
re->rects_prev[0] = re->rects;
re->rects = NULL;
// merge prev[2] + prev[1] + prev[0] -> rects
re->rects = _merge_rects(re->tb, re->rects_prev[0], re->rects_prev[1], re->rects_prev[2]);
break;
default:
break;
}
re->cur_rect = EINA_INLIST_GET(re->rects);
first_rect = EINA_TRUE;
}
evas_common_tilebuf_clear(re->tb);

182
src/modules/evas/engines/software_x11/evas_xlib_swapper.c
Unescape View File

@ -146,7 +146,7 @@ _buf_put(X_Swapper *swp, Buffer *buf, Eina_Rectangle *rects, int nrects)
if (!buf->xim) return;
tmpr = XCreateRegion();
if (rects)
if ((rects)/* && 0*/) // set to 0 to test buffer stuff
{
for (i = 0; i < nrects; i++)
{
@ -254,7 +254,13 @@ int
evas_xlib_swapper_buffer_state_get(X_Swapper *swp)
{
int i, n, count = 0;
/*
for (i = 0; i < swp->buf_num; i++)
{
if ((rand() % 50) == 0)
swp->buf[n].valid = 0;
}
*/
for (i = 0; i < swp->buf_num; i++)
{
n = (swp->buf_num + swp->buf_cur - (i)) % swp->buf_num;
@ -392,6 +398,14 @@ static XID (*sym_XFixesCreateRegion) (Display *display, XRectangle *rectangles,
static void (*sym_XFixesDestroyRegion) (Display *dpy, XID region) = NULL;
////////////////////////////////////////////////////////////////////////////
#define MAX_BO_CACHE 4
typedef struct
{
unsigned int name;
drm_slp_bo buf_bo;
} Buffer;
struct _X_Swapper
{
Display *disp;
@ -402,7 +416,9 @@ struct _X_Swapper
DRI2Buffer *buf;
void *buf_data;
int buf_w, buf_h;
Eina_Bool mapped: 1;
Eina_List *buf_cache;
int last_count;
Eina_Bool mapped: 1;
};
static int inits = 0;
@ -412,6 +428,7 @@ static int dri2_ev_base = 0, dri2_err_base = 0;
static int dri2_major = 0, dri2_minor = 0;
static int drm_fd = -1;
static drm_slp_bufmgr bufmgr = NULL;
static int swap_debug = -1;
static Eina_Bool
_drm_init(Display *disp, int scr)
@ -419,22 +436,44 @@ _drm_init(Display *disp, int scr)
char *drv_name = NULL, *dev_name = NULL;
drm_magic_t magic = 0;
if (swap_debug == -1)
{
if (getenv("EVAS_SWAPPER_DEBUG")) swap_debug = 1;
else swap_debug = 0;
}
if (xfixes_lib) return EINA_TRUE;
if ((tried) && (!xfixes_lib)) return EINA_FALSE;
tried = EINA_TRUE;
drm_lib = dlopen("libdrm.so.2", RTLD_NOW | RTLD_LOCAL);
if (!drm_lib) goto err;
if (!drm_lib)
{
if (swap_debug) ERR("Can't load libdrm.so.2");
goto err;
}
drm_slp_lib = dlopen("libdrm_slp.so.1", RTLD_NOW | RTLD_LOCAL);
if (!drm_slp_lib) goto err;
if (!drm_slp_lib)
{
if (swap_debug) ERR("Can't load libdrm_slp.so.1");
goto err;
}
dri_lib = dlopen("libdri2.so.0", RTLD_NOW | RTLD_LOCAL);
if (!dri_lib) goto err;
if (!dri_lib)
{
if (swap_debug) ERR("Can't load libdri2.so.0");
goto err;
}
xfixes_lib = dlopen("libXfixes.so.3", RTLD_NOW | RTLD_LOCAL);
if (!xfixes_lib) goto err;
if (!xfixes_lib)
{
if (swap_debug) ERR("Can't load libXfixes.so.3");
goto err;
}
#define SYM(l, x) \
do { sym_ ## x = dlsym(l, #x); \
if (!sym_ ## x) { \
printf("swapper: can't find symbol: %s\n", #x); \
if (swap_debug) ERR("Can't load symbol "#x); \
goto err; \
} \
} while (0)
@ -465,46 +504,49 @@ _drm_init(Display *disp, int scr)
if (!sym_XFixesQueryExtension(disp, &xfixes_ev_base, &xfixes_err_base))
{
printf("no xfixes extn\n");
if (swap_debug) ERR("XFixes extension not in xserver");
goto err;
}
sym_XFixesQueryVersion(disp, &xfixes_major, &xfixes_minor);
if (!sym_DRI2QueryExtension(disp, &dri2_ev_base, &dri2_err_base))
{
printf("no dri2 extn\n");
if (swap_debug) ERR("DRI2 extension not in xserver");
goto err;
}
if (!sym_DRI2QueryVersion(disp, &dri2_major, &dri2_minor))
{
if (swap_debug) ERR("DRI2 query version failed");
goto err;
}
if (!sym_DRI2Connect(disp, RootWindow(disp, scr), &drv_name, &dev_name))
{
printf("cant connect to dri2\n");
if (swap_debug) ERR("DRI2 connect failed on screen %i", scr);
goto err;
}
drm_fd = open(dev_name, O_RDWR);
if (drm_fd < 0)
{
printf("cant open drm fd\n");
if (swap_debug) ERR("DRM FD open of '%s' failed", dev_name);
goto err;
}
if (sym_drmGetMagic(drm_fd, &magic))
{
printf("drm magic fail\n");
if (swap_debug) ERR("DRM get magic failed");
goto err;
}
if (!sym_DRI2Authenticate(disp, RootWindow(disp, scr),
(unsigned int)magic))
{
printf("dri2 auth fail\n");
if (swap_debug) ERR("DRI2 authenticate failed with magic 0x%x on screen %i", (unsigned int)magic, scr);
goto err;
}
if (!(bufmgr = sym_drm_slp_bufmgr_init(drm_fd, NULL)))
{
printf("bufmgr init fail\n");
if (swap_debug) ERR("DRM bufmgr init failed");
goto err;
}
return EINA_TRUE;
err:
if (drm_fd >= 0)
@ -539,6 +581,10 @@ static void
_drm_shutdown(void)
{
return;
// leave this here as notation on how to shut down stuff - never do it
// though, as once shut down, we have to re-init and this could be
// expensive especially if u have a single canvas that is changing config
// and being shut down and re-initted a few times.
if (bufmgr)
{
sym_drm_slp_bufmgr_destroy(bufmgr);
@ -587,6 +633,7 @@ evas_xlib_swapper_new(Display *disp, Drawable draw, Visual *vis,
swp->depth = depth;
swp->w = w;
swp->h = h;
swp->last_count = -1;
if (!_drm_setup(swp))
{
inits--;
@ -594,13 +641,23 @@ evas_xlib_swapper_new(Display *disp, Drawable draw, Visual *vis,
free(swp);
return NULL;
}
if (swap_debug) printf("Swapper allocated OK\n");
return swp;
}
void
evas_xlib_swapper_free(X_Swapper *swp)
{
Buffer *b;
if (swap_debug) printf("Swapper free\n");
if (swp->mapped) evas_xlib_swapper_buffer_unmap(swp);
EINA_LIST_FREE(swp->buf_cache, b)
{
if (swap_debug) printf("Cached buf name %i freed\n", b->name);
sym_drm_slp_bo_unref(b->buf_bo);
free(b);
}
_drm_cleanup(swp);
free(swp);
inits--;
@ -612,6 +669,9 @@ evas_xlib_swapper_buffer_map(X_Swapper *swp, int *bpl)
{
unsigned int attach = DRI2BufferBackLeft;
int num;
Eina_List *l;
Buffer *b;
DRI2BufferFlags *flags;
if (swp->mapped)
{
@ -623,17 +683,76 @@ evas_xlib_swapper_buffer_map(X_Swapper *swp, int *bpl)
&attach, 1, &num);
if (!swp->buf) return NULL;
if (!swp->buf->name) return NULL;
swp->buf_bo = sym_drm_slp_bo_import(bufmgr, swp->buf->name);
if (!swp->buf_bo) return NULL;
flags = (DRI2BufferFlags *)(&(swp->buf->flags));
if (!flags->data.is_reused)
{
if (swap_debug) printf("Buffer cache not reused - clear cache\n");
// buffer isnt recycled - nuke the buf cache
EINA_LIST_FREE(swp->buf_cache, b)
{
if (swap_debug) printf("Cached buf name %i freed\n", b->name);
sym_drm_slp_bo_unref(b->buf_bo);
free(b);
}
}
else
{
// find a cache buf entry
EINA_LIST_FOREACH(swp->buf_cache, l, b)
{
if (b->name == swp->buf->name)
{
if (swap_debug) printf("Cached buf name %i found\n", b->name);
swp->buf_bo = b->buf_bo;
// LRU - least used at end. found item - promote to front
swp->buf_cache = eina_list_promote_list(swp->buf_cache, l);
break;
}
}
}
if (!swp->buf_bo)
{
swp->buf_bo = sym_drm_slp_bo_import(bufmgr, swp->buf->name);
if (!swp->buf_bo) return NULL;
// cache the buf entry
b = calloc(1, sizeof(Buffer));
b->name = swp->buf->name;
b->buf_bo = swp->buf_bo;
// put ah head of list
swp->buf_cache = eina_list_prepend(swp->buf_cache, b);
if (swap_debug) printf("Buffer cache added name %i\n", b->name);
// keep bo cache no more than its max size
while (eina_list_count(swp->buf_cache) > MAX_BO_CACHE)
{
if (swap_debug) printf("Buffer cache count %i more than max %i\n", eina_list_count(swp->buf_cache) , MAX_BO_CACHE);
l = eina_list_last(swp->buf_cache);
if (l)
{
b = l->data;
if (swap_debug) printf("Buffer cache overfull - free name %i\n", b->name);
swp->buf_cache = eina_list_remove_list(swp->buf_cache, l);
sym_drm_slp_bo_unref(b->buf_bo);
free(b);
}
}
}
// XXXX: sym_drm_slp_bo_map() is incorrectly defined - it SHOULD return a
// void * at least
swp->buf_data = (void *)sym_drm_slp_bo_map(swp->buf_bo, DRM_SLP_DEVICE_CPU,
DRM_SLP_OPTION_READ |
DRM_SLP_OPTION_WRITE);
if (!swp->buf_data) return NULL;
if (!swp->buf_data)
{
ERR("Buffer map name %i failed", swp->buf->name);
return NULL;
}
if (bpl) *bpl = swp->buf->pitch;
swp->mapped = EINA_TRUE;
printf("buf: %ix%i vs.. %ix%i\n", swp->w, swp->h, swp->buf_w, swp->buf_h);
if (swap_debug) printf("Mapped bufer name %i OK\n", swp->buf->name);
if ((swp->w != swp->buf_w) || (swp->h != swp->buf_h))
{
ERR("Evas software DRI swapper buffer size mismatch");
}
swp->w = swp->buf_w;
swp->h = swp->buf_h;
return swp->buf_data;
@ -644,7 +763,7 @@ evas_xlib_swapper_buffer_unmap(X_Swapper *swp)
{
if (!swp->mapped) return;
sym_drm_slp_bo_unmap(swp->buf_bo, DRM_SLP_DEVICE_CPU);
sym_drm_slp_bo_unref(swp->buf_bo);
if (swap_debug) printf("Unmap buffer name %i\n", swp->buf->name);
free(swp->buf);
swp->buf = NULL;
swp->buf_bo = NULL;
@ -660,6 +779,7 @@ evas_xlib_swapper_swap(X_Swapper *swp, Eina_Rectangle *rects, int nrects)
int i;
unsigned long long sbc_count = 0;
if (swap_debug) printf("Swap buffers\n");
for (i = 0; i < nrects; i++)
{
xrects[i].x = rects[i].x; xrects[i].y = rects[i].y;
@ -678,7 +798,23 @@ evas_xlib_swapper_buffer_state_get(X_Swapper *swp)
if (!swp->mapped) evas_xlib_swapper_buffer_map(swp, NULL);
if (!swp->mapped) return MODE_FULL;
flags = (DRI2BufferFlags *)(&(swp->buf->flags));
printf("flags: %i\n", flags->data.idx_reuse);
if (flags->data.idx_reuse != swp->last_count)
{
static int force_full_on_reuse_change = -1;
swp->last_count = flags->data.idx_reuse;
if (force_full_on_reuse_change == -1)
{
if (getenv("EVAS_FORCE_FULL_ON_REUSE_CHANGE")) force_full_on_reuse_change = 1;
else force_full_on_reuse_change = 0;
}
if (force_full_on_reuse_change)
{
if (swap_debug) printf("Reuse changed - force FULL\n");
return MODE_FULL;
}
}
if (swap_debug) printf("Swap state idx_reuse = %i (0=FULL, 1=COPY, 2=DOUBLE, 3=TRIPLE)\n", flags->data.idx_reuse);
if (flags->data.idx_reuse == 0) return MODE_FULL;
else if (flags->data.idx_reuse == 1) return MODE_COPY;
else if (flags->data.idx_reuse == 2) return MODE_DOUBLE;

Write Preview
Loading…
Cancel
Save