diff options
Diffstat (limited to 'EGL/tizen')
| -rw-r--r-- | EGL/tizen/yagl_tizen_display.c | 7 | ||||
| -rw-r--r-- | EGL/tizen/yagl_tizen_native_image.c | 3 | ||||
| -rw-r--r-- | EGL/tizen/yagl_tizen_window.c | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/EGL/tizen/yagl_tizen_display.c b/EGL/tizen/yagl_tizen_display.c index b95ac92..b6d16b3 100644 --- a/EGL/tizen/yagl_tizen_display.c +++ b/EGL/tizen/yagl_tizen_display.c @@ -34,10 +34,11 @@ #include "yagl_tizen_display.h" #include "yagl_tizen_window.h" #include "yagl_tizen_pbuffer.h" -#include <tbm_bufmgr_backend.h> #include "yagl_log.h" #include "yagl_malloc.h" #include "vigs.h" +#include <tbm_bufmgr.h> +#include <tbm_vigs.h> #include <sys/fcntl.h> #include <stdio.h> #include <stdlib.h> @@ -134,7 +135,6 @@ struct yagl_native_display yagl_os_display os_dpy) { struct yagl_tizen_display *dpy; - tbm_bufmgr bufmgr; struct vigs_drm_device *drm_dev = NULL; YAGL_LOG_FUNC_ENTER(yagl_tizen_display_create, "os_dpy = %p", os_dpy); @@ -150,8 +150,7 @@ struct yagl_native_display goto fail; } - bufmgr = tbm_bufmgr_init(-1); - drm_dev = (struct vigs_drm_device *)tbm_backend_get_priv_from_bufmgr(bufmgr); + drm_dev = tbm_vigs_get_drm_dev(); yagl_native_display_init(&dpy->base, platform, diff --git a/EGL/tizen/yagl_tizen_native_image.c b/EGL/tizen/yagl_tizen_native_image.c index 52157d5..67b4e11 100644 --- a/EGL/tizen/yagl_tizen_native_image.c +++ b/EGL/tizen/yagl_tizen_native_image.c @@ -44,7 +44,6 @@ #include <tbm_surface.h> #include <tbm_surface_internal.h> #include <tpl.h> -#include <tbm_bufmgr_backend.h> static void yagl_onscreen_image_tizen_update(struct yagl_image *image) { @@ -98,7 +97,7 @@ struct yagl_onscreen_image_tizen tbm_surface_internal_ref(tbm_surface); bo = tbm_surface_internal_get_bo(tbm_surface, 0); - drm_sfc = (struct vigs_drm_surface *)tbm_backend_get_bo_priv(bo); + drm_sfc = bo ? (struct vigs_drm_surface *)tbm_bo_get_handle(bo, TBM_DEVICE_3D).ptr : NULL; if (vigs_drm_gem_get_name(&drm_sfc->gem)) { yagl_set_error(EGL_BAD_NATIVE_PIXMAP); YAGL_LOG_ERROR("get gem name failed"); diff --git a/EGL/tizen/yagl_tizen_window.c b/EGL/tizen/yagl_tizen_window.c index 0408bb1..fe2ac39 100644 --- a/EGL/tizen/yagl_tizen_window.c +++ b/EGL/tizen/yagl_tizen_window.c @@ -35,7 +35,6 @@ #include "yagl_tizen_display.h" #include "yagl_log.h" #include "yagl_malloc.h" -#include <tbm_bufmgr_backend.h> #include "vigs.h" #include <stdio.h> #include <stdlib.h> @@ -134,7 +133,7 @@ static int yagl_tizen_window_get_buffer(struct yagl_native_drawable *drawable, bo = tbm_surface_internal_get_bo(tbm_surface, 0); if (buffer_sfc != NULL) { - *buffer_sfc = (struct vigs_drm_surface *)tbm_backend_get_bo_priv(bo); + *buffer_sfc = bo ? (struct vigs_drm_surface *)tbm_bo_get_handle(bo, TBM_DEVICE_3D).ptr : NULL; if (vigs_drm_gem_get_name(&(*buffer_sfc)->gem)) YAGL_LOG_ERROR("%s: get gem name failed\n", __func__); |