updated OpenCL headers to newest version (Wed, 17 Feb 2010).

1 files changed, 48 insertions, 19 deletions

diff --git a/resources/includes/CL_orig/cl_gl.h b/resources/includes/CL_orig/cl_gl.h
index fb86a77f..f3a5c2cf 100644
--- a/resources/includes/CL_orig/cl_gl.h
+++ b/resources/includes/CL_orig/cl_gl.h
@@ -21,71 +21,73 @@
  * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
  **********************************************************************************/
 
-/* $Revision: 8748 $ on $Date: 2009-08-27 04:24:36 -0700 (Thu, 27 Aug 2009) $ */
+/* $Revision: 10424 $ on $Date: 2010-02-17 14:34:49 -0800 (Wed, 17 Feb 2010) $ */
+
+/*
+ * cl_gl.h contains Khronos-approved (KHR) OpenCL extensions which have
+ * OpenGL dependencies. The application is responsible for #including
+ * OpenGL or OpenGL ES headers before #including cl_gl.h.
+ */
 
 #ifndef __OPENCL_CL_GL_H
 #define __OPENCL_CL_GL_H
 
 #ifdef __APPLE__
-#include <OpenCL/cl_platform.h>
-#include <OpenGL/gl.h>
+#include <OpenCL/cl.h>
 #else
-#include <CL/cl_platform.h>
-#include <GL/gl.h>
+#include <CL/cl.h>
 #endif	
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// NOTE:  Make sure that appropriate GL header file is included separately
-
 typedef cl_uint     cl_gl_object_type;
 typedef cl_uint     cl_gl_texture_info;
 typedef cl_uint     cl_gl_platform_info;
 
-// cl_gl_object_type
+/* cl_gl_object_type */
 #define CL_GL_OBJECT_BUFFER             0x2000
 #define CL_GL_OBJECT_TEXTURE2D          0x2001
 #define CL_GL_OBJECT_TEXTURE3D          0x2002
 #define CL_GL_OBJECT_RENDERBUFFER       0x2003
 
-// cl_gl_texture_info
+/* cl_gl_texture_info */
 #define CL_GL_TEXTURE_TARGET            0x2004
 #define CL_GL_MIPMAP_LEVEL              0x2005
 
 extern CL_API_ENTRY cl_mem CL_API_CALL
 clCreateFromGLBuffer(cl_context     /* context */,
                      cl_mem_flags   /* flags */,
-                     GLuint         /* bufobj */,
+                     cl_GLuint      /* bufobj */,
                      int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
 
 extern CL_API_ENTRY cl_mem CL_API_CALL
 clCreateFromGLTexture2D(cl_context      /* context */,
                         cl_mem_flags    /* flags */,
-                        GLenum          /* target */,
-                        GLint           /* miplevel */,
-                        GLuint          /* texture */,
+                        cl_GLenum       /* target */,
+                        cl_GLint        /* miplevel */,
+                        cl_GLuint       /* texture */,
                         cl_int *        /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
 
 extern CL_API_ENTRY cl_mem CL_API_CALL
 clCreateFromGLTexture3D(cl_context      /* context */,
                         cl_mem_flags    /* flags */,
-                        GLenum          /* target */,
-                        GLint           /* miplevel */,
-                        GLuint          /* texture */,
+                        cl_GLenum       /* target */,
+                        cl_GLint        /* miplevel */,
+                        cl_GLuint       /* texture */,
                         cl_int *        /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
 
 extern CL_API_ENTRY cl_mem CL_API_CALL
 clCreateFromGLRenderbuffer(cl_context   /* context */,
                            cl_mem_flags /* flags */,
-                           GLuint       /* renderbuffer */,
+                           cl_GLuint    /* renderbuffer */,
                            cl_int *     /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
 
 extern CL_API_ENTRY cl_int CL_API_CALL
 clGetGLObjectInfo(cl_mem                /* memobj */,
                   cl_gl_object_type *   /* gl_object_type */,
-                  GLuint *              /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0;
+                  cl_GLuint *              /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0;
                   
 extern CL_API_ENTRY cl_int CL_API_CALL
 clGetGLTextureInfo(cl_mem               /* memobj */,
@@ -110,8 +112,35 @@ clEnqueueReleaseGLObjects(cl_command_queue      /* command_queue */,
                           const cl_event *      /* event_wait_list */,
                           cl_event *            /* event */) CL_API_SUFFIX__VERSION_1_0;
 
+/* cl_khr_gl_sharing extension  */
+
+#define cl_khr_gl_sharing 1
+
+typedef cl_uint     cl_gl_context_info;
+
+/* Additional Error Codes  */
+#define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR  -1000
+
+/* cl_gl_context_info  */
+#define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR    0x2006
+#define CL_DEVICES_FOR_GL_CONTEXT_KHR           0x2007
+
+/* Additional cl_context_properties  */
+#define CL_GL_CONTEXT_KHR                       0x2008
+#define CL_EGL_DISPLAY_KHR                      0x2009
+#define CL_GLX_DISPLAY_KHR                      0x200A
+#define CL_WGL_HDC_KHR                          0x200B
+#define CL_CGL_SHAREGROUP_KHR                   0x200C
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clGetGLContextInfoKHR(const cl_context_properties * /* properties */,
+                      cl_gl_context_info            /* param_name */,
+                      size_t                        /* param_value_size */,
+                      void *                        /* param_value */,
+                      size_t *                      /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // __OPENCL_CL_GL_H
+#endif  /* __OPENCL_CL_GL_H  */