diff --git a/opencl/amdocl/cl_common.hpp b/opencl/amdocl/cl_common.hpp index 8b71cc6d24..f41932d963 100644 --- a/opencl/amdocl/cl_common.hpp +++ b/opencl/amdocl/cl_common.hpp @@ -21,6 +21,13 @@ #ifndef CL_COMMON_HPP_ #define CL_COMMON_HPP_ +#ifdef _WIN32 +#include +#include +#include +#endif +#include + #include "top.hpp" #include "vdi_common.hpp" diff --git a/opencl/amdocl/cl_context.cpp b/opencl/amdocl/cl_context.cpp index c1236a7096..f2428535b4 100644 --- a/opencl/amdocl/cl_context.cpp +++ b/opencl/amdocl/cl_context.cpp @@ -25,9 +25,6 @@ #include "platform/runtime.hpp" #include "platform/agent.hpp" #ifdef _WIN32 -#include -#include "CL/cl_d3d10.h" -#include "CL/cl_d3d11.h" #include "cl_d3d9_amd.hpp" #include "cl_d3d10_amd.hpp" #include "cl_d3d11_amd.hpp" diff --git a/opencl/amdocl/cl_d3d10.cpp b/opencl/amdocl/cl_d3d10.cpp index 5b886120de..a5eadf3a7e 100644 --- a/opencl/amdocl/cl_d3d10.cpp +++ b/opencl/amdocl/cl_d3d10.cpp @@ -22,9 +22,6 @@ #include "top.hpp" -#include -#include - #include "cl_common.hpp" #include "cl_d3d10_amd.hpp" #include "runtime/platform/command.hpp" diff --git a/opencl/amdocl/cl_d3d10_amd.hpp b/opencl/amdocl/cl_d3d10_amd.hpp index 17b038878b..34c269d13b 100644 --- a/opencl/amdocl/cl_d3d10_amd.hpp +++ b/opencl/amdocl/cl_d3d10_amd.hpp @@ -21,64 +21,13 @@ #ifndef CL_D3D10_AMD_HPP_ #define CL_D3D10_AMD_HPP_ -#include "CL/cl_d3d10.h" +#include "cl_common.hpp" #include "platform/context.hpp" #include "platform/memory.hpp" #include -extern CL_API_ENTRY cl_int CL_API_CALL -clGetDeviceIDsFromD3D10KHR( - cl_platform_id /*platform*/, - cl_d3d10_device_source_khr /*d3d_device_source*/, - void * /*d3d_object*/, - cl_d3d10_device_set_khr /*d3d_device_set*/, - cl_uint /*num_entries*/, - cl_device_id * /*devices*/, - cl_uint * /*num_devices*/); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromD3D10BufferKHR( - cl_context /* context */, - cl_mem_flags /* flags */, - ID3D10Buffer * /* buffer */, - cl_int * /* errcode_ret */); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromD3D10Texture2DKHR( - cl_context /* context */, - cl_mem_flags /* flags */, - ID3D10Texture2D * /* resource */, - UINT /* subresource */, - cl_int * /* errcode_ret */); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromD3D10Texture3DKHR( - cl_context /* context */, - cl_mem_flags /* flags */, - ID3D10Texture3D * /* resource */, - UINT /* subresource */, - cl_int * /* errcode_ret */); - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueAcquireD3D10ObjectsKHR( - cl_command_queue /* command_queue */, - cl_uint /* num_objects */, - const cl_mem * /* mem_objects */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */); - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReleaseD3D10ObjectsKHR( - cl_command_queue /* command_queue */, - cl_uint /* num_objects */, - const cl_mem * /* mem_objects */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */); - namespace amd { diff --git a/opencl/amdocl/cl_d3d11.cpp b/opencl/amdocl/cl_d3d11.cpp index 9425ab4ce5..8059d50bbf 100644 --- a/opencl/amdocl/cl_d3d11.cpp +++ b/opencl/amdocl/cl_d3d11.cpp @@ -22,10 +22,6 @@ #include "top.hpp" -#include -#include - -#include "cl_common.hpp" #include "cl_d3d11_amd.hpp" #include "runtime/platform/command.hpp" diff --git a/opencl/amdocl/cl_d3d11_amd.hpp b/opencl/amdocl/cl_d3d11_amd.hpp index 3e1add06aa..e4982fee54 100644 --- a/opencl/amdocl/cl_d3d11_amd.hpp +++ b/opencl/amdocl/cl_d3d11_amd.hpp @@ -21,65 +21,12 @@ #ifndef CL_D3D11_AMD_HPP_ #define CL_D3D11_AMD_HPP_ -#include "CL/cl_d3d11.h" - #include "cl_d3d10_amd.hpp" #include "platform/context.hpp" #include "platform/memory.hpp" #include -extern CL_API_ENTRY cl_int CL_API_CALL -clGetDeviceIDsFromD3D11KHR( - cl_platform_id /*platform*/, - cl_d3d11_device_source_khr /*d3d_device_source*/, - void * /*d3d_object*/, - cl_d3d11_device_set_khr /*d3d_device_set*/, - cl_uint /*num_entries*/, - cl_device_id * /*devices*/, - cl_uint * /*num_devices*/); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromD3D11BufferKHR( - cl_context /* context */, - cl_mem_flags /* flags */, - ID3D11Buffer * /* buffer */, - cl_int * /* errcode_ret */); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromD3D11Texture2DKHR( - cl_context /* context */, - cl_mem_flags /* flags */, - ID3D11Texture2D * /* resource */, - UINT /* subresource */, - cl_int * /* errcode_ret */); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromD3D11Texture3DKHR( - cl_context /* context */, - cl_mem_flags /* flags */, - ID3D11Texture3D * /* resource */, - UINT /* subresource */, - cl_int * /* errcode_ret */); - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueAcquireD3D11ObjectsKHR( - cl_command_queue /* command_queue */, - cl_uint /* num_objects */, - const cl_mem * /* mem_objects */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */); - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReleaseD3D11ObjectsKHR( - cl_command_queue /* command_queue */, - cl_uint /* num_objects */, - const cl_mem * /* mem_objects */, - cl_uint /* num_events_in_wait_list */, - const cl_event * /* event_wait_list */, - cl_event * /* event */); - extern CL_API_ENTRY cl_mem CL_API_CALL clGetPlaneFromImageAMD( cl_context /* context */, diff --git a/opencl/amdocl/cl_d3d9.cpp b/opencl/amdocl/cl_d3d9.cpp index 92c2ca1b1b..ca313c3948 100644 --- a/opencl/amdocl/cl_d3d9.cpp +++ b/opencl/amdocl/cl_d3d9.cpp @@ -22,8 +22,6 @@ #include "top.hpp" -#include -#include "cl_common.hpp" #include "cl_d3d9_amd.hpp" #include "runtime/platform/command.hpp" diff --git a/opencl/amdocl/cl_d3d9_amd.hpp b/opencl/amdocl/cl_d3d9_amd.hpp index 7aed9f9aa3..bab6deb9ab 100644 --- a/opencl/amdocl/cl_d3d9_amd.hpp +++ b/opencl/amdocl/cl_d3d9_amd.hpp @@ -23,8 +23,7 @@ #ifndef __OPENCL_CL_D3D9_AMD_H #define __OPENCL_CL_D3D9_AMD_H -#include "CL/cl_dx9_media_sharing.h" -#include +#include "cl_common.hpp" #include "platform/context.hpp" #include "platform/memory.hpp" @@ -40,44 +39,6 @@ /* cl_amd_d3d9_sharing enumerations */ #define CL_CONTEXT_D3D9_DEVICE_KHR 0x4039 -extern CL_API_ENTRY cl_int CL_API_CALL -clGetDeviceIDsFromDX9MediaAdapterKHR( - cl_platform_id, - cl_uint, - cl_dx9_media_adapter_type_khr *, - void *, - cl_dx9_media_adapter_set_khr, - cl_uint, - cl_device_id *, - cl_uint *); - -extern CL_API_ENTRY cl_mem CL_API_CALL -clCreateFromDX9MediaSurfaceKHR( - cl_context, - cl_mem_flags, - cl_dx9_media_adapter_type_khr, - void *, - cl_uint, - cl_int *); - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueAcquireDX9MediaSurfacesKHR( - cl_command_queue, - cl_uint, - const cl_mem *, - cl_uint, - const cl_event *, - cl_event *); - -extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReleaseDX9MediaSurfacesKHR( - cl_command_queue, - cl_uint, - const cl_mem *, - cl_uint, - const cl_event *, - cl_event *); - namespace amd { typedef struct