1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00

Dependencies: Updated OpenCL-Headers to latest version from GitHub master repository

Dependencies: Updated OpenCL function wrapper declarations accordingly to updated OpenCL-Headers
This commit is contained in:
jsteube 2019-04-20 09:34:13 +02:00
parent 5f3d9e08b9
commit ac4f8e688a
12 changed files with 1066 additions and 1099 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
/********************************************************************************** /**********************************************************************************
* Copyright (c) 2008-2016 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -27,7 +27,7 @@
**********************************************************************************/ **********************************************************************************/
/*****************************************************************************\ /*****************************************************************************\
Copyright (c) 2013-2016 Intel Corporation All Rights Reserved. Copyright (c) 2013-2019 Intel Corporation All Rights Reserved.
THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -106,73 +106,73 @@ typedef cl_uint cl_dx9_device_set_intel;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clGetDeviceIDsFromDX9INTEL( clGetDeviceIDsFromDX9INTEL(
cl_platform_id /* platform */, cl_platform_id platform,
cl_dx9_device_source_intel /* dx9_device_source */, cl_dx9_device_source_intel dx9_device_source,
void* /* dx9_object */, void* dx9_object,
cl_dx9_device_set_intel /* dx9_device_set */, cl_dx9_device_set_intel dx9_device_set,
cl_uint /* num_entries */, cl_uint num_entries,
cl_device_id* /* devices */, cl_device_id* devices,
cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_1; cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)(
cl_platform_id /* platform */, cl_platform_id platform,
cl_dx9_device_source_intel /* dx9_device_source */, cl_dx9_device_source_intel dx9_device_source,
void* /* dx9_object */, void* dx9_object,
cl_dx9_device_set_intel /* dx9_device_set */, cl_dx9_device_set_intel dx9_device_set,
cl_uint /* num_entries */, cl_uint num_entries,
cl_device_id* /* devices */, cl_device_id* devices,
cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_1; cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromDX9MediaSurfaceINTEL( clCreateFromDX9MediaSurfaceINTEL(
cl_context /* context */, cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
IDirect3DSurface9* /* resource */, IDirect3DSurface9* resource,
HANDLE /* sharedHandle */, HANDLE sharedHandle,
UINT /* plane */, UINT plane,
cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)( typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)(
cl_context /* context */, cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
IDirect3DSurface9* /* resource */, IDirect3DSurface9* resource,
HANDLE /* sharedHandle */, HANDLE sharedHandle,
UINT /* plane */, UINT plane,
cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireDX9ObjectsINTEL( clEnqueueAcquireDX9ObjectsINTEL(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem* /* mem_objects */, const cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem* /* mem_objects */, const cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_EXT_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseDX9ObjectsINTEL( clEnqueueReleaseDX9ObjectsINTEL(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
cl_mem* /* mem_objects */, cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
cl_mem* /* mem_objects */, cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_EXT_SUFFIX__VERSION_1_1;
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008-2015 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -61,69 +61,69 @@ typedef intptr_t cl_egl_image_properties_khr;
#define cl_khr_egl_image 1 #define cl_khr_egl_image 1
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromEGLImageKHR(cl_context /* context */, clCreateFromEGLImageKHR(cl_context context,
CLeglDisplayKHR /* egldisplay */, CLeglDisplayKHR egldisplay,
CLeglImageKHR /* eglimage */, CLeglImageKHR eglimage,
cl_mem_flags /* flags */, cl_mem_flags flags,
const cl_egl_image_properties_khr * /* properties */, const cl_egl_image_properties_khr * properties,
cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromEGLImageKHR_fn)( typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromEGLImageKHR_fn)(
cl_context context, cl_context context,
CLeglDisplayKHR egldisplay, CLeglDisplayKHR egldisplay,
CLeglImageKHR eglimage, CLeglImageKHR eglimage,
cl_mem_flags flags, cl_mem_flags flags,
const cl_egl_image_properties_khr * properties, const cl_egl_image_properties_khr * properties,
cl_int * errcode_ret); cl_int * errcode_ret);
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireEGLObjectsKHR(cl_command_queue /* command_queue */, clEnqueueAcquireEGLObjectsKHR(cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_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_0;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireEGLObjectsKHR_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireEGLObjectsKHR_fn)(
cl_command_queue command_queue, cl_command_queue command_queue,
cl_uint num_objects, cl_uint num_objects,
const cl_mem * mem_objects, const cl_mem * mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event * event_wait_list, const cl_event * event_wait_list,
cl_event * event); cl_event * event);
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseEGLObjectsKHR(cl_command_queue /* command_queue */, clEnqueueReleaseEGLObjectsKHR(cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_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_0;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseEGLObjectsKHR_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseEGLObjectsKHR_fn)(
cl_command_queue command_queue, cl_command_queue command_queue,
cl_uint num_objects, cl_uint num_objects,
const cl_mem * mem_objects, const cl_mem * mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event * event_wait_list, const cl_event * event_wait_list,
cl_event * event); cl_event * event);
#define cl_khr_egl_event 1 #define cl_khr_egl_event 1
extern CL_API_ENTRY cl_event CL_API_CALL extern CL_API_ENTRY cl_event CL_API_CALL
clCreateEventFromEGLSyncKHR(cl_context /* context */, clCreateEventFromEGLSyncKHR(cl_context context,
CLeglSyncKHR /* sync */, CLeglSyncKHR sync,
CLeglDisplayKHR /* display */, CLeglDisplayKHR display,
cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
typedef CL_API_ENTRY cl_event (CL_API_CALL *clCreateEventFromEGLSyncKHR_fn)( typedef CL_API_ENTRY cl_event (CL_API_CALL *clCreateEventFromEGLSyncKHR_fn)(
cl_context context, cl_context context,
CLeglSyncKHR sync, CLeglSyncKHR sync,
CLeglDisplayKHR display, CLeglDisplayKHR display,
cl_int * errcode_ret); cl_int * errcode_ret);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008-2018 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -66,9 +66,9 @@ extern "C" {
* before using. * before using.
*/ */
#define cl_APPLE_SetMemObjectDestructor 1 #define cl_APPLE_SetMemObjectDestructor 1
cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem /* memobj */, cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem memobj,
void (* /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), void (* pfn_notify)(cl_mem memobj, void * user_data),
void * /*user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; void * user_data) CL_EXT_SUFFIX__VERSION_1_0;
/* Context Logging Functions /* Context Logging Functions
@ -77,25 +77,25 @@ cl_int CL_API_ENTRY clSetMemObjectDestructorAPPLE( cl_mem /* memobj */,
* Please check for the "cl_APPLE_ContextLoggingFunctions" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS) * Please check for the "cl_APPLE_ContextLoggingFunctions" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS)
* before using. * before using.
* *
* clLogMessagesToSystemLog fowards on all log messages to the Apple System Logger * clLogMessagesToSystemLog forwards on all log messages to the Apple System Logger
*/ */
#define cl_APPLE_ContextLoggingFunctions 1 #define cl_APPLE_ContextLoggingFunctions 1
extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE( const char * /* errstr */, extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE( const char * errstr,
const void * /* private_info */, const void * private_info,
size_t /* cb */, size_t cb,
void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; void * user_data) CL_EXT_SUFFIX__VERSION_1_0;
/* clLogMessagesToStdout sends all log messages to the file descriptor stdout */ /* clLogMessagesToStdout sends all log messages to the file descriptor stdout */
extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE( const char * /* errstr */, extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE( const char * errstr,
const void * /* private_info */, const void * private_info,
size_t /* cb */, size_t cb,
void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; void * user_data) CL_EXT_SUFFIX__VERSION_1_0;
/* clLogMessagesToStderr sends all log messages to the file descriptor stderr */ /* clLogMessagesToStderr sends all log messages to the file descriptor stderr */
extern void CL_API_ENTRY clLogMessagesToStderrAPPLE( const char * /* errstr */, extern void CL_API_ENTRY clLogMessagesToStderrAPPLE( const char * errstr,
const void * /* private_info */, const void * private_info,
size_t /* cb */, size_t cb,
void * /* user_data */ ) CL_EXT_SUFFIX__VERSION_1_0; void * user_data) CL_EXT_SUFFIX__VERSION_1_0;
/************************ /************************
@ -110,15 +110,14 @@ extern void CL_API_ENTRY clLogMessagesToStderrAPPLE( const char * /* errstr */
#define CL_PLATFORM_NOT_FOUND_KHR -1001 #define CL_PLATFORM_NOT_FOUND_KHR -1001
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clIcdGetPlatformIDsKHR(cl_uint /* num_entries */, clIcdGetPlatformIDsKHR(cl_uint num_entries,
cl_platform_id * /* platforms */, cl_platform_id * platforms,
cl_uint * /* num_platforms */); cl_uint * num_platforms);
typedef CL_API_ENTRY cl_int (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)(
cl_uint /* num_entries */,
cl_platform_id * /* platforms */,
cl_uint * /* num_platforms */);
typedef CL_API_ENTRY cl_int
(CL_API_CALL *clIcdGetPlatformIDsKHR_fn)(cl_uint num_entries,
cl_platform_id * platforms,
cl_uint * num_platforms);
/******************************* /*******************************
@ -136,35 +135,41 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)(
*/ */
#define CL_PROGRAM_IL_KHR 0x1169 #define CL_PROGRAM_IL_KHR 0x1169
extern CL_API_ENTRY cl_program extern CL_API_ENTRY cl_program CL_API_CALL
CL_API_CALL clCreateProgramWithILKHR( clCreateProgramWithILKHR(cl_context context,
cl_context /* context */, const void * il,
const void * /* il */, size_t length,
size_t /* length */, cl_int * errcode_ret);
cl_int * /* errcode_ret */);
typedef CL_API_ENTRY cl_program typedef CL_API_ENTRY cl_program
(CL_API_CALL *clCreateProgramWithILKHR_fn)( (CL_API_CALL *clCreateProgramWithILKHR_fn)(cl_context context,
cl_context /* context */, const void * il,
const void * /* il */, size_t length,
size_t /* length */, cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2;
/* Extension: cl_khr_image2D_buffer /* Extension: cl_khr_image2d_from_buffer
* *
* This extension allows a 2D image to be created from a cl_mem buffer without a copy. * This extension allows a 2D image to be created from a cl_mem buffer without
* The type associated with a 2D image created from a buffer in an OpenCL program is image2d_t. * a copy. The type associated with a 2D image created from a buffer in an
* Both the sampler and sampler-less read_image built-in functions are supported for 2D images * OpenCL program is image2d_t. Both the sampler and sampler-less read_image
* and 2D images created from a buffer. Similarly, the write_image built-ins are also supported * built-in functions are supported for 2D images and 2D images created from
* for 2D images created from a buffer. * a buffer. Similarly, the write_image built-ins are also supported for 2D
* images created from a buffer.
* *
* When the 2D image from buffer is created, the client must specify the width, * When the 2D image from buffer is created, the client must specify the
* height, image format (i.e. channel order and channel data type) and optionally the row pitch * width, height, image format (i.e. channel order and channel data type)
* and optionally the row pitch.
* *
* The pitch specified must be a multiple of CL_DEVICE_IMAGE_PITCH_ALIGNMENT pixels. * The pitch specified must be a multiple of
* The base address of the buffer must be aligned to CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT pixels. * CL_DEVICE_IMAGE_PITCH_ALIGNMENT_KHR pixels.
* The base address of the buffer must be aligned to
* CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT_KHR pixels.
*/ */
#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT_KHR 0x104A
#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT_KHR 0x104B
/************************************** /**************************************
* cl_khr_initialize_memory extension * * cl_khr_initialize_memory extension *
**************************************/ **************************************/
@ -180,9 +185,11 @@ typedef CL_API_ENTRY cl_program
#define CL_CONTEXT_TERMINATE_KHR 0x2032 #define CL_CONTEXT_TERMINATE_KHR 0x2032
#define cl_khr_terminate_context 1 #define cl_khr_terminate_context 1
extern CL_API_ENTRY cl_int CL_API_CALL clTerminateContextKHR(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL
clTerminateContextKHR(cl_context context) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2; typedef CL_API_ENTRY cl_int
(CL_API_CALL *clTerminateContextKHR_fn)(cl_context context) CL_EXT_SUFFIX__VERSION_1_2;
/* /*
@ -204,15 +211,16 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
typedef cl_bitfield cl_queue_properties_khr; typedef cl_bitfield cl_queue_properties_khr;
extern CL_API_ENTRY cl_command_queue CL_API_CALL extern CL_API_ENTRY cl_command_queue CL_API_CALL
clCreateCommandQueueWithPropertiesKHR( cl_context /* context */, clCreateCommandQueueWithPropertiesKHR(cl_context context,
cl_device_id /* device */, cl_device_id device,
const cl_queue_properties_khr* /* properties */, const cl_queue_properties_khr* properties,
cl_int* /* errcode_ret */ ) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_command_queue typedef CL_API_ENTRY cl_command_queue
(CL_API_CALL *clCreateCommandQueueWithPropertiesKHR_fn)( cl_context /* context */, (CL_API_CALL *clCreateCommandQueueWithPropertiesKHR_fn)(cl_context context,
cl_device_id /* device */, cl_device_id device,
const cl_queue_properties_khr* /* properties */, const cl_queue_properties_khr* properties,
cl_int* /* errcode_ret */ ) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
/****************************************** /******************************************
@ -250,31 +258,31 @@ typedef CL_API_ENTRY cl_command_queue
#define cl_ext_device_fission 1 #define cl_ext_device_fission 1
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; clReleaseDeviceEXT(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_int typedef CL_API_ENTRY cl_int
(CL_API_CALL *clReleaseDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; (CL_API_CALL *clReleaseDeviceEXT_fn)(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; clRetainDeviceEXT(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_int typedef CL_API_ENTRY cl_int
(CL_API_CALL *clRetainDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; (CL_API_CALL *clRetainDeviceEXT_fn)(cl_device_id device) CL_EXT_SUFFIX__VERSION_1_1;
typedef cl_ulong cl_device_partition_property_ext; typedef cl_ulong cl_device_partition_property_ext;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clCreateSubDevicesEXT( cl_device_id /*in_device*/, clCreateSubDevicesEXT(cl_device_id in_device,
const cl_device_partition_property_ext * /* properties */, const cl_device_partition_property_ext * properties,
cl_uint /*num_entries*/, cl_uint num_entries,
cl_device_id * /*out_devices*/, cl_device_id * out_devices,
cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; cl_uint * num_devices) CL_EXT_SUFFIX__VERSION_1_1;
typedef CL_API_ENTRY cl_int typedef CL_API_ENTRY cl_int
( CL_API_CALL * clCreateSubDevicesEXT_fn)( cl_device_id /*in_device*/, (CL_API_CALL * clCreateSubDevicesEXT_fn)(cl_device_id in_device,
const cl_device_partition_property_ext * /* properties */, const cl_device_partition_property_ext * properties,
cl_uint /*num_entries*/, cl_uint num_entries,
cl_device_id * /*out_devices*/, cl_device_id * out_devices,
cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1; cl_uint * num_devices) CL_EXT_SUFFIX__VERSION_1_1;
/* cl_device_partition_property_ext */ /* cl_device_partition_property_ext */
#define CL_DEVICE_PARTITION_EQUALLY_EXT 0x4050 #define CL_DEVICE_PARTITION_EQUALLY_EXT 0x4050
@ -320,22 +328,22 @@ typedef cl_bitfield cl_mem_migration_flags_ext;
#define CL_COMMAND_MIGRATE_MEM_OBJECT_EXT 0x4040 #define CL_COMMAND_MIGRATE_MEM_OBJECT_EXT 0x4040
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueMigrateMemObjectEXT( cl_command_queue /* command_queue */, clEnqueueMigrateMemObjectEXT(cl_command_queue command_queue,
cl_uint /* num_mem_objects */, cl_uint num_mem_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_mem_migration_flags_ext /* flags */, cl_mem_migration_flags_ext flags,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */ ); cl_event * event);
typedef CL_API_ENTRY cl_int typedef CL_API_ENTRY cl_int
(CL_API_CALL *clEnqueueMigrateMemObjectEXT_fn)( cl_command_queue /* command_queue */, (CL_API_CALL *clEnqueueMigrateMemObjectEXT_fn)(cl_command_queue command_queue,
cl_uint /* num_mem_objects */, cl_uint num_mem_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_mem_migration_flags_ext /* flags */, cl_mem_migration_flags_ext flags,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */ ); cl_event * event);
/********************************* /*********************************
@ -459,20 +467,20 @@ typedef struct _cl_mem_android_native_buffer_host_ptr
#define CL_GRALLOC_RESOURCE_NOT_ACQUIRED_IMG 0x40D4 #define CL_GRALLOC_RESOURCE_NOT_ACQUIRED_IMG 0x40D4
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireGrallocObjectsIMG(cl_command_queue /* command_queue */, clEnqueueAcquireGrallocObjectsIMG(cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseGrallocObjectsIMG(cl_command_queue /* command_queue */, clEnqueueReleaseGrallocObjectsIMG(cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
/********************************* /*********************************
@ -493,24 +501,24 @@ typedef cl_uint cl_kernel_sub_group_info;
#define CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE_KHR 0x2034 #define CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE_KHR 0x2034
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clGetKernelSubGroupInfoKHR(cl_kernel /* in_kernel */, clGetKernelSubGroupInfoKHR(cl_kernel in_kernel,
cl_device_id /*in_device*/, cl_device_id in_device,
cl_kernel_sub_group_info /* param_name */, cl_kernel_sub_group_info param_name,
size_t /*input_value_size*/, size_t input_value_size,
const void * /*input_value*/, const void * input_value,
size_t /*param_value_size*/, size_t param_value_size,
void* /*param_value*/, void * param_value,
size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED; size_t * param_value_size_ret) CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED;
typedef CL_API_ENTRY cl_int typedef CL_API_ENTRY cl_int
(CL_API_CALL * clGetKernelSubGroupInfoKHR_fn)(cl_kernel /* in_kernel */, (CL_API_CALL * clGetKernelSubGroupInfoKHR_fn)(cl_kernel in_kernel,
cl_device_id /*in_device*/, cl_device_id in_device,
cl_kernel_sub_group_info /* param_name */, cl_kernel_sub_group_info param_name,
size_t /*input_value_size*/, size_t input_value_size,
const void * /*input_value*/, const void * input_value,
size_t /*param_value_size*/, size_t param_value_size,
void* /*param_value*/, void * param_value,
size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED; size_t * param_value_size_ret) CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED;
/********************************* /*********************************
@ -651,74 +659,75 @@ typedef cl_uint cl_kernel_exec_info_arm;
typedef cl_bitfield cl_device_svm_capabilities_arm; typedef cl_bitfield cl_device_svm_capabilities_arm;
extern CL_API_ENTRY void * CL_API_CALL extern CL_API_ENTRY void * CL_API_CALL
clSVMAllocARM(cl_context /* context */, clSVMAllocARM(cl_context context,
cl_svm_mem_flags_arm /* flags */, cl_svm_mem_flags_arm flags,
size_t /* size */, size_t size,
cl_uint /* alignment */) CL_EXT_SUFFIX__VERSION_1_2; cl_uint alignment) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY void CL_API_CALL extern CL_API_ENTRY void CL_API_CALL
clSVMFreeARM(cl_context /* context */, clSVMFreeARM(cl_context context,
void * /* svm_pointer */) CL_EXT_SUFFIX__VERSION_1_2; void * svm_pointer) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueSVMFreeARM(cl_command_queue /* command_queue */, clEnqueueSVMFreeARM(cl_command_queue command_queue,
cl_uint /* num_svm_pointers */, cl_uint num_svm_pointers,
void *[] /* svm_pointers[] */, void * svm_pointers[],
void (CL_CALLBACK * /*pfn_free_func*/)(cl_command_queue /* queue */, void (CL_CALLBACK * pfn_free_func)(cl_command_queue queue,
cl_uint /* num_svm_pointers */, cl_uint num_svm_pointers,
void *[] /* svm_pointers[] */, void * svm_pointers[],
void * /* user_data */), void * user_data),
void * /* user_data */, void * user_data,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueSVMMemcpyARM(cl_command_queue /* command_queue */, clEnqueueSVMMemcpyARM(cl_command_queue command_queue,
cl_bool /* blocking_copy */, cl_bool blocking_copy,
void * /* dst_ptr */, void * dst_ptr,
const void * /* src_ptr */, const void * src_ptr,
size_t /* size */, size_t size,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueSVMMemFillARM(cl_command_queue /* command_queue */, clEnqueueSVMMemFillARM(cl_command_queue command_queue,
void * /* svm_ptr */, void * svm_ptr,
const void * /* pattern */, const void * pattern,
size_t /* pattern_size */, size_t pattern_size,
size_t /* size */, size_t size,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueSVMMapARM(cl_command_queue /* command_queue */, clEnqueueSVMMapARM(cl_command_queue command_queue,
cl_bool /* blocking_map */, cl_bool blocking_map,
cl_map_flags /* flags */, cl_map_flags flags,
void * /* svm_ptr */, void * svm_ptr,
size_t /* size */, size_t size,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueSVMUnmapARM(cl_command_queue /* command_queue */, clEnqueueSVMUnmapARM(cl_command_queue command_queue,
void * /* svm_ptr */, void * svm_ptr,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_wait_list */, const cl_event * event_wait_list,
cl_event * /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event * event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clSetKernelArgSVMPointerARM(cl_kernel /* kernel */, clSetKernelArgSVMPointerARM(cl_kernel kernel,
cl_uint /* arg_index */, cl_uint arg_index,
const void * /* arg_value */) CL_EXT_SUFFIX__VERSION_1_2; const void * arg_value) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clSetKernelExecInfoARM(cl_kernel /* kernel */, clSetKernelExecInfoARM(cl_kernel kernel,
cl_kernel_exec_info_arm /* param_name */, cl_kernel_exec_info_arm param_name,
size_t /* param_value_size */, size_t param_value_size,
const void * /* param_value */) CL_EXT_SUFFIX__VERSION_1_2; const void * param_value) CL_EXT_SUFFIX__VERSION_1_2;
/******************************** /********************************
* cl_arm_get_core_id extension * * cl_arm_get_core_id extension *

View File

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008-2017 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -27,7 +27,7 @@
******************************************************************************/ ******************************************************************************/
/*****************************************************************************\ /*****************************************************************************\
Copyright (c) 2013-2017 Intel Corporation All Rights Reserved. Copyright (c) 2013-2019 Intel Corporation All Rights Reserved.
THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -179,47 +179,47 @@ typedef struct _cl_motion_estimation_desc_intel {
extern CL_API_ENTRY cl_accelerator_intel CL_API_CALL extern CL_API_ENTRY cl_accelerator_intel CL_API_CALL
clCreateAcceleratorINTEL( clCreateAcceleratorINTEL(
cl_context /* context */, cl_context context,
cl_accelerator_type_intel /* accelerator_type */, cl_accelerator_type_intel accelerator_type,
size_t /* descriptor_size */, size_t descriptor_size,
const void* /* descriptor */, const void* descriptor,
cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_accelerator_intel (CL_API_CALL *clCreateAcceleratorINTEL_fn)( typedef CL_API_ENTRY cl_accelerator_intel (CL_API_CALL *clCreateAcceleratorINTEL_fn)(
cl_context /* context */, cl_context context,
cl_accelerator_type_intel /* accelerator_type */, cl_accelerator_type_intel accelerator_type,
size_t /* descriptor_size */, size_t descriptor_size,
const void* /* descriptor */, const void* descriptor,
cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clGetAcceleratorInfoINTEL( clGetAcceleratorInfoINTEL(
cl_accelerator_intel /* accelerator */, cl_accelerator_intel accelerator,
cl_accelerator_info_intel /* param_name */, cl_accelerator_info_intel param_name,
size_t /* param_value_size */, size_t param_value_size,
void* /* param_value */, void* param_value,
size_t* /* param_value_size_ret */) CL_EXT_SUFFIX__VERSION_1_2; size_t* param_value_size_ret) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetAcceleratorInfoINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetAcceleratorInfoINTEL_fn)(
cl_accelerator_intel /* accelerator */, cl_accelerator_intel accelerator,
cl_accelerator_info_intel /* param_name */, cl_accelerator_info_intel param_name,
size_t /* param_value_size */, size_t param_value_size,
void* /* param_value */, void* param_value,
size_t* /* param_value_size_ret */) CL_EXT_SUFFIX__VERSION_1_2; size_t* param_value_size_ret) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clRetainAcceleratorINTEL( clRetainAcceleratorINTEL(
cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clRetainAcceleratorINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clRetainAcceleratorINTEL_fn)(
cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clReleaseAcceleratorINTEL( clReleaseAcceleratorINTEL(
cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clReleaseAcceleratorINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clReleaseAcceleratorINTEL_fn)(
cl_accelerator_intel /* accelerator */) CL_EXT_SUFFIX__VERSION_1_2; cl_accelerator_intel accelerator) CL_EXT_SUFFIX__VERSION_1_2;
/****************************************** /******************************************
* cl_intel_simultaneous_sharing extension * * cl_intel_simultaneous_sharing extension *
@ -383,7 +383,7 @@ typedef cl_uint cl_diagnostics_verbose_level;
#define CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_16x16_INTEL 0x6 #define CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_16x16_INTEL 0x6
#define CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_8x8_INTEL 0x5 #define CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_8x8_INTEL 0x5
#define CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_4x4_INTEL 0x3 #define CL_AVC_ME_INTRA_LUMA_PARTITION_MASK_4x4_INTEL 0x3
#define CL_AVC_ME_INTRA_NEIGHBOR_LEFT_MASK_ENABLE_INTEL 0x60 #define CL_AVC_ME_INTRA_NEIGHBOR_LEFT_MASK_ENABLE_INTEL 0x60
#define CL_AVC_ME_INTRA_NEIGHBOR_UPPER_MASK_ENABLE_INTEL 0x10 #define CL_AVC_ME_INTRA_NEIGHBOR_UPPER_MASK_ENABLE_INTEL 0x10
@ -414,7 +414,7 @@ typedef cl_uint cl_diagnostics_verbose_level;
#define CL_AVC_ME_SLICE_TYPE_INTRA_INTEL 0x2 #define CL_AVC_ME_SLICE_TYPE_INTRA_INTEL 0x2
#define CL_AVC_ME_INTERLACED_SCAN_TOP_FIELD_INTEL 0x0 #define CL_AVC_ME_INTERLACED_SCAN_TOP_FIELD_INTEL 0x0
#define CL_AVC_ME_INTERLACED_SCAN_BOTTOM_FIELD_INTEL 0x1 #define CL_AVC_ME_INTERLACED_SCAN_BOTTOM_FIELD_INTEL 0x1
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -1,5 +1,5 @@
/********************************************************************************** /**********************************************************************************
* Copyright (c) 2008-2018 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -61,102 +61,102 @@ typedef struct __GLsync *cl_GLsync;
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromGLBuffer(cl_context /* context */, clCreateFromGLBuffer(cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
cl_GLuint /* bufobj */, cl_GLuint bufobj,
int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
#ifdef CL_VERSION_1_2 #ifdef CL_VERSION_1_2
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromGLTexture(cl_context /* context */, clCreateFromGLTexture(cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
cl_GLenum /* target */, cl_GLenum target,
cl_GLint /* miplevel */, cl_GLint miplevel,
cl_GLuint /* texture */, cl_GLuint texture,
cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2;
#endif #endif
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromGLRenderbuffer(cl_context /* context */, clCreateFromGLRenderbuffer(cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
cl_GLuint /* renderbuffer */, cl_GLuint renderbuffer,
cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clGetGLObjectInfo(cl_mem /* memobj */, clGetGLObjectInfo(cl_mem memobj,
cl_gl_object_type * /* gl_object_type */, cl_gl_object_type * gl_object_type,
cl_GLuint * /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0; 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 */,
size_t /* param_value_size */,
void * /* param_value */,
size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireGLObjects(cl_command_queue /* command_queue */, clGetGLTextureInfo(cl_mem memobj,
cl_uint /* num_objects */, cl_gl_texture_info param_name,
const cl_mem * /* mem_objects */, size_t param_value_size,
cl_uint /* num_events_in_wait_list */, void * param_value,
const cl_event * /* event_wait_list */, size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseGLObjects(cl_command_queue /* command_queue */, clEnqueueAcquireGLObjects(cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem * /* mem_objects */, const cl_mem * mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event * /* event_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_0;
extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseGLObjects(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) CL_API_SUFFIX__VERSION_1_0;
/* Deprecated OpenCL 1.1 APIs */ /* Deprecated OpenCL 1.1 APIs */
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
clCreateFromGLTexture2D(cl_context /* context */, clCreateFromGLTexture2D(cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
cl_GLenum /* target */, cl_GLenum target,
cl_GLint /* miplevel */, cl_GLint miplevel,
cl_GLuint /* texture */, cl_GLuint texture,
cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
clCreateFromGLTexture3D(cl_context /* context */, clCreateFromGLTexture3D(cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
cl_GLenum /* target */, cl_GLenum target,
cl_GLint /* miplevel */, cl_GLint miplevel,
cl_GLuint /* texture */, cl_GLuint texture,
cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
/* cl_khr_gl_sharing extension */ /* cl_khr_gl_sharing extension */
#define cl_khr_gl_sharing 1 #define cl_khr_gl_sharing 1
typedef cl_uint cl_gl_context_info; typedef cl_uint cl_gl_context_info;
/* Additional Error Codes */ /* Additional Error Codes */
#define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR -1000 #define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR -1000
/* cl_gl_context_info */ /* cl_gl_context_info */
#define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 0x2006 #define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 0x2006
#define CL_DEVICES_FOR_GL_CONTEXT_KHR 0x2007 #define CL_DEVICES_FOR_GL_CONTEXT_KHR 0x2007
/* Additional cl_context_properties */ /* Additional cl_context_properties */
#define CL_GL_CONTEXT_KHR 0x2008 #define CL_GL_CONTEXT_KHR 0x2008
#define CL_EGL_DISPLAY_KHR 0x2009 #define CL_EGL_DISPLAY_KHR 0x2009
#define CL_GLX_DISPLAY_KHR 0x200A #define CL_GLX_DISPLAY_KHR 0x200A
#define CL_WGL_HDC_KHR 0x200B #define CL_WGL_HDC_KHR 0x200B
#define CL_CGL_SHAREGROUP_KHR 0x200C #define CL_CGL_SHAREGROUP_KHR 0x200C
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clGetGLContextInfoKHR(const cl_context_properties * /* properties */, clGetGLContextInfoKHR(const cl_context_properties * properties,
cl_gl_context_info /* param_name */, cl_gl_context_info param_name,
size_t /* param_value_size */, size_t param_value_size,
void * /* param_value */, void * param_value,
size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0; size_t * param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)(
const cl_context_properties * properties, const cl_context_properties * properties,
cl_gl_context_info param_name, cl_gl_context_info param_name,

View File

@ -1,5 +1,5 @@
/********************************************************************************** /**********************************************************************************
* Copyright (c) 2008-2015 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -26,11 +26,6 @@
* MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
**********************************************************************************/ **********************************************************************************/
/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
/* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have */
/* OpenGL dependencies. */
#ifndef __OPENCL_CL_GL_EXT_H #ifndef __OPENCL_CL_GL_EXT_H
#define __OPENCL_CL_GL_EXT_H #define __OPENCL_CL_GL_EXT_H
@ -40,28 +35,15 @@ extern "C" {
#include <CL/cl_gl.h> #include <CL/cl_gl.h>
/*
* For each extension, follow this template
* cl_VEN_extname extension */
/* #define cl_VEN_extname 1
* ... define new types, if any
* ... define new tokens, if any
* ... define new APIs, if any
*
* If you need GLtypes here, mirror them with a cl_GLtype, rather than including a GL header
* This allows us to avoid having to decide whether to include GL headers or GLES here.
*/
/* /*
* cl_khr_gl_event extension * cl_khr_gl_event extension
* See section 9.9 in the OpenCL 1.1 spec for more information
*/ */
#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D #define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D
extern CL_API_ENTRY cl_event CL_API_CALL extern CL_API_ENTRY cl_event CL_API_CALL
clCreateEventFromGLsyncKHR(cl_context /* context */, clCreateEventFromGLsyncKHR(cl_context context,
cl_GLsync /* cl_GLsync */, cl_GLsync cl_GLsync,
cl_int * /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1; cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1;
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -67,101 +67,56 @@ extern "C" {
#define CL_API_SUFFIX__VERSION_2_2 #define CL_API_SUFFIX__VERSION_2_2
#define CL_EXT_SUFFIX__VERSION_2_2 #define CL_EXT_SUFFIX__VERSION_2_2
#ifdef __GNUC__ #ifdef __GNUC__
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS #define CL_EXT_SUFFIX_DEPRECATED __attribute__((deprecated))
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED #define CL_EXT_PREFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#endif
#elif defined(_WIN32) #elif defined(_WIN32)
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS #define CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED #define CL_EXT_PREFIX_DEPRECATED __declspec(deprecated)
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED __declspec(deprecated)
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED __declspec(deprecated)
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED __declspec(deprecated)
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED __declspec(deprecated)
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED __declspec(deprecated)
#endif
#else #else
#define CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED CL_EXT_PREFIX_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED CL_EXT_PREFIX_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED CL_EXT_PREFIX_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED CL_EXT_PREFIX_DEPRECATED
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED #define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED #define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED CL_EXT_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED CL_EXT_PREFIX_DEPRECATED
#endif #endif
#if (defined (_WIN32) && defined(_MSC_VER)) #if (defined (_WIN32) && defined(_MSC_VER))
@ -271,16 +226,16 @@ typedef double cl_double;
/* scalar types */ /* scalar types */
typedef int8_t cl_char; typedef int8_t cl_char;
typedef uint8_t cl_uchar; typedef uint8_t cl_uchar;
typedef int16_t cl_short __attribute__((aligned(2))); typedef int16_t cl_short;
typedef uint16_t cl_ushort __attribute__((aligned(2))); typedef uint16_t cl_ushort;
typedef int32_t cl_int __attribute__((aligned(4))); typedef int32_t cl_int;
typedef uint32_t cl_uint __attribute__((aligned(4))); typedef uint32_t cl_uint;
typedef int64_t cl_long __attribute__((aligned(8))); typedef int64_t cl_long;
typedef uint64_t cl_ulong __attribute__((aligned(8))); typedef uint64_t cl_ulong;
typedef uint16_t cl_half __attribute__((aligned(2))); typedef uint16_t cl_half;
typedef float cl_float __attribute__((aligned(4))); typedef float cl_float;
typedef double cl_double __attribute__((aligned(8))); typedef double cl_double;
/* Macro names and corresponding values defined by OpenCL */ /* Macro names and corresponding values defined by OpenCL */
#define CL_CHAR_BIT 8 #define CL_CHAR_BIT 8
@ -401,13 +356,13 @@ typedef unsigned int cl_GLenum;
/* Define basic vector types */ /* Define basic vector types */
#if defined( __VEC__ ) #if defined( __VEC__ )
#include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
typedef vector unsigned char __cl_uchar16; typedef __vector unsigned char __cl_uchar16;
typedef vector signed char __cl_char16; typedef __vector signed char __cl_char16;
typedef vector unsigned short __cl_ushort8; typedef __vector unsigned short __cl_ushort8;
typedef vector signed short __cl_short8; typedef __vector signed short __cl_short8;
typedef vector unsigned int __cl_uint4; typedef __vector unsigned int __cl_uint4;
typedef vector signed int __cl_int4; typedef __vector signed int __cl_int4;
typedef vector float __cl_float4; typedef __vector float __cl_float4;
#define __CL_UCHAR16__ 1 #define __CL_UCHAR16__ 1
#define __CL_CHAR16__ 1 #define __CL_CHAR16__ 1
#define __CL_USHORT8__ 1 #define __CL_USHORT8__ 1

View File

@ -1,5 +1,5 @@
/********************************************************************************** /**********************************************************************************
* Copyright (c) 2008-2016 The Khronos Group Inc. * Copyright (c) 2008-2019 The Khronos Group Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the * copy of this software and/or associated documentation files (the
@ -27,7 +27,7 @@
**********************************************************************************/ **********************************************************************************/
/*****************************************************************************\ /*****************************************************************************\
Copyright (c) 2013-2016 Intel Corporation All Rights Reserved. Copyright (c) 2013-2019 Intel Corporation All Rights Reserved.
THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS THESE MATERIALS ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -98,71 +98,71 @@ typedef cl_uint cl_va_api_device_set_intel;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clGetDeviceIDsFromVA_APIMediaAdapterINTEL( clGetDeviceIDsFromVA_APIMediaAdapterINTEL(
cl_platform_id /* platform */, cl_platform_id platform,
cl_va_api_device_source_intel /* media_adapter_type */, cl_va_api_device_source_intel media_adapter_type,
void* /* media_adapter */, void* media_adapter,
cl_va_api_device_set_intel /* media_adapter_set */, cl_va_api_device_set_intel media_adapter_set,
cl_uint /* num_entries */, cl_uint num_entries,
cl_device_id* /* devices */, cl_device_id* devices,
cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_2; cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)(
cl_platform_id /* platform */, cl_platform_id platform,
cl_va_api_device_source_intel /* media_adapter_type */, cl_va_api_device_source_intel media_adapter_type,
void* /* media_adapter */, void* media_adapter,
cl_va_api_device_set_intel /* media_adapter_set */, cl_va_api_device_set_intel media_adapter_set,
cl_uint /* num_entries */, cl_uint num_entries,
cl_device_id* /* devices */, cl_device_id* devices,
cl_uint* /* num_devices */) CL_EXT_SUFFIX__VERSION_1_2; cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromVA_APIMediaSurfaceINTEL( clCreateFromVA_APIMediaSurfaceINTEL(
cl_context /* context */, cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
VASurfaceID* /* surface */, VASurfaceID* surface,
cl_uint /* plane */, cl_uint plane,
cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)( typedef CL_API_ENTRY cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)(
cl_context /* context */, cl_context context,
cl_mem_flags /* flags */, cl_mem_flags flags,
VASurfaceID* /* surface */, VASurfaceID* surface,
cl_uint /* plane */, cl_uint plane,
cl_int* /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireVA_APIMediaSurfacesINTEL( clEnqueueAcquireVA_APIMediaSurfacesINTEL(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem* /* mem_objects */, const cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem* /* mem_objects */, const cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_EXT_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseVA_APIMediaSurfacesINTEL( clEnqueueReleaseVA_APIMediaSurfacesINTEL(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem* /* mem_objects */, const cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_EXT_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)( typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)(
cl_command_queue /* command_queue */, cl_command_queue command_queue,
cl_uint /* num_objects */, cl_uint num_objects,
const cl_mem* /* mem_objects */, const cl_mem* mem_objects,
cl_uint /* num_events_in_wait_list */, cl_uint num_events_in_wait_list,
const cl_event* /* event_wait_list */, const cl_event* event_wait_list,
cl_event* /* event */) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_EXT_SUFFIX__VERSION_1_2;
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -65,6 +65,7 @@
## ##
- Binary Distribution: Removed 32 bit binary executables - Binary Distribution: Removed 32 bit binary executables
- Dependencies: Updated OpenCL-Headers to latest version from GitHub master repository
- Keep Guessing: No longer automatically activate --keep-guessing for modes 9720, 9820, 14900 and 18100 - Keep Guessing: No longer automatically activate --keep-guessing for modes 9720, 9820, 14900 and 18100
- Kernel Cache: Reactivate OpenCL runtime specific kernel caches - Kernel Cache: Reactivate OpenCL runtime specific kernel caches
- Kernel Compile: Removed -cl-std= from all kernel build options since we're compatible to all OpenCL versions - Kernel Compile: Removed -cl-std= from all kernel build options since we're compatible to all OpenCL versions

View File

@ -28,16 +28,16 @@ void ocl_close (hashcat_ctx_t *hashcat_ctx);
int hc_clBuildProgram (hashcat_ctx_t *hashcat_ctx, cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void (CL_CALLBACK *pfn_notify) (cl_program program, void *user_data), void *user_data); int hc_clBuildProgram (hashcat_ctx_t *hashcat_ctx, cl_program program, cl_uint num_devices, const cl_device_id *device_list, const char *options, void (CL_CALLBACK *pfn_notify) (cl_program program, void *user_data), void *user_data);
int hc_clCreateBuffer (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_mem_flags flags, size_t size, void *host_ptr, cl_mem *mem); int hc_clCreateBuffer (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_mem_flags flags, size_t size, void *host_ptr, cl_mem *mem);
int hc_clCreateCommandQueue (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_device_id device, cl_command_queue_properties properties, cl_command_queue *command_queue); int hc_clCreateCommandQueue (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_device_id device, cl_command_queue_properties properties, cl_command_queue *command_queue);
int hc_clCreateContext (hashcat_ctx_t *hashcat_ctx, cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (CL_CALLBACK *pfn_notify) (const char *, const void *, size_t, void *), void *user_data, cl_context *context); int hc_clCreateContext (hashcat_ctx_t *hashcat_ctx, const cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (CL_CALLBACK *pfn_notify) (const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_context *context);
int hc_clCreateKernel (hashcat_ctx_t *hashcat_ctx, cl_program program, const char *kernel_name, cl_kernel *kernel); int hc_clCreateKernel (hashcat_ctx_t *hashcat_ctx, cl_program program, const char *kernel_name, cl_kernel *kernel);
int hc_clCreateProgramWithBinary (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_uint num_devices, const cl_device_id *device_list, const size_t *lengths, unsigned char **binaries, cl_int *binary_status, cl_program *program); int hc_clCreateProgramWithBinary (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_uint num_devices, const cl_device_id *device_list, const size_t *lengths, const unsigned char **binaries, cl_int *binary_status, cl_program *program);
int hc_clCreateProgramWithSource (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_uint count, const char **strings, const size_t *lengths, cl_program *program); int hc_clCreateProgramWithSource (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_uint count, const char **strings, const size_t *lengths, cl_program *program);
int hc_clEnqueueCopyBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event); int hc_clEnqueueCopyBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t size, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event);
int hc_clEnqueueMapBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, cl_map_flags map_flags, size_t offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event, void **buf); int hc_clEnqueueMapBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, cl_map_flags map_flags, size_t offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event, void **buf);
int hc_clEnqueueNDRangeKernel (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event); int hc_clEnqueueNDRangeKernel (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_kernel kernel, cl_uint work_dim, const size_t *global_work_offset, const size_t *global_work_size, const size_t *local_work_size, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event);
int hc_clEnqueueReadBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t cb, void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event); int hc_clEnqueueReadBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event);
int hc_clEnqueueUnmapMemObject (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem memobj, void *mapped_ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event); int hc_clEnqueueUnmapMemObject (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem memobj, void *mapped_ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event);
int hc_clEnqueueWriteBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t cb, const void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event); int hc_clEnqueueWriteBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event);
int hc_clFinish (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue); int hc_clFinish (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue);
int hc_clFlush (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue); int hc_clFlush (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue);
int hc_clGetDeviceIDs (hashcat_ctx_t *hashcat_ctx, cl_platform_id platform, cl_device_type device_type, cl_uint num_entries, cl_device_id *devices, cl_uint *num_devices); int hc_clGetDeviceIDs (hashcat_ctx_t *hashcat_ctx, cl_platform_id platform, cl_device_type device_type, cl_uint num_entries, cl_device_id *devices, cl_uint *num_devices);

View File

@ -741,13 +741,13 @@ int hc_clSetKernelArg (hashcat_ctx_t *hashcat_ctx, cl_kernel kernel, cl_uint arg
return 0; return 0;
} }
int hc_clEnqueueWriteBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t cb, const void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) int hc_clEnqueueWriteBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event)
{ {
opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx; opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx;
OCL_PTR *ocl = opencl_ctx->ocl; OCL_PTR *ocl = opencl_ctx->ocl;
const cl_int CL_err = ocl->clEnqueueWriteBuffer (command_queue, buffer, blocking_write, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); const cl_int CL_err = ocl->clEnqueueWriteBuffer (command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event);
if (CL_err != CL_SUCCESS) if (CL_err != CL_SUCCESS)
{ {
@ -759,13 +759,13 @@ int hc_clEnqueueWriteBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue comman
return 0; return 0;
} }
int hc_clEnqueueCopyBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t cb, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) int hc_clEnqueueCopyBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t size, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event)
{ {
opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx; opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx;
OCL_PTR *ocl = opencl_ctx->ocl; OCL_PTR *ocl = opencl_ctx->ocl;
const cl_int CL_err = ocl->clEnqueueCopyBuffer (command_queue, src_buffer, dst_buffer, src_offset, dst_offset, cb, num_events_in_wait_list, event_wait_list, event); const cl_int CL_err = ocl->clEnqueueCopyBuffer (command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event);
if (CL_err != CL_SUCCESS) if (CL_err != CL_SUCCESS)
{ {
@ -777,13 +777,13 @@ int hc_clEnqueueCopyBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command
return 0; return 0;
} }
int hc_clEnqueueReadBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t cb, void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event) int hc_clEnqueueReadBuffer (hashcat_ctx_t *hashcat_ctx, cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void *ptr, cl_uint num_events_in_wait_list, const cl_event *event_wait_list, cl_event *event)
{ {
opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx; opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx;
OCL_PTR *ocl = opencl_ctx->ocl; OCL_PTR *ocl = opencl_ctx->ocl;
const cl_int CL_err = ocl->clEnqueueReadBuffer (command_queue, buffer, blocking_read, offset, cb, ptr, num_events_in_wait_list, event_wait_list, event); const cl_int CL_err = ocl->clEnqueueReadBuffer (command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event);
if (CL_err != CL_SUCCESS) if (CL_err != CL_SUCCESS)
{ {
@ -867,7 +867,7 @@ int hc_clGetDeviceInfo (hashcat_ctx_t *hashcat_ctx, cl_device_id device, cl_devi
return 0; return 0;
} }
int hc_clCreateContext (hashcat_ctx_t *hashcat_ctx, cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (CL_CALLBACK *pfn_notify) (const char *, const void *, size_t, void *), void *user_data, cl_context *context) int hc_clCreateContext (hashcat_ctx_t *hashcat_ctx, const cl_context_properties *properties, cl_uint num_devices, const cl_device_id *devices, void (CL_CALLBACK *pfn_notify) (const char *errinfo, const void *private_info, size_t cb, void *user_data), void *user_data, cl_context *context)
{ {
opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx; opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx;
@ -947,7 +947,7 @@ int hc_clCreateProgramWithSource (hashcat_ctx_t *hashcat_ctx, cl_context context
return 0; return 0;
} }
int hc_clCreateProgramWithBinary (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_uint num_devices, const cl_device_id *device_list, const size_t *lengths, unsigned char **binaries, cl_int *binary_status, cl_program *program) int hc_clCreateProgramWithBinary (hashcat_ctx_t *hashcat_ctx, cl_context context, cl_uint num_devices, const cl_device_id *device_list, const size_t *lengths, const unsigned char **binaries, cl_int *binary_status, cl_program *program)
{ {
opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx; opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx;
@ -5181,7 +5181,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
if (rc_read_kernel == false) return -1; if (rc_read_kernel == false) return -1;
CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->device, kernel_lengths, (unsigned char **) kernel_sources, NULL, &device_param->program); CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->device, kernel_lengths, (const unsigned char **) kernel_sources, NULL, &device_param->program);
if (CL_rc == -1) return -1; if (CL_rc == -1) return -1;
@ -5333,7 +5333,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
if (rc_read_kernel == false) return -1; if (rc_read_kernel == false) return -1;
CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->device, kernel_lengths, (unsigned char **) kernel_sources, NULL, &device_param->program_mp); CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->device, kernel_lengths, (const unsigned char **) kernel_sources, NULL, &device_param->program_mp);
if (CL_rc == -1) return -1; if (CL_rc == -1) return -1;
@ -5488,7 +5488,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
if (rc_read_kernel == false) return -1; if (rc_read_kernel == false) return -1;
CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->device, kernel_lengths, (unsigned char **) kernel_sources, NULL, &device_param->program_amp); CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->device, kernel_lengths, (const unsigned char **) kernel_sources, NULL, &device_param->program_amp);
if (CL_rc == -1) return -1; if (CL_rc == -1) return -1;