diff options
| author | Ben Ashbaugh <ben.ashbaugh@intel.com> | 2021-02-16 12:32:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 15:32:41 -0500 |
| commit | 95d1b3fb54438219c7e3e4cd91a1408766e8c2a6 (patch) | |
| tree | ba8fa6207df8c758de47cd46d12f5332b639c5e0 | |
| parent | f74fc791476ece9bc979e6acb6674802c414658c (diff) | |
| download | OpenCL-Headers-95d1b3fb54438219c7e3e4cd91a1408766e8c2a6.tar.gz | |
move cl_khr_gl_event to cl_gl.h (#156)
| -rw-r--r-- | CL/cl_gl.h | 12 | ||||
| -rw-r--r-- | CL/cl_gl_ext.h | 26 |
2 files changed, 13 insertions, 25 deletions
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008-2020 The Khronos Group Inc. + * Copyright (c) 2008-2021 The Khronos Group Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,6 +152,16 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( void * param_value, size_t * param_value_size_ret); +/* + * cl_khr_gl_event extension + */ +#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D + +extern CL_API_ENTRY cl_event CL_API_CALL +clCreateEventFromGLsyncKHR(cl_context context, + cl_GLsync sync, + cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; + #ifdef __cplusplus } #endif diff --git a/CL/cl_gl_ext.h b/CL/cl_gl_ext.h index 52107b1..8ec8181 100644 --- a/CL/cl_gl_ext.h +++ b/CL/cl_gl_ext.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008-2020 The Khronos Group Inc. + * Copyright (c) 2008-2021 The Khronos Group Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,27 +14,5 @@ * limitations under the License. ******************************************************************************/ -#ifndef __OPENCL_CL_GL_EXT_H -#define __OPENCL_CL_GL_EXT_H - -#ifdef __cplusplus -extern "C" { -#endif - #include <CL/cl_gl.h> - -/* - * cl_khr_gl_event extension - */ -#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D - -extern CL_API_ENTRY cl_event CL_API_CALL -clCreateEventFromGLsyncKHR(cl_context context, - cl_GLsync sync, - cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; - -#ifdef __cplusplus -} -#endif - -#endif /* __OPENCL_CL_GL_EXT_H */ +#pragma message("All OpenGL-related extensions have been moved into cl_gl.h. Please include cl_gl.h directly.") |