#include "PUI.h"
#include <Eina.h>
-static int KEY_WL_BUFFER = 0xabcdbeaf;
-static int KEY_CLIENT = 0xdcbabeaf;
+pui_int_error
+_pui_ani_error_to_int_error(pui_error e)
+{
+ pui_int_error ei;
+
+ switch (e)
+ {
+ case PUI_ERROR_NONE:
+ ei = PUI_INT_ERROR_NONE;
+ break;
+
+ case PUI_ERROR_INVALID_HANDLE:
+ ei = PUI_INT_ERROR_INVALID_HANDLE;
+ break;
+
+ case PUI_ERROR_INVALID_SURFACE:
+ ei = PUI_INT_ERROR_INVALID_SURFACE;
+ break;
+
+ case PUI_ERROR_INVALID_BUFFER:
+ ei = PUI_INT_ERROR_INVALID_BUFFER;
+ break;
+
+ default:
+ ei = PUI_INT_ERROR_UNKNOWN;
+ break;
+ }
+
+ return ei;
+}
static void
_pui_ani_cb_frame_done(Ecore_Wl2_Window *win, uint32_t timestamp EINA_UNUSED, void *data)
return;
}
-static void
-_buffer_release(void *data, struct wl_buffer *buffer)
-{
- tbm_surface_h surface = (tbm_surface_h)data;
- pui_h handle;
-
- tbm_surface_internal_get_user_data(surface, (unsigned long)&KEY_CLIENT, (void **)&handle);
- tbm_surface_queue_release(handle->tbm_queue, surface);
-
- pui_info("[UPDATE] release wl_buffer:%p, surface:%p\n", buffer, surface);
-}
-
-static const struct wl_buffer_listener buffer_listener = {
- _buffer_release
-};
-
pui_ani_control_buffer *
pui_ani_get_buffer(pui_ani_h ani_h)
{
pui_h handle = NULL;
- tbm_surface_error_e ret;
- tbm_surface_h surface;
pui_ani_control_buffer *buffer = NULL;
if (!ani_h)
}
handle = ani_h->pui_handle;
-
- if (!handle)
- {
- pui_err("Error : PUI_INT_ERROR_INVALID_HANDLE\n");
- return NULL;
- }
-
- if (handle->current_surface)
- {
- pui_warn("Current_surface is not used !\n");
- }
-
- if (!tbm_surface_queue_can_dequeue(handle->tbm_queue, 0))
- {
- pui_err("[UPDATE] Cannot dequeue (error : PUI_ERROR_INTERNAL)\n");
- return NULL;
- }
-
- ret = tbm_surface_queue_dequeue(handle->tbm_queue, &surface);
-
- if (ret != TBM_SURFACE_ERROR_NONE)
- {
- pui_err("[UPDATE] dequeue err:%d\n", ret);
- return NULL;
- }
-
- tbm_surface_map(surface, TBM_SURF_OPTION_READ | TBM_SURF_OPTION_WRITE, &handle->current_sinfo);
-
- handle->current_surface = surface;
- buffer = (pui_ani_control_buffer *)&(handle->current_sinfo.planes[0]);
+ buffer = pui_display_get_buffer(handle);
return buffer;
}
pui_int_error
pui_ani_set_buffer(pui_ani_h ani_h, pui_ani_control_buffer *buffer)
{
+ pui_error e = PUI_ERROR_NONE;
pui_h handle = NULL;
- if (!ani_h)
- {
- pui_err("Invalid ani handle !\n");
- return PUI_INT_ERROR_INVALID_HANDLE;
- }
-
handle = ani_h->pui_handle;
+ e = pui_display_set_buffer(handle, buffer);
- if (!handle)
- {
- pui_err("Error : PUI_INT_ERROR_INVALID_HANDLE\n");
- return PUI_INT_ERROR_INVALID_HANDLE;
- }
-
- if (!handle->current_surface)
- {
- pui_err("Current_surface is not valid !\n");
- return PUI_INT_ERROR_INVALID_SURFACE;
- }
-
- if (!buffer || !buffer->ptr || !buffer->size)
- return PUI_INT_ERROR_INVALID_BUFFER;
-
- handle->is_buffer_set = 1;
-
- return PUI_INT_ERROR_NONE;
+ return _pui_ani_error_to_int_error(e);
}
pui_int_error
pui_ani_update(pui_ani_h ani_h)
{
- tbm_surface_h surface;
- tbm_surface_error_e ret;
- struct wl_buffer *wl_buffer = NULL;
-
+ pui_error e = PUI_ERROR_NONE;
pui_h handle = NULL;
if (!ani_h)
}
handle = ani_h->pui_handle;
+ e = pui_display_update(handle);
- if (!handle)
- {
- pui_err("Error : PUI_INT_ERROR_INVALID_HANDLE\n");
- return PUI_INT_ERROR_INVALID_HANDLE;
- }
-
- if (!handle->current_surface)
- return PUI_INT_ERROR_INVALID_SURFACE;
-
- if (!handle->is_buffer_set)
- {
- pui_err("Buffer is not set !\n");
- return PUI_INT_ERROR_INVALID_BUFFER;
- }
-
- surface = handle->current_surface;
- handle->current_surface = NULL;
-
- tbm_surface_unmap(surface);
-
- ret = tbm_surface_queue_enqueue(handle->tbm_queue, surface);
-
- if (ret != TBM_SURFACE_ERROR_NONE)
- {
- pui_err("[UPDATE] enqueue err:%d\n", ret);
- return PUI_INT_ERROR_INVALID_SURFACE;
- }
-
- ret = tbm_surface_queue_acquire(handle->tbm_queue, &surface);
-
- if (ret != TBM_SURFACE_ERROR_NONE)
- {
- pui_err("[UPDATE] acquire err:%d\n", ret);
- return PUI_INT_ERROR_INVALID_SURFACE;
- }
-
- if (!tbm_surface_internal_get_user_data(surface, (unsigned long)&KEY_WL_BUFFER, (void **)&wl_buffer)) {
- wl_buffer = wayland_tbm_client_create_buffer(handle->wl_tbm_client, surface);
-
- if (!wl_buffer)
- {
- pui_err("[UPDATE] failed to create wl_buffer tbm_surface:%p\n", surface);
- return PUI_INT_ERROR_INVALID_BUFFER;
- }
-
- wl_buffer_add_listener(wl_buffer, &buffer_listener, surface);
-
- tbm_surface_internal_add_user_data(surface, (unsigned long)&KEY_WL_BUFFER, NULL);
- tbm_surface_internal_set_user_data(surface, (unsigned long)&KEY_WL_BUFFER, wl_buffer);
- tbm_surface_internal_add_user_data(surface, (unsigned long)&KEY_CLIENT, NULL);
- tbm_surface_internal_set_user_data(surface, (unsigned long)&KEY_CLIENT, handle);
- }
-
- if (!wl_buffer)
- {
- pui_err("[UPDATE] dequeue err:%d\n", ret);
- return PUI_INT_ERROR_INVALID_BUFFER;
- }
-
- ecore_wl2_window_buffer_attach(handle->win, wl_buffer, 0, 0, 0);
- ecore_wl2_window_damage(handle->win, NULL, 0);
- ecore_wl2_window_commit(handle->win, EINA_TRUE);
-
- pui_info("[UPDATE] commit wl_buffer:%p, surface:%p\n", wl_buffer, surface);
-
- handle->is_buffer_set = 0;
-
- return PUI_INT_ERROR_NONE;
+ return _pui_ani_error_to_int_error(e);
}
static Eina_Bool
if (cmd == PUI_ANI_CMD_START)
{
+ if (handle->manual_render)
+ {
+ pui_err("Manual render has been set ! Unable to start animation.\n");
+ return PUI_ERROR_MANUAL_RENDER_ENABLED;
+ }
+
if (handle->current_ani_h && handle->current_ani_h != ani_h)
{
pui_ani_t *current_ani = handle->current_ani_h->ani;
projects / platform / core / uifw / libpui.git / blobdiff