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 /utests/utest_helper.hpp | |
| 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 'utests/utest_helper.hpp')
| -rw-r--r-- | utests/utest_helper.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/utests/utest_helper.hpp b/utests/utest_helper.hpp index 5f2fea68..034a411a 100644 --- a/utests/utest_helper.hpp +++ b/utests/utest_helper.hpp @@ -39,13 +39,15 @@ #define __thread #endif -#ifdef HAS_EGL +#ifdef HAS_GL_EGL_X11 #define EGL_WINDOW_WIDTH 256 #define EGL_WINDOW_HEIGHT 256 +#define GL_GLEXT_PROTOTYPES #include <GL/gl.h> +#include <GL/glext.h> #include <EGL/egl.h> #include <EGL/eglext.h> -#include <CL/cl_gl.h> +#include <CL/cl_gl.h> extern EGLDisplay eglDisplay; extern EGLContext eglContext; @@ -126,6 +128,9 @@ union uint32_cast { #define OCL_ENQUEUE_ACQUIRE_GL_OBJECTS(ID) \ OCL_CALL(clEnqueueAcquireGLObjects, queue, 1, &buf[ID], 0, 0, 0) +#define OCL_ENQUEUE_RELEASE_GL_OBJECTS(ID) \ + OCL_CALL(clEnqueueReleaseGLObjects, queue, 1, &buf[ID], 0, 0, 0) + #define OCL_SWAP_EGL_BUFFERS() \ eglSwapBuffers(eglDisplay, eglSurface); |