--- Merging r17231 into '.':

U    packages/opencl/src/cl.pp
U    packages/opencl/src/cl_gl.pp
--- Merging r17267 into '.':
U    packages/winunits-base/src/uxtheme.pp

# revisions: 17231,17267
------------------------------------------------------------------------
r17231 | florian | 2011-04-02 21:15:04 +0200 (Sat, 02 Apr 2011) | 2 lines
Changed paths:
   M /trunk/packages/opencl/src/cl.pp
   M /trunk/packages/opencl/src/cl_gl.pp

* small fixes for OpenCL module by Denis Golovan, resolves #18901

------------------------------------------------------------------------
------------------------------------------------------------------------
r17267 | paul | 2011-04-07 08:46:50 +0200 (Thu, 07 Apr 2011) | 1 line
Changed paths:
   M /trunk/packages/winunits-base/src/uxtheme.pp

winunits-base: fix structure name
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@17619 -

packages/opencl/src/cl.pp

@@ -385,6 +385,7 @@ const
   CL_DEVICE_MEM_BASE_ADDR_ALIGN               = $1019;
   CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE          = $101A;
   CL_DEVICE_SINGLE_FP_CONFIG                  = $101B;
+  CL_DEVICE_DOUBLE_FP_CONFIG                  = $1032;
   CL_DEVICE_GLOBAL_MEM_CACHE_TYPE             = $101C;
   CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE         = $101D;
   CL_DEVICE_GLOBAL_MEM_CACHE_SIZE             = $101E;
@@ -440,9 +441,9 @@ const
 
 // cl_context_info
   CL_CONTEXT_REFERENCE_COUNT                  = $1080;
-  CL_CONTEXT_NUM_DEVICES                      = $1081;
-  CL_CONTEXT_DEVICES                          = $1082;
-  CL_CONTEXT_PROPERTIES_INFO                  = $1083; // CL_CONTEXT_PROPERTIES
+  CL_CONTEXT_DEVICES                          = $1081;
+  CL_CONTEXT_PROPERTIES_INFO                  = $1082; // CL_CONTEXT_PROPERTIES
+  CL_CONTEXT_NUM_DEVICES                      = $1083;
   CL_CONTEXT_PLATFORM_INFO                    = $1084; // CL_CONTEXT_PLATFORM
 
 // cl_command_queue_info

packages/opencl/src/cl_gl.pp

@@ -48,6 +48,13 @@ const
   CL_GL_TEXTURE_TARGET      = $2004;
   CL_GL_MIPMAP_LEVEL        = $2005;
 
+  CL_GL_CONTEXT_KHR         = $2008;
+  CL_EGL_DISPLAY_KHR        = $2009;
+  CL_GLX_DISPLAY_KHR        = $200A;
+  CL_WGL_HDC_KHR            = $200B;
+  CL_CGL_SHAREGROUP_KHR     = $200C;
+
+
 function clCreateFromGLBuffer(context: cl_context; falgs: cl_mem_flags;
   bufobj: GLuint; var errcode_ret: cl_int
   ): cl_mem; cdecl; external name 'clCreateFromGLBuffer';

packages/winunits-base/src/uxtheme.pp

@@ -1445,7 +1445,7 @@ type
 {$EXTERNALSYM DTTOPTS}
   PDTTOPTS = ^_DTTOPTS;
 {$EXTERNALSYM PDTTOPTS}
-  TDTOpts = DTTOPTS;
+  TDTTOpts = DTTOPTS;
 
 // if (_WIN32_WINNT >= 0x0600)