Skip to content

Commit

Permalink
Pull upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@SunSerega
SunSerega committed Sep 3, 2024
1 parent 9c11288 commit 836c560
Show file tree
Hide file tree
Showing 12 changed files with 94 additions and 38 deletions.
2 changes: 1 addition & 1 deletion DataScraping/Reps/OpenCL-Docs
Submodule OpenCL-Docs updated from bfd9a6 to a12464
Binary file modified DataScraping/XML/OpenCL/funcs.bin
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions LastPack.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,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 1127 items
ScrapXML[OpenCL]: Enum: Saved 1130 items
ScrapXML[OpenCL]: BasicType: Saved 30 items
ScrapXML[OpenCL]: Group: Saved 121 items
ScrapXML[OpenCL]: IdClass: Saved 18 items
ScrapXML[OpenCL]: Struct: Saved 15 items
ScrapXML[OpenCL]: Delegate: Saved 8 items
ScrapXML[OpenCL]: Func: Saved 241 items
ScrapXML[OpenCL]: Feature: Saved 7 items
ScrapXML[OpenCL]: Extension: Saved 132 items
ScrapXML[OpenCL]: Extension: Saved 133 items
ScrapXML[OpenCL]: Done
Finished runing ScrapXML[OpenCL]
Compiling "DataScraping/XML/OpenGL/ScrapXML.pas"
Expand Down Expand Up @@ -247,7 +247,7 @@ Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Struct: Pa
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Delegate: Packed 7 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 132 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Extension: Packed 133 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
2 changes: 1 addition & 1 deletion Log/OpenCL.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Struct: Pa
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Delegate: Packed 7 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 132 items
Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Extension: Packed 133 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/PullUpstream.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,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 1127 items
ScrapXML[OpenCL]: Enum: Saved 1130 items
ScrapXML[OpenCL]: BasicType: Saved 30 items
ScrapXML[OpenCL]: Group: Saved 121 items
ScrapXML[OpenCL]: IdClass: Saved 18 items
ScrapXML[OpenCL]: Struct: Saved 15 items
ScrapXML[OpenCL]: Delegate: Saved 8 items
ScrapXML[OpenCL]: Func: Saved 241 items
ScrapXML[OpenCL]: Feature: Saved 7 items
ScrapXML[OpenCL]: Extension: Saved 132 items
ScrapXML[OpenCL]: Extension: Saved 133 items
ScrapXML[OpenCL]: Done
Finished runing ScrapXML[OpenCL]
Runing ScrapXML[OpenGL]
Expand Down
36 changes: 26 additions & 10 deletions Modules.Packed/OpenCL.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ clChannelType = record
public static property UNORM_INT_101010_2: clChannelType read new clChannelType($10E0);
public static property UNSIGNED_INT_RAW10: clChannelType read new clChannelType($10E3);
public static property UNSIGNED_INT_RAW12: clChannelType read new clChannelType($10E4);
public static property UNORM_INT_2_101010: clChannelType read new clChannelType($10E5);

public function ToString: string; override;
begin
Expand Down Expand Up @@ -347,6 +348,8 @@ clChannelType = record
Result := 'UNSIGNED_INT_RAW10' else
if UNSIGNED_INT_RAW12 = self then
Result := 'UNSIGNED_INT_RAW12' else
if UNORM_INT_2_101010 = self then
Result := 'UNORM_INT_2_101010' else
Result := $'clChannelType[{self.val}]';
end;

Expand Down Expand Up @@ -3341,10 +3344,11 @@ clExternalMemoryHandleType = record
public val: UInt32;
public constructor(val: UInt32) := self.val := val;

public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_FD: clExternalMemoryHandleType read new clExternalMemoryHandleType($2060);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32: clExternalMemoryHandleType read new clExternalMemoryHandleType($2061);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT: clExternalMemoryHandleType read new clExternalMemoryHandleType($2062);
public static property EXTERNAL_MEMORY_HANDLE_DMA_BUF: clExternalMemoryHandleType read new clExternalMemoryHandleType($2067);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_FD: clExternalMemoryHandleType read new clExternalMemoryHandleType($2060);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32: clExternalMemoryHandleType read new clExternalMemoryHandleType($2061);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT: clExternalMemoryHandleType read new clExternalMemoryHandleType($2062);
public static property EXTERNAL_MEMORY_HANDLE_DMA_BUF: clExternalMemoryHandleType read new clExternalMemoryHandleType($2067);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME: clExternalMemoryHandleType read new clExternalMemoryHandleType($2069);

public function ToString: string; override;
begin
Expand All @@ -3356,6 +3360,8 @@ clExternalMemoryHandleType = record
Result := 'EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT' else
if EXTERNAL_MEMORY_HANDLE_DMA_BUF = self then
Result := 'EXTERNAL_MEMORY_HANDLE_DMA_BUF' else
if EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME = self then
Result := 'EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME' else
Result := $'clExternalMemoryHandleType[{self.val}]';
end;

Expand All @@ -3366,10 +3372,11 @@ clExternalSemaphoreHandleType = record
public val: UInt32;
public constructor(val: UInt32) := self.val := val;

public static property SEMAPHORE_HANDLE_OPAQUE_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2055);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2056);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2057);
public static property SEMAPHORE_HANDLE_SYNC_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2058);
public static property SEMAPHORE_HANDLE_OPAQUE_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2055);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2056);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2057);
public static property SEMAPHORE_HANDLE_SYNC_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2058);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2068);

public function ToString: string; override;
begin
Expand All @@ -3381,6 +3388,8 @@ clExternalSemaphoreHandleType = record
Result := 'SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT' else
if SEMAPHORE_HANDLE_SYNC_FD = self then
Result := 'SEMAPHORE_HANDLE_SYNC_FD' else
if SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME = self then
Result := 'SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME' else
Result := $'clExternalSemaphoreHandleType[{self.val}]';
end;

Expand Down Expand Up @@ -14586,6 +14595,13 @@ cl_queue_family_properties = record
public const ExtensionString = 'cl_ext_image_raw10_raw12';
end;

/// id: cl_ext_image_unorm_int_2_101010
/// version: 1.0.0
/// core dependency: cl 1.2
clImageUnormInt2101010EXT = static class
public const ExtensionString = 'cl_ext_image_unorm_int_2_101010';
end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
Expand Down Expand Up @@ -18580,7 +18596,7 @@ cl_queue_family_properties = record
end;

/// id: cl_khr_external_memory_win32
/// version: 1.0.0
/// version: 1.1.0
/// core dependency: cl 3.0
/// ext dependencies:
/// - cl_khr_external_memory (clExternalMemoryKHR)
Expand Down Expand Up @@ -19149,7 +19165,7 @@ cl_queue_family_properties = record
end;

/// id: cl_khr_external_semaphore_win32
/// version: 0.9.0 (provisional)
/// version: 0.9.1 (provisional)
/// core dependency: cl 1.2
/// ext dependencies:
/// - cl_khr_external_semaphore (clExternalSemaphoreKHR)
Expand Down
36 changes: 26 additions & 10 deletions Packing/Descriptions/OpenCL.predoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ type
public static property UNORM_INT_101010_2: clChannelType read new clChannelType($10E0);
public static property UNSIGNED_INT_RAW10: clChannelType read new clChannelType($10E3);
public static property UNSIGNED_INT_RAW12: clChannelType read new clChannelType($10E4);
public static property UNORM_INT_2_101010: clChannelType read new clChannelType($10E5);

public function ToString: string; override;
begin
Expand Down Expand Up @@ -339,6 +340,8 @@ type
Result := 'UNSIGNED_INT_RAW10' else
if UNSIGNED_INT_RAW12 = self then
Result := 'UNSIGNED_INT_RAW12' else
if UNORM_INT_2_101010 = self then
Result := 'UNORM_INT_2_101010' else
Result := $'clChannelType[{self.val}]';
end;

Expand Down Expand Up @@ -3333,10 +3336,11 @@ type
public val: UInt32;
public constructor(val: UInt32) := self.val := val;

public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_FD: clExternalMemoryHandleType read new clExternalMemoryHandleType($2060);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32: clExternalMemoryHandleType read new clExternalMemoryHandleType($2061);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT: clExternalMemoryHandleType read new clExternalMemoryHandleType($2062);
public static property EXTERNAL_MEMORY_HANDLE_DMA_BUF: clExternalMemoryHandleType read new clExternalMemoryHandleType($2067);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_FD: clExternalMemoryHandleType read new clExternalMemoryHandleType($2060);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32: clExternalMemoryHandleType read new clExternalMemoryHandleType($2061);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT: clExternalMemoryHandleType read new clExternalMemoryHandleType($2062);
public static property EXTERNAL_MEMORY_HANDLE_DMA_BUF: clExternalMemoryHandleType read new clExternalMemoryHandleType($2067);
public static property EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME: clExternalMemoryHandleType read new clExternalMemoryHandleType($2069);

public function ToString: string; override;
begin
Expand All @@ -3348,6 +3352,8 @@ type
Result := 'EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT' else
if EXTERNAL_MEMORY_HANDLE_DMA_BUF = self then
Result := 'EXTERNAL_MEMORY_HANDLE_DMA_BUF' else
if EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME = self then
Result := 'EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME' else
Result := $'clExternalMemoryHandleType[{self.val}]';
end;

Expand All @@ -3358,10 +3364,11 @@ type
public val: UInt32;
public constructor(val: UInt32) := self.val := val;

public static property SEMAPHORE_HANDLE_OPAQUE_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2055);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2056);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2057);
public static property SEMAPHORE_HANDLE_SYNC_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2058);
public static property SEMAPHORE_HANDLE_OPAQUE_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2055);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2056);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2057);
public static property SEMAPHORE_HANDLE_SYNC_FD: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2058);
public static property SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME: clExternalSemaphoreHandleType read new clExternalSemaphoreHandleType($2068);

public function ToString: string; override;
begin
Expand All @@ -3373,6 +3380,8 @@ type
Result := 'SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT' else
if SEMAPHORE_HANDLE_SYNC_FD = self then
Result := 'SEMAPHORE_HANDLE_SYNC_FD' else
if SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME = self then
Result := 'SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME' else
Result := $'clExternalSemaphoreHandleType[{self.val}]';
end;

Expand Down Expand Up @@ -14574,6 +14583,13 @@ type
public const ExtensionString = 'cl_ext_image_raw10_raw12';
end;

/// id: cl_ext_image_unorm_int_2_101010
/// version: 1.0.0
/// core dependency: cl 1.2
clImageUnormInt2101010EXT = static class
public const ExtensionString = 'cl_ext_image_unorm_int_2_101010';
end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
Expand Down Expand Up @@ -18568,7 +18584,7 @@ type
end;

/// id: cl_khr_external_memory_win32
/// version: 1.0.0
/// version: 1.1.0
/// core dependency: cl 3.0
/// ext dependencies:
/// - cl_khr_external_memory (clExternalMemoryKHR)
Expand Down Expand Up @@ -19137,7 +19153,7 @@ type
end;

/// id: cl_khr_external_semaphore_win32
/// version: 0.9.0 (provisional)
/// version: 0.9.1 (provisional)
/// core dependency: cl 1.2
/// ext dependencies:
/// - cl_khr_external_semaphore (clExternalSemaphoreKHR)
Expand Down
11 changes: 9 additions & 2 deletions Packing/Template/LowLvl/OpenCL/Extension.Interface.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,13 @@
public const ExtensionString = 'cl_ext_image_raw10_raw12';
end;

/// id: cl_ext_image_unorm_int_2_101010
/// version: 1.0.0
/// core dependency: cl 1.2
clImageUnormInt2101010EXT = static class
public const ExtensionString = 'cl_ext_image_unorm_int_2_101010';
end;

{$ifndef DEBUG}
[System.Security.SuppressUnmanagedCodeSecurity]
{$endif DEBUG}
Expand Down Expand Up @@ -4924,7 +4931,7 @@
end;

/// id: cl_khr_external_memory_win32
/// version: 1.0.0
/// version: 1.1.0
/// core dependency: cl 3.0
/// ext dependencies:
/// - cl_khr_external_memory (clExternalMemoryKHR)
Expand Down Expand Up @@ -5493,7 +5500,7 @@
end;

/// id: cl_khr_external_semaphore_win32
/// version: 0.9.0 (provisional)
/// version: 0.9.1 (provisional)
/// core dependency: cl 1.2
/// ext dependencies:
/// - cl_khr_external_semaphore (clExternalSemaphoreKHR)
Expand Down
5 changes: 5 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 @@ -188,6 +188,9 @@
Enum [cl::IMAGE_REQUIREMENTS_MAX_ARRAY_SIZE]
Func [cl::GetImageRequirementsInfo + EXT]

# clImageUnormInt2101010EXT (cl_ext_image_unorm_int_2_101010)
Enum [cl::UNORM_INT_2_101010]

# clMigrateMemobjectEXT (cl_ext_migrate_memobject)
Enum [cl::MIGRATE_MEM_OBJECT_HOST]
Enum [cl::COMMAND_MIGRATE_MEM_OBJECT]
Expand Down Expand Up @@ -825,6 +828,7 @@
# clExternalMemoryWin32KHR (cl_khr_external_memory_win32)
Enum [cl::EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32]
Enum [cl::EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT]
Enum [cl::EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME]

# clExternalSemaphoreKHR (cl_khr_external_semaphore)
Enum [cl::SEMAPHORE_EXPORT_HANDLE_TYPES_LIST_END]
Expand All @@ -846,6 +850,7 @@
# clExternalSemaphoreWin32KHR (cl_khr_external_semaphore_win32)
Enum [cl::SEMAPHORE_HANDLE_OPAQUE_WIN32]
Enum [cl::SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT]
Enum [cl::SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME]

# clFp16KHR (cl_khr_fp16)
Enum [cl::DEVICE_HALF_FP_CONFIG]
Expand Down
3 changes: 3 additions & 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 @@ -93,6 +93,7 @@
UNORM_INT_101010_2[$10E0]
UNSIGNED_INT_RAW10[$10E3]
UNSIGNED_INT_RAW12[$10E4]
UNORM_INT_2_101010[$10E5]

# clCommandBufferFlags (cl::CommandBufferFlags) : UInt64 (Bitfield)
COMMAND_BUFFER_SIMULTANEOUS_USE[1 shl 0]
Expand Down Expand Up @@ -767,12 +768,14 @@
EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32[$2061]
EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT[$2062]
EXTERNAL_MEMORY_HANDLE_DMA_BUF[$2067]
EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_NAME[$2069]

# clExternalSemaphoreHandleType (cl::ExternalSemaphoreHandleType) : UInt32
SEMAPHORE_HANDLE_OPAQUE_FD[$2055]
SEMAPHORE_HANDLE_OPAQUE_WIN32[$2056]
SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT[$2057]
SEMAPHORE_HANDLE_SYNC_FD[$2058]
SEMAPHORE_HANDLE_OPAQUE_WIN32_NAME[$2068]

# clFilterMode (cl::FilterMode) : UInt32
FILTER_NEAREST[$1140]
Expand Down
2 changes: 1 addition & 1 deletion Packing/Template/LowLvl/OpenCL/Log/Essentials.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,5 @@ Struct: Packed 16 items
Delegate: Packed 7 items
Func: Packed 241 items
Feature: Packed 1 items
Extension: Packed 132 items
Extension: Packed 133 items
Cleanup
Loading

0 comments on commit 836c560

Please sign in to comment.