diff options
| author | Michael Bien <[email protected]> | 2010-06-15 00:18:09 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-06-15 00:18:09 +0200 |
| commit | 6379f5ff97582160f8e4074e083129b6322b89fe (patch) | |
| tree | 0436d641e874a21bdd00784020c8f354a237576a /resources/includes/CL_orig/cl_gl.h | |
| parent | 86abb5fecf48c7df8dcad653b5ec03f349558050 (diff) | |
OpenCL 1.1 support.OpenCL1.1
- updated headers
- removed deprecated function from HLB
- updated javadoc taglets and all references
- disabled cl_vendor_ext.h since most of them are now in the official headers
- TODO revisit callbacks
Diffstat (limited to 'resources/includes/CL_orig/cl_gl.h')
| -rw-r--r-- | resources/includes/CL_orig/cl_gl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/resources/includes/CL_orig/cl_gl.h b/resources/includes/CL_orig/cl_gl.h index f7da00fa..3b4fe069 100644 --- a/resources/includes/CL_orig/cl_gl.h +++ b/resources/includes/CL_orig/cl_gl.h @@ -1,5 +1,5 @@ /********************************************************************************** - * Copyright (c) 2008-2009 The Khronos Group Inc. + * Copyright (c) 2008-2010 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and/or associated documentation files (the @@ -21,7 +21,7 @@ * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. **********************************************************************************/ -/* $Revision: 11041 $ on $Date: 2010-04-14 10:50:06 -0700 (Wed, 14 Apr 2010) $ */ +/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */ /* * cl_gl.h contains Khronos-approved (KHR) OpenCL extensions which have @@ -34,9 +34,10 @@ #ifdef __APPLE__ #include <OpenCL/cl.h> +#include <OpenGL/CGLDevice.h> #else #include <CL/cl.h> -#endif +#endif #ifdef __cplusplus extern "C" { @@ -45,6 +46,7 @@ extern "C" { typedef cl_uint cl_gl_object_type; typedef cl_uint cl_gl_texture_info; typedef cl_uint cl_gl_platform_info; +typedef struct __GLsync *cl_GLsync; /* cl_gl_object_type */ #define CL_GL_OBJECT_BUFFER 0x2000 @@ -88,7 +90,7 @@ extern CL_API_ENTRY cl_int CL_API_CALL clGetGLObjectInfo(cl_mem /* memobj */, cl_gl_object_type * /* gl_object_type */, cl_GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; - + extern CL_API_ENTRY cl_int CL_API_CALL clGetGLTextureInfo(cl_mem /* memobj */, cl_gl_texture_info /* param_name */, |