[khronos-opencl-headers] 29/94: Imported Upstream version 1.2-2012.04.18

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository khronos-opencl-headers.

commit 8fa0e0f499bcdcfd6c412ea07c770fa7ce461be3
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed May 9 13:40:54 2012 +0200

    Imported Upstream version 1.2-2012.04.18
---
 cl_d3d11.h             | 12 ++++++------
 cl_dx9_media_sharing.h | 30 +++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/cl_d3d11.h b/cl_d3d11.h
index 647df8a..9700c91 100644
--- a/cl_d3d11.h
+++ b/cl_d3d11.h
@@ -80,27 +80,27 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)(
     cl_d3d11_device_set_khr    d3d_device_set,
     cl_uint                    num_entries,
     cl_device_id *             devices,
-    cl_uint *                  num_devices) CL_API_SUFFIX__VERSION_1_0;
+    cl_uint *                  num_devices) CL_API_SUFFIX__VERSION_1_2;
 
 typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)(
     cl_context     context,
     cl_mem_flags   flags,
     ID3D11Buffer * resource,
-    cl_int *       errcode_ret) CL_API_SUFFIX__VERSION_1_0;
+    cl_int *       errcode_ret) CL_API_SUFFIX__VERSION_1_2;
 
 typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)(
     cl_context        context,
     cl_mem_flags      flags,
     ID3D11Texture2D * resource,
     UINT              subresource,
-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0;
+    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_2;
 
 typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)(
     cl_context        context,
     cl_mem_flags      flags,
     ID3D11Texture3D * resource,
     UINT              subresource,
-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0;
+    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_2;
 
 typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)(
     cl_command_queue command_queue,
@@ -108,7 +108,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)(
     const cl_mem *   mem_objects,
     cl_uint          num_events_in_wait_list,
     const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_0;
+    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
 
 typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
     cl_command_queue command_queue,
@@ -116,7 +116,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
     const cl_mem *   mem_objects,
     cl_uint          num_events_in_wait_list,
     const cl_event * event_wait_list,
-    cl_event *       event) CL_API_SUFFIX__VERSION_1_0;
+    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
 
 #ifdef __cplusplus
 }
diff --git a/cl_dx9_media_sharing.h b/cl_dx9_media_sharing.h
index ee7e810..8df7d4f 100644
--- a/cl_dx9_media_sharing.h
+++ b/cl_dx9_media_sharing.h
@@ -37,11 +37,18 @@ extern "C" {
 /* cl_khr_dx9_media_sharing                                                   */
 #define cl_khr_dx9_media_sharing 1
 
+typedef cl_uint             cl_dx9_media_adapter_type_khr;
+typedef cl_uint             cl_dx9_media_adapter_set_khr;
+    
+#if defined(_WIN32)
+#include <d3d9.h>
 typedef struct _cl_dx9_surface_info_khr
 {
     IDirect3DSurface9 *resource;
     HANDLE shared_handle;
 } cl_dx9_surface_info_khr;
+#endif
+
 
 /******************************************************************************/
 
@@ -61,9 +68,9 @@ typedef struct _cl_dx9_surface_info_khr
 #define CL_ALL_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR         0x2024
 
 // cl_context_info
-#define CL_CONTEXT_D3D9_DEVICE_KHR                       0x2025
-#define CL_CONTEXT_D3D9EX_DEVICE_KHR                     0x2026
-#define CL_CONTEXT_DXVA_DEVICE_KHR                       0x2027
+#define CL_CONTEXT_ADAPTER_D3D9_KHR                      0x2025
+#define CL_CONTEXT_ADAPTER_D3D9EX_KHR                    0x2026
+#define CL_CONTEXT_ADAPTER_DXVA_KHR                      0x2027
 
 // cl_mem_info
 #define CL_MEM_DX9_MEDIA_ADAPTER_TYPE_KHR                0x2028
@@ -78,14 +85,15 @@ typedef struct _cl_dx9_surface_info_khr
 
 /******************************************************************************/
 
-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsForDX9MediaAdapterKHR_fn)(
-    cl_platform_id                 platform,
-    cl_dx9_media_adapter_type_khr  media_adapter_type,
-    void *                         media_adapter,
-    cl_dx9_media_adapter_set_khr   media_adapter_set,
-    cl_uint                        num_entries,
-    cl_device_id *                 devices,
-    cl_uint *                      num_devices) CL_API_SUFFIX__VERSION_1_2;
+typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)(
+    cl_platform_id                   platform,
+    cl_uint                          num_media_adapters,
+    cl_dx9_media_adapter_type_khr *  media_adapter_type,
+    void *                           media_adapters,
+    cl_dx9_media_adapter_set_khr     media_adapter_set,
+    cl_uint                          num_entries,
+    cl_device_id *                   devices,
+    cl_uint *                        num_devices) CL_API_SUFFIX__VERSION_1_2;
 
 typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)(
     cl_context                    context,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-headers.git