From 45ce4c8008caa139184bf935204ce213b28f3a4d Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 9 Sep 2016 15:08:40 -0400 Subject: [PATCH] ecore-drm2: Rename output_fb_release to just fb_release As this function releases FBOs on a given output, lets just shorten the API function name so it can stay grouped into the ecore_drm2_fb.c file ... leaving it as ecore_drm2_output_fb_release reads like it should have gone into the ecore_drm2_output.c file... NB: No real function changes here, just an API rename. Signed-off-by: Chris Michael --- src/lib/ecore_drm2/Ecore_Drm2.h | 28 +++++++++---------- src/lib/ecore_drm2/ecore_drm2_fb.c | 2 +- src/modules/evas/engines/gl_drm/evas_outbuf.c | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h index a1c5a5ba46..209453eda2 100644 --- a/src/lib/ecore_drm2/Ecore_Drm2.h +++ b/src/lib/ecore_drm2/Ecore_Drm2.h @@ -799,6 +799,20 @@ EAPI Eina_Bool ecore_drm2_fb_busy_get(Ecore_Drm2_Fb *fb); */ EAPI void ecore_drm2_fb_busy_set(Ecore_Drm2_Fb *fb, Eina_Bool busy); +/** + * Try to force a framebuffer release for an output + * + * This tries to release the next, pending, or current buffer from + * the output. If successful there will be a release callback to + * the registered handler, and the fb will no longer be flagged busy. + * + * @param output The output to force release + * + * @ingroup Ecore_Drm2_Fb_Group + * @since 1.19 + */ +EAPI void ecore_drm2_fb_release(Ecore_Drm2_Output *o); + /** * Set the user data for the output's page flip handler * @@ -824,20 +838,6 @@ EAPI void ecore_drm2_output_user_data_set(Ecore_Drm2_Output *o, void *data); */ EAPI void ecore_drm2_output_release_handler_set(Ecore_Drm2_Output *output, Ecore_Drm2_Release_Handler handler, void *data); -/** - * Try to force a framebuffer release for an output - * - * This tries to release the next, pending, or current buffer from - * the output. If successful there will be a release callback to - * the registered handler, and the fb will no longer be flagged busy. - * - * @param output The output to force release - * - * @ingroup Ecore_Drm2_Output_Group - * @since 1.19 - */ -EAPI void ecore_drm2_output_fb_release(Ecore_Drm2_Output *o); - /** * Get the Framebuffer's gbm buffer object * diff --git a/src/lib/ecore_drm2/ecore_drm2_fb.c b/src/lib/ecore_drm2/ecore_drm2_fb.c index 14f85c821a..fc40a8edea 100644 --- a/src/lib/ecore_drm2/ecore_drm2_fb.c +++ b/src/lib/ecore_drm2/ecore_drm2_fb.c @@ -334,7 +334,7 @@ ecore_drm2_fb_busy_set(Ecore_Drm2_Fb *fb, Eina_Bool busy) } EAPI void -ecore_drm2_output_fb_release(Ecore_Drm2_Output *o) +ecore_drm2_fb_release(Ecore_Drm2_Output *o) { EINA_SAFETY_ON_NULL_RETURN(o); diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c b/src/modules/evas/engines/gl_drm/evas_outbuf.c index 0823aff80c..6515b809de 100644 --- a/src/modules/evas/engines/gl_drm/evas_outbuf.c +++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c @@ -96,7 +96,7 @@ _evas_outbuf_buffer_swap(Outbuf *ob) bo = gbm_surface_lock_front_buffer(ob->surface); if (!bo) { - ecore_drm2_output_fb_release(ob->priv.output); + ecore_drm2_fb_release(ob->priv.output); bo = gbm_surface_lock_front_buffer(ob->surface); } if (bo) fb = _evas_outbuf_fb_get(ob, bo);