diff options
| author | Chuanbo Weng <chuanbo.weng@intel.com> | 2016-09-07 18:59:05 +0800 |
|---|---|---|
| committer | Yang Rong <rong.r.yang@intel.com> | 2016-09-12 16:48:52 +0800 |
| commit | a892148ee12cbaa021b680c4d770e53fab511366 (patch) | |
| tree | c342b5e66f0b3a4761db94cd3dd8b2f022f3c733 /CMakeLists.txt | |
| parent | 7fb38b6df350908276ed214d6650074faff43b7a (diff) | |
| download | beignet-a892148ee12cbaa021b680c4d770e53fab511366.tar.gz | |
Runtime: re-enable cl_khr_gl_sharing with existing egl extension.
In order to query low level layout of GL buffer object/texture/render
buffer, previous implementation introduced an egl extension and
implemented in Beignet side. This way is broken once mesa change its
related internal code. In this patch, we use an new egl extension
(EGL_MESA_image_dma_buf_export) to query related layout infomations
of gl texture. Since this egl extension is already accepted by Khronos,
so it's a stable method. This patch just implement GL texture 2d buffer
sharing, and we will implement other target type if necessary.
v2:
Add CMake build option to enable cl_khr_gl_sharing(default off).
Clean up related CMake code.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
Reviewed-by: Yang Rong <rong.r.yang@intel.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f0b45ef7..d839f3f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,15 +179,6 @@ ENDIF(CMRT_FOUND) Find_Package(Threads) IF(X11_FOUND) -# OpenGL (not use cmake helper) -pkg_check_modules(OPENGL gl) -IF(OPENGL_FOUND) - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIRS}) - MESSAGE(STATUS "Looking for OpenGL - found at ${OPENGL_PREFIX}") -ELSE(OPENGL_FOUND) - MESSAGE(STATUS "Looking for OpenGL - not found") -ENDIF(OPENGL_FOUND) - # Xext pkg_check_modules(XEXT REQUIRED xext) IF(XEXT_FOUND) @@ -207,20 +198,22 @@ ELSE(XFIXES_FOUND) ENDIF(XFIXES_FOUND) ENDIF(X11_FOUND) -pkg_check_modules(EGL egl) -IF(EGL_FOUND) - MESSAGE(STATUS "Looking for EGL - found at ${EGL_PREFIX}") -ELSE(EGL_FOUND) - MESSAGE(STATUS "Looking for EGL - not found") -ENDIF(EGL_FOUND) - -# cl_khr_gl_sharing requires to build with mesa source -#Find_Package(MesaSrc) -#IF(MESA_SOURCE_FOUND) -# MESSAGE(STATUS "Looking for mesa source code - found at ${MESA_SOURCE_PREFIX}") -#ELSE(MESA_SOURCE_FOUND) -# MESSAGE(STATUS "Looking for mesa source code - not found, cl_khr_gl_sharing will be disabled.") -#ENDIF(MESA_SOURCE_FOUND) +OPTION(ENABLE_GL_SHARING "cl_khr_gl_sharing" OFF) + +IF(ENABLE_GL_SHARING) + pkg_check_modules(OPENGL REQUIRED gl) + IF(OPENGL_FOUND) + MESSAGE(STATUS "Looking for OpenGL - found at ${OPENGL_PREFIX}") + ELSE(OPENGL_FOUND) + MESSAGE(STATUS "Looking for OpenGL - not found") + ENDIF(OPENGL_FOUND) + pkg_check_modules(EGL REQUIRED egl>=11.0.0) + IF(EGL_FOUND) + MESSAGE(STATUS "Looking for EGL - found at ${EGL_PREFIX}") + ELSE(EGL_FOUND) + MESSAGE(STATUS "Looking for EGL - not found") + ENDIF(EGL_FOUND) +ENDIF(ENABLE_GL_SHARING) Find_Package(OCLIcd) IF(OCLIcd_FOUND) |