--- OpenCL/OpenCL.pm	2012/04/05 07:13:44	1.29
+++ OpenCL/OpenCL.pm	2012/04/19 14:36:46	1.37
@@ -151,8 +151,8 @@
 functions.
 
    my $src = '
-      __kernel void
-      squareit (__global float *input, __global float *output)
+      kernel void
+      squareit (global float *input, global float *output)
       {
         $id = get_global_id (0);
         output [id] = input [id] * input [id];
@@ -273,6 +273,21 @@
    half      IV     ushort    S
    double    NV     double    d
 
+=head2 GLX SUPPORT
+
+Due to the sad state that OpenGL support is in in Perl (mostly the OpenGL
+module, which has little to no documentation and has little to no support
+for glx), this module, as a special extension, treats context creation
+properties C<OpenCL::GLX_DISPLAY_KHR> and C<OpenCL::GL_CONTEXT_KHR>
+specially: If either or both of these are C<undef>, then the OpenCL
+module tries to dynamically resolve C<glxGetCurrentDisplay> and
+C<glxGetCurrentContext>, call these functions and use their return values
+instead.
+
+For this to work, the OpenGL library must be loaded, a GLX context must
+have been created and be made current, and C<dlsym> must be available and
+capable of finding the function via C<RTLD_DEFAULT>.
+
 =head2 THE OpenCL PACKAGE
 
 =over 4
@@ -288,9 +303,9 @@
 
 =item $str = OpenCL::enum2str $enum
 
-Converts most enum values (inof parameter names, image format constants,
+Converts most enum values (of parameter names, image format constants,
 object types, addressing and filter modes, command types etc.) into a
-human readbale string. When confronted with some random integer it can be
+human readable string. When confronted with some random integer it can be
 very helpful to pass it through this function to maybe get some readable
 string out of it.
 
@@ -694,6 +709,34 @@
 
 L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clCreateImage3D.html>
 
+=item $buffer = $ctx->gl_buffer ($flags, $bufobj)
+
+Creates a new OpenCL::Buffer (actually OpenCL::BufferObj) object that refers to the given
+OpenGL buffer object.
+
+http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clCreateFromGLBuffer.html
+
+=item $ctx->gl_texture2d ($flags, $target, $miplevel, $texture)
+
+Creates a new OpenCL::Image2D object that refers to the given OpenGL
+2D texture object.
+
+http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clCreateFromGLTexture2D.html
+
+=item $ctx->gl_texture3d ($flags, $target, $miplevel, $texture)
+
+Creates a new OpenCL::Image3D object that refers to the given OpenGL
+3D texture object.
+
+http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clCreateFromGLTexture3D.html
+
+=item $ctx->gl_renderbuffer ($flags, $renderbuffer)
+
+Creates a new OpenCL::Image2D object that refers to the given OpenGL
+render buffer.
+
+http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clCreateFromGLRenderbuffer.html
+
 =item @formats = $ctx->supported_image_formats ($flags, $image_type)
 
 Returns a list of matching image formats - each format is an arrayref with
@@ -833,10 +876,24 @@
 
 L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueNDRangeKernel.html>
 
-=item $ev = $queue->enqueue_marker
+=item $ev = $queue->enqueue_marker ($wait_events...)
 
 L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueMarker.html>
 
+=item $ev = $queue->enqueue_acquire_gl_objects ([object, ...], $wait_events...)
+
+Enqueues a list (an array-ref of OpenCL::Memory objects) to be acquired
+for subsequent OpenCL usage.
+
+L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueAcquireGLObjects.html>
+
+=item $ev = $queue->enqueue_release_gl_objects ([object, ...], $wait_events...)
+
+Enqueues a list (an array-ref of OpenCL::Memory objects) to be released
+for subsequent OpenGL usage.
+
+L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueReleaseGLObjects.html>
+
 =item $ev = $queue->enqueue_wait_for_events ($wait_events...)
 
 L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clEnqueueWaitForEvents.html>
@@ -934,6 +991,13 @@
 
 =for gengetinfo end mem
 
+=item ($type, $name) = $mem->gl_object_info
+
+Returns the OpenGL object type (e.g. OpenCL::GL_OBJECT_TEXTURE2D) and the
+object "name" (e.g. the texture name) used to create this memory object.
+
+L<http://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clGetGLObjectInfo.html>
+
 =back
 
 =head2 THE OpenCL::Buffer CLASS
@@ -1002,6 +1066,18 @@
 
 =for gengetinfo end image
 
+=for gengetinfo begin gl_texture
+
+=item $GLenum = $gl_texture->target
+
+Calls C<clGetGLTextureInfo> with C<CL_GL_TEXTURE_TARGET> and returns the result.
+
+=item $GLint = $gl_texture->gl_mipmap_level
+
+Calls C<clGetGLTextureInfo> with C<CL_GL_MIPMAP_LEVEL> and returns the result.
+
+=for gengetinfo end gl_texture
+
 =back
 
 =head2 THE OpenCL::Sampler CLASS
@@ -1304,7 +1380,7 @@
 use common::sense;
 
 BEGIN {
-   our $VERSION = '0.91';
+   our $VERSION = '0.92';
 
    require XSLoader;
    XSLoader::load (__PACKAGE__, $VERSION);