Skip to content

Commit

Permalink
Pull upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@SunSerega
SunSerega committed Feb 8, 2024
1 parent e1b884a commit 8f4efbf
Show file tree
Hide file tree
Showing 14 changed files with 148 additions and 13 deletions.
2 changes: 1 addition & 1 deletion DataScraping/Reps/OpenCL-Docs
Submodule OpenCL-Docs updated from 2a783c to 387458
Binary file modified DataScraping/XML/OpenCL/funcs.bin
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions LastPack.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ ScrapXML[OpenCL]: Parsing "cl"
ScrapXML[OpenCL]: Constructing named items
ScrapXML[OpenCL]: Saving as binary
ScrapXML[OpenCL]: VendorSuffix: Saved 11 items
ScrapXML[OpenCL]: Enum: Saved 1125 items
ScrapXML[OpenCL]: Enum: Saved 1126 items
ScrapXML[OpenCL]: BasicType: Saved 30 items
ScrapXML[OpenCL]: Group: Saved 119 items
ScrapXML[OpenCL]: IdClass: Saved 18 items
ScrapXML[OpenCL]: Struct: Saved 16 items
ScrapXML[OpenCL]: Delegate: Saved 8 items
ScrapXML[OpenCL]: Func: Saved 240 items
ScrapXML[OpenCL]: Func: Saved 241 items
ScrapXML[OpenCL]: Feature: Saved 7 items
ScrapXML[OpenCL]: Extension: Saved 104 items
ScrapXML[OpenCL]: Extension: Saved 105 items
ScrapXML[OpenCL]: Done
Finished runing ScrapXML[OpenCL]
Compiling "DataScraping/XML/OpenGL/ScrapXML.pas"
Expand Down Expand Up @@ -253,9 +253,9 @@ Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Group: Pac
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: IdClass: Packed 28 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Struct: Packed 17 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Delegate: Packed 7 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Func: Packed 240 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Func: Packed 241 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Feature: Packed 1 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Extension: Packed 104 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Extension: Packed 105 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Cleanup
Template[OpenCL]: Finished runing TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]
Finished runing Template[OpenCL]
Expand Down
4 changes: 2 additions & 2 deletions Log/OpenCL.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Group: Pac
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: IdClass: Packed 28 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Struct: Packed 17 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Delegate: Packed 7 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Func: Packed 240 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Func: Packed 241 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Feature: Packed 1 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Extension: Packed 104 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Extension: Packed 105 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Cleanup
Template[OpenCL]: Finished runing TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]
Finished runing Template[OpenCL]
Expand Down
6 changes: 3 additions & 3 deletions Log/PullUpstream.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ ScrapXML[OpenCL]: Parsing "cl"
ScrapXML[OpenCL]: Constructing named items
ScrapXML[OpenCL]: Saving as binary
ScrapXML[OpenCL]: VendorSuffix: Saved 11 items
ScrapXML[OpenCL]: Enum: Saved 1125 items
ScrapXML[OpenCL]: Enum: Saved 1126 items
ScrapXML[OpenCL]: BasicType: Saved 30 items
ScrapXML[OpenCL]: Group: Saved 119 items
ScrapXML[OpenCL]: IdClass: Saved 18 items
ScrapXML[OpenCL]: Struct: Saved 16 items
ScrapXML[OpenCL]: Delegate: Saved 8 items
ScrapXML[OpenCL]: Func: Saved 240 items
ScrapXML[OpenCL]: Func: Saved 241 items
ScrapXML[OpenCL]: Feature: Saved 7 items
ScrapXML[OpenCL]: Extension: Saved 104 items
ScrapXML[OpenCL]: Extension: Saved 105 items
ScrapXML[OpenCL]: Done
Finished runing ScrapXML[OpenCL]
Runing ScrapXML[OpenGL]
Expand Down
39 changes: 39 additions & 0 deletions Modules.Packed/OpenCL.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2972,6 +2972,7 @@ clErrorCode = record
public static property VA_API_MEDIA_SURFACE_NOT_ACQUIRED: clErrorCode read new clErrorCode(-1101);
public static property COMMAND_TERMINATED_ITSELF_WITH_FAILURE: clErrorCode read new clErrorCode(-1108);
public static property CONTEXT_TERMINATED: clErrorCode read new clErrorCode(-1121);
public static property CANCELLED: clErrorCode read new clErrorCode(-1126);
public static property INVALID_COMMAND_BUFFER: clErrorCode read new clErrorCode(-1138);
public static property INVALID_SYNC_POINT_WAIT_LIST: clErrorCode read new clErrorCode(-1139);
public static property INCOMPATIBLE_COMMAND_QUEUE: clErrorCode read new clErrorCode(-1140);
Expand Down Expand Up @@ -3167,6 +3168,8 @@ clErrorCode = record
Result := 'COMMAND_TERMINATED_ITSELF_WITH_FAILURE' else
if CONTEXT_TERMINATED = self then
Result := 'CONTEXT_TERMINATED' else
if CANCELLED = self then
Result := 'CANCELLED' else
if INVALID_COMMAND_BUFFER = self then
Result := 'INVALID_COMMAND_BUFFER' else
if INVALID_SYNC_POINT_WAIT_LIST = self then
Expand Down Expand Up @@ -14550,6 +14553,38 @@ cl_queue_family_properties = record
public const ExtensionString = 'cl_img_cached_allocations';
end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
[PCUNotRestore]
///
clCancelCommandIMG = sealed partial class
public constructor(pl: cl_platform_id);
private constructor := raise new System.NotSupportedException;
public static PlatformLess := new clCancelCommandIMG(default(cl_platform_id));
private function GetProcAddress(name: string): IntPtr;
private static function GetProcOrNil<T>(fadr: IntPtr) :=
fadr=IntPtr.Zero ? default(T) :
Marshal.GetDelegateForFunctionPointer&<T>(fadr);
public const ExtensionString = 'cl_img_cancel_command';

public CancelCommandsIMG_adr := GetProcAddress('clCancelCommandsIMG');
private ntv_CancelCommandsIMG_1 := GetProcOrNil&<function(var event_list: cl_event; num_events_in_list: UIntPtr): clErrorCode>(CancelCommandsIMG_adr);
private ntv_CancelCommandsIMG_2 := GetProcOrNil&<function(event_list: IntPtr; num_events_in_list: UIntPtr): clErrorCode>(CancelCommandsIMG_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(event_list: array of cl_event; num_events_in_list: UIntPtr): clErrorCode;
type PCl_event = ^cl_event;
begin
Result := if (event_list<>nil) and (event_list.Length<>0) then
ntv_CancelCommandsIMG_1(event_list[0], num_events_in_list) else
ntv_CancelCommandsIMG_1(PCl_event(nil)^, num_events_in_list);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(var event_list: cl_event; num_events_in_list: UIntPtr): clErrorCode :=
ntv_CancelCommandsIMG_1(event_list, num_events_in_list);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(event_list: IntPtr; num_events_in_list: UIntPtr): clErrorCode :=
ntv_CancelCommandsIMG_2(event_list, num_events_in_list);

end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
Expand Down Expand Up @@ -19776,6 +19811,10 @@ function clImageRequirementsInfoEXT.GetProcAddress(name: string) := pl.GetProcAd
constructor clMigrateMemobjectEXT.Create(pl: cl_platform_id) := inherited Create(pl);
function clMigrateMemobjectEXT.GetProcAddress(name: string) := pl.GetProcAddress(name);

type clCancelCommandIMG = sealed partial class(cl_extension_base) end;
constructor clCancelCommandIMG.Create(pl: cl_platform_id) := inherited Create(pl);
function clCancelCommandIMG.GetProcAddress(name: string) := pl.GetProcAddress(name);

type clGenerateMipmapIMG = sealed partial class(cl_extension_base) end;
constructor clGenerateMipmapIMG.Create(pl: cl_platform_id) := inherited Create(pl);
function clGenerateMipmapIMG.GetProcAddress(name: string) := pl.GetProcAddress(name);
Expand Down
39 changes: 39 additions & 0 deletions Packing/Descriptions/OpenCL.predoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2972,6 +2972,7 @@ type
public static property VA_API_MEDIA_SURFACE_NOT_ACQUIRED: clErrorCode read new clErrorCode(-1101);
public static property COMMAND_TERMINATED_ITSELF_WITH_FAILURE: clErrorCode read new clErrorCode(-1108);
public static property CONTEXT_TERMINATED: clErrorCode read new clErrorCode(-1121);
public static property CANCELLED: clErrorCode read new clErrorCode(-1126);
public static property INVALID_COMMAND_BUFFER: clErrorCode read new clErrorCode(-1138);
public static property INVALID_SYNC_POINT_WAIT_LIST: clErrorCode read new clErrorCode(-1139);
public static property INCOMPATIBLE_COMMAND_QUEUE: clErrorCode read new clErrorCode(-1140);
Expand Down Expand Up @@ -3167,6 +3168,8 @@ type
Result := 'COMMAND_TERMINATED_ITSELF_WITH_FAILURE' else
if CONTEXT_TERMINATED = self then
Result := 'CONTEXT_TERMINATED' else
if CANCELLED = self then
Result := 'CANCELLED' else
if INVALID_COMMAND_BUFFER = self then
Result := 'INVALID_COMMAND_BUFFER' else
if INVALID_SYNC_POINT_WAIT_LIST = self then
Expand Down Expand Up @@ -14546,6 +14549,38 @@ type
public const ExtensionString = 'cl_img_cached_allocations';
end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
[PCUNotRestore]
///
clCancelCommandIMG = sealed partial class
public constructor(pl: cl_platform_id);
private constructor := raise new System.NotSupportedException;
public static PlatformLess := new clCancelCommandIMG(default(cl_platform_id));
private function GetProcAddress(name: string): IntPtr;
private static function GetProcOrNil<T>(fadr: IntPtr) :=
fadr=IntPtr.Zero ? default(T) :
Marshal.GetDelegateForFunctionPointer&<T>(fadr);
public const ExtensionString = 'cl_img_cancel_command';

public CancelCommandsIMG_adr := GetProcAddress('clCancelCommandsIMG');
private ntv_CancelCommandsIMG_1 := GetProcOrNil&<function(var event_list: cl_event; num_events_in_list: UIntPtr): clErrorCode>(CancelCommandsIMG_adr);
private ntv_CancelCommandsIMG_2 := GetProcOrNil&<function(event_list: IntPtr; num_events_in_list: UIntPtr): clErrorCode>(CancelCommandsIMG_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(event_list: array of cl_event; num_events_in_list: UIntPtr): clErrorCode;
type PCl_event = ^cl_event;
begin
Result := if (event_list<>nil) and (event_list.Length<>0) then
ntv_CancelCommandsIMG_1(event_list[0], num_events_in_list) else
ntv_CancelCommandsIMG_1(PCl_event(nil)^, num_events_in_list);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(var event_list: cl_event; num_events_in_list: UIntPtr): clErrorCode :=
ntv_CancelCommandsIMG_1(event_list, num_events_in_list);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(event_list: IntPtr; num_events_in_list: UIntPtr): clErrorCode :=
ntv_CancelCommandsIMG_2(event_list, num_events_in_list);

end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
Expand Down Expand Up @@ -19772,6 +19807,10 @@ type clMigrateMemobjectEXT = sealed partial class(cl_extension_base) end;
constructor clMigrateMemobjectEXT.Create(pl: cl_platform_id) := inherited Create(pl);
function clMigrateMemobjectEXT.GetProcAddress(name: string) := pl.GetProcAddress(name);

type clCancelCommandIMG = sealed partial class(cl_extension_base) end;
constructor clCancelCommandIMG.Create(pl: cl_platform_id) := inherited Create(pl);
function clCancelCommandIMG.GetProcAddress(name: string) := pl.GetProcAddress(name);

type clGenerateMipmapIMG = sealed partial class(cl_extension_base) end;
constructor clGenerateMipmapIMG.Create(pl: cl_platform_id) := inherited Create(pl);
function clGenerateMipmapIMG.GetProcAddress(name: string) := pl.GetProcAddress(name);
Expand Down
4 changes: 4 additions & 0 deletions Packing/Template/LowLvl/OpenCL/Extension.Implementation.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ type clMigrateMemobjectEXT = sealed partial class(cl_extension_base) end;
constructor clMigrateMemobjectEXT.Create(pl: cl_platform_id) := inherited Create(pl);
function clMigrateMemobjectEXT.GetProcAddress(name: string) := pl.GetProcAddress(name);

type clCancelCommandIMG = sealed partial class(cl_extension_base) end;
constructor clCancelCommandIMG.Create(pl: cl_platform_id) := inherited Create(pl);
function clCancelCommandIMG.GetProcAddress(name: string) := pl.GetProcAddress(name);

type clGenerateMipmapIMG = sealed partial class(cl_extension_base) end;
constructor clGenerateMipmapIMG.Create(pl: cl_platform_id) := inherited Create(pl);
function clGenerateMipmapIMG.GetProcAddress(name: string) := pl.GetProcAddress(name);
Expand Down
32 changes: 32 additions & 0 deletions Packing/Template/LowLvl/OpenCL/Extension.Interface.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,38 @@
public const ExtensionString = 'cl_img_cached_allocations';
end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
[PCUNotRestore]
///
clCancelCommandIMG = sealed partial class
public constructor(pl: cl_platform_id);
private constructor := raise new System.NotSupportedException;
public static PlatformLess := new clCancelCommandIMG(default(cl_platform_id));
private function GetProcAddress(name: string): IntPtr;
private static function GetProcOrNil<T>(fadr: IntPtr) :=
fadr=IntPtr.Zero ? default(T) :
Marshal.GetDelegateForFunctionPointer&<T>(fadr);
public const ExtensionString = 'cl_img_cancel_command';

public CancelCommandsIMG_adr := GetProcAddress('clCancelCommandsIMG');
private ntv_CancelCommandsIMG_1 := GetProcOrNil&<function(var event_list: cl_event; num_events_in_list: UIntPtr): clErrorCode>(CancelCommandsIMG_adr);
private ntv_CancelCommandsIMG_2 := GetProcOrNil&<function(event_list: IntPtr; num_events_in_list: UIntPtr): clErrorCode>(CancelCommandsIMG_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(event_list: array of cl_event; num_events_in_list: UIntPtr): clErrorCode;
type PCl_event = ^cl_event;
begin
Result := if (event_list<>nil) and (event_list.Length<>0) then
ntv_CancelCommandsIMG_1(event_list[0], num_events_in_list) else
ntv_CancelCommandsIMG_1(PCl_event(nil)^, num_events_in_list);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(var event_list: cl_event; num_events_in_list: UIntPtr): clErrorCode :=
ntv_CancelCommandsIMG_1(event_list, num_events_in_list);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] function CancelCommandsIMG(event_list: IntPtr; num_events_in_list: UIntPtr): clErrorCode :=
ntv_CancelCommandsIMG_2(event_list, num_events_in_list);

end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
Expand Down
4 changes: 4 additions & 0 deletions Packing/Template/LowLvl/OpenCL/Log/All Extension's.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@
Enum [cl::MEM_USE_UNCACHED_CPU_MEMORY]
Enum [cl::MEM_USE_CACHED_CPU_MEMORY]

# clCancelCommandIMG (cl_img_cancel_command)
Enum [cl::CANCELLED]
Func [cl::CancelCommands + IMG]

# clGenerateMipmapIMG (cl_img_generate_mipmap)
Enum [cl::MIPMAP_FILTER_ANY]
Enum [cl::MIPMAP_FILTER_BOX]
Expand Down
13 changes: 13 additions & 0 deletions Packing/Template/LowLvl/OpenCL/Log/All Func's.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3019,6 +3019,19 @@ device: cl_device_id
----------- | ------------ |
| device |

# cl::CancelCommands + IMG
!ppt
Result: clErrorCode
event_list: array of cl_event const / var cl_event const / IntPtr const
num_events_in_list: UIntPtr
!ffo
3
clErrorCode | array of cl_event const | UIntPtr |
clErrorCode | var cl_event const | UIntPtr |
clErrorCode | IntPtr const | UIntPtr |
----------- | ----------------------- | ------------------ |
| event_list | num_events_in_list |

# cl::EnqueueAcquireGrallocObjects + IMG
!ppt
Result: clErrorCode
Expand Down
1 change: 1 addition & 0 deletions Packing/Template/LowLvl/OpenCL/Log/All Group's.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,7 @@
VA_API_MEDIA_SURFACE_NOT_ACQUIRED[-1101]
COMMAND_TERMINATED_ITSELF_WITH_FAILURE[-1108]
CONTEXT_TERMINATED[-1121]
CANCELLED[-1126]
INVALID_COMMAND_BUFFER[-1138]
INVALID_SYNC_POINT_WAIT_LIST[-1139]
INCOMPATIBLE_COMMAND_QUEUE[-1140]
Expand Down
4 changes: 2 additions & 2 deletions Packing/Template/LowLvl/OpenCL/Log/Essentials.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Group: Packed 112 items
IdClass: Packed 28 items
Struct: Packed 17 items
Delegate: Packed 7 items
Func: Packed 240 items
Func: Packed 241 items
Feature: Packed 1 items
Extension: Packed 104 items
Extension: Packed 105 items
Cleanup
3 changes: 3 additions & 0 deletions Packing/Template/LowLvl/OpenCL/Types.Interface.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2938,6 +2938,7 @@
public static property VA_API_MEDIA_SURFACE_NOT_ACQUIRED: clErrorCode read new clErrorCode(-1101);
public static property COMMAND_TERMINATED_ITSELF_WITH_FAILURE: clErrorCode read new clErrorCode(-1108);
public static property CONTEXT_TERMINATED: clErrorCode read new clErrorCode(-1121);
public static property CANCELLED: clErrorCode read new clErrorCode(-1126);
public static property INVALID_COMMAND_BUFFER: clErrorCode read new clErrorCode(-1138);
public static property INVALID_SYNC_POINT_WAIT_LIST: clErrorCode read new clErrorCode(-1139);
public static property INCOMPATIBLE_COMMAND_QUEUE: clErrorCode read new clErrorCode(-1140);
Expand Down Expand Up @@ -3133,6 +3134,8 @@
Result := 'COMMAND_TERMINATED_ITSELF_WITH_FAILURE' else
if CONTEXT_TERMINATED = self then
Result := 'CONTEXT_TERMINATED' else
if CANCELLED = self then
Result := 'CANCELLED' else
if INVALID_COMMAND_BUFFER = self then
Result := 'INVALID_COMMAND_BUFFER' else
if INVALID_SYNC_POINT_WAIT_LIST = self then
Expand Down

0 comments on commit 8f4efbf

Please sign in to comment.