diff options
| author | Junkyeong Kim <jk0430.kim@samsung.com> | 2021-03-05 11:26:23 +0900 |
|---|---|---|
| committer | Junkyeong Kim <jk0430.kim@samsung.com> | 2021-03-11 17:16:29 +0900 |
| commit | fcafe4f1f685e8333ce66a0fa922bd8dd8c8f87e (patch) | |
| tree | 83ae2041fa8b53abd3000df34e9b4498c215091d | |
| parent | d33fccf6d13c453b09ae66a0a1664f852d08c26e (diff) | |
| download | emulator-yagl-fcafe4f1f685e8333ce66a0fa922bd8dd8c8f87e.tar.gz emulator-yagl-fcafe4f1f685e8333ce66a0fa922bd8dd8c8f87e.tar.bz2 emulator-yagl-fcafe4f1f685e8333ce66a0fa922bd8dd8c8f87e.zip | |
EGL: use libhal-backend-tbm-vigssubmit/tizen/20210312.004154accepted/tizen/unified/20210312.184240
Change-Id: I567abfab3dff0306d61476c0fc95f09c24ddfcda
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | EGL/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | EGL/tizen/yagl_tizen_display.c | 5 | ||||
| -rw-r--r-- | packaging/emulator-yagl.spec | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd02e24..9f73925 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,11 @@ add_definitions(${LIBTBM_VIGS_CFLAGS}) include_directories(${LIBTBM_VIGS_INCLUDE_DIRS}) link_directories(${LIBTBM_VIGS_LIBRARY_DIRS}) +pkg_check_modules(HAL_BACKEND_TBM_VIGS REQUIRED hal-backend-tbm-vigs) +add_definitions(${HAL_BACKEND_TBM_VIGS_CFLAGS}) +include_directories(${HAL_BACKEND_TBM_VIGS_INCLUDE_DIRS}) +link_directories(${HAL_BACKEND_TBM_VIGS_LIBRARY_DIRS}) + if (PLATFORM_X11) pkg_check_modules(X11 REQUIRED x11) pkg_check_modules(XEXT REQUIRED xext) diff --git a/EGL/CMakeLists.txt b/EGL/CMakeLists.txt index 57c1de5..3ef3be4 100644 --- a/EGL/CMakeLists.txt +++ b/EGL/CMakeLists.txt @@ -45,6 +45,7 @@ set(LIBRARIES ${LIBDRM_VIGS_LIBRARIES} ${LIBTBM_LIBRARIES} ${LIBTBM_VIGS_LIBRARIES} + ${HAL_BACKEND_TBM_VIGS_LIBRARIES} dl ) diff --git a/EGL/tizen/yagl_tizen_display.c b/EGL/tizen/yagl_tizen_display.c index b6d16b3..121d458 100644 --- a/EGL/tizen/yagl_tizen_display.c +++ b/EGL/tizen/yagl_tizen_display.c @@ -39,6 +39,7 @@ #include "vigs.h" #include <tbm_bufmgr.h> #include <tbm_vigs.h> +#include <libhal_backend_tbm_vigs.h> #include <sys/fcntl.h> #include <stdio.h> #include <stdlib.h> @@ -150,7 +151,9 @@ struct yagl_native_display goto fail; } - drm_dev = tbm_vigs_get_drm_dev(); + drm_dev = libhal_backend_tbm_vigs_get_drm_dev(); + if (drm_dev == NULL) + drm_dev = tbm_vigs_get_drm_dev(); yagl_native_display_init(&dpy->base, platform, diff --git a/packaging/emulator-yagl.spec b/packaging/emulator-yagl.spec index eacafbf..5951f91 100644 --- a/packaging/emulator-yagl.spec +++ b/packaging/emulator-yagl.spec @@ -18,6 +18,7 @@ BuildRequires: pkgconfig(libdrm) %if "%{ENABLE_TIZEN_BACKEND}" == "1" BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(libtbm-vigs) +BuildRequires: pkgconfig(hal-backend-tbm-vigs) BuildRequires: pkgconfig(tpl-egl) BuildRequires: pkgconfig(wayland-egl) %endif |