adapt packing to PR CL#962

SunSerega · Sep 1, 2024 · 67bde35 · 67bde35
1 parent c0e989b
commit 67bde35
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 25 deletions.
diff --git a/DataScraping/Reps/OpenCL-Docs b/DataScraping/Reps/OpenCL-Docs
diff --git a/DataScraping/XML/OpenCL/funcs.bin b/DataScraping/XML/OpenCL/funcs.bin
diff --git a/LastPack.log b/LastPack.log
@@ -7,13 +7,13 @@ Compiling "DataScraping/Reps/PullReps.pas"
 Compiling: OK
 Runing SubReps Update
 SubReps Update: Pulling OpenCL
-SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull-own]: && git pull SunSerega custom) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
+SubReps Update: cmd /c "(echo [checkout] && git checkout pretest/962 2>&1) && (echo [pull-own]: && git pull SunSerega pretest/962) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
 SubReps Update: OpenCL[OUT] : [checkout]
-SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/custom'.
-SubReps Update: OpenCL[OUT] : Already on 'custom'
+SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/pretest/962'.
+SubReps Update: OpenCL[OUT] : Already on 'pretest/962'
 SubReps Update: OpenCL[OUT] : [pull-own]:
 SubReps Update: OpenCL[ERR] : From SunSerega/OpenCL-Docs
-SubReps Update: OpenCL[ERR] : * branch custom -> FETCH_HEAD
+SubReps Update: OpenCL[ERR] : * branch pretest/962 -> FETCH_HEAD
 SubReps Update: OpenCL[OUT] : Already up to date.
 SubReps Update: OpenCL[OUT] : [fetch-main]
 SubReps Update: OpenCL[OUT] : [merge-main]
@@ -54,13 +54,13 @@ 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 1128 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]: Func: Saved 242 items
 ScrapXML[OpenCL]: Feature: Saved 7 items
 ScrapXML[OpenCL]: Extension: Saved 132 items
 ScrapXML[OpenCL]: Done
@@ -199,19 +199,10 @@ Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: F
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: Func [cl::GetAcceleratorInfo + INTEL] could not generate overload: no output type info for Group [cl::AcceleratorInfo] Enum [cl::ACCELERATOR_DESCRIPTOR]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Dumping Feature items
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::CompileProgram]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueFillBuffer]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueMapImage]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueMigrateMemObjects]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueNativeKernel]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 30>12 overloads of non-fixed Func [cl::EnqueueNDRangeKernel]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueReadBuffer]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMFree]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMMemFill]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMMigrateMem]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueWriteBuffer]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: Dumping Extension items
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMFree + ARM]
-Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueSVMMemFill + ARM]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueMigrateMemObject + EXT]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 30>12 overloads of non-fixed Func [cl::EnqueueGenerateMipmap + IMG]
 Template[OpenCL]: TemplateCommand[LowLvl/OpenCL/Pack Essentials.exe]: WARNING: 18>12 overloads of non-fixed Func [cl::EnqueueAcquireGrallocObjects + IMG]
@@ -254,7 +245,7 @@ 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 16 items
 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]: Func: Packed 242 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]: Cleanup

diff --git a/Log/OpenCL.log b/Log/OpenCL.log
@@ -101,7 +101,7 @@ 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 16 items
 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]: Func: Packed 242 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]: Cleanup

diff --git a/Log/PullUpstream.log b/Log/PullUpstream.log
@@ -1,13 +1,13 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Update Reps ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Runing SubReps Update
 SubReps Update: Pulling OpenCL
-SubReps Update: cmd /c "(echo [checkout] && git checkout custom 2>&1) && (echo [pull-own]: && git pull SunSerega custom) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
+SubReps Update: cmd /c "(echo [checkout] && git checkout pretest/962 2>&1) && (echo [pull-own]: && git pull SunSerega pretest/962) && (echo [fetch-main] && git fetch 0_official main:main) && (echo [merge-main] && git merge main)"
 SubReps Update: OpenCL[OUT] : [checkout]
-SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/custom'.
-SubReps Update: OpenCL[OUT] : Already on 'custom'
+SubReps Update: OpenCL[OUT] : Your branch is up to date with 'SunSerega/pretest/962'.
+SubReps Update: OpenCL[OUT] : Already on 'pretest/962'
 SubReps Update: OpenCL[OUT] : [pull-own]:
 SubReps Update: OpenCL[ERR] : From SunSerega/OpenCL-Docs
-SubReps Update: OpenCL[ERR] : * branch custom -> FETCH_HEAD
+SubReps Update: OpenCL[ERR] : * branch pretest/962 -> FETCH_HEAD
 SubReps Update: OpenCL[OUT] : Already up to date.
 SubReps Update: OpenCL[OUT] : [fetch-main]
 SubReps Update: OpenCL[OUT] : [merge-main]
@@ -44,13 +44,13 @@ 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 1128 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]: Func: Saved 242 items
 ScrapXML[OpenCL]: Feature: Saved 7 items
 ScrapXML[OpenCL]: Extension: Saved 132 items
 ScrapXML[OpenCL]: Done

diff --git a/Modules.Packed/OpenCL.pas b/Modules.Packed/OpenCL.pas
@@ -13839,6 +13839,11 @@   cl_queue_family_properties = record
     public [MethodImpl(MethodImplOptions.AggressiveInlining)] function InitLayer(num_entries: UInt32; target_dispatch: cl_icd_dispatch; num_entries_ret: IntPtr; layer_dispatch_ret: IntPtr): clErrorCode :=
       ntv_InitLayer_4(num_entries, target_dispatch, num_entries_ret, layer_dispatch_ret);
 
+    public DeinitLayer_adr := GetProcAddress('clDeinitLayer');
+    private ntv_DeinitLayer_1 := GetProcOrNil&<function: clErrorCode>(DeinitLayer_adr);
+    public [MethodImpl(MethodImplOptions.AggressiveInlining)] function DeinitLayer: clErrorCode :=
+      ntv_DeinitLayer_1;
+
   end;
 
   /// id: cl_amd_device_attribute_query

diff --git a/Packing/Descriptions/OpenCL.predoc b/Packing/Descriptions/OpenCL.predoc
@@ -13827,6 +13827,11 @@ type
     public [MethodImpl(MethodImplOptions.AggressiveInlining)] function InitLayer(num_entries: UInt32; target_dispatch: cl_icd_dispatch; num_entries_ret: IntPtr; layer_dispatch_ret: IntPtr): clErrorCode :=
       ntv_InitLayer_4(num_entries, target_dispatch, num_entries_ret, layer_dispatch_ret);
 
+    public DeinitLayer_adr := GetProcAddress('clDeinitLayer');
+    private ntv_DeinitLayer_1 := GetProcOrNil&<function: clErrorCode>(DeinitLayer_adr);
+    public [MethodImpl(MethodImplOptions.AggressiveInlining)] function DeinitLayer: clErrorCode :=
+      ntv_DeinitLayer_1;
+
   end;
 
   /// id: cl_amd_device_attribute_query

diff --git a/Packing/Template/LowLvl/OpenCL/Extension.Interface.template b/Packing/Template/LowLvl/OpenCL/Extension.Interface.template
@@ -183,6 +183,11 @@
     public [MethodImpl(MethodImplOptions.AggressiveInlining)] function InitLayer(num_entries: UInt32; target_dispatch: cl_icd_dispatch; num_entries_ret: IntPtr; layer_dispatch_ret: IntPtr): clErrorCode :=
       ntv_InitLayer_4(num_entries, target_dispatch, num_entries_ret, layer_dispatch_ret);
 
+    public DeinitLayer_adr := GetProcAddress('clDeinitLayer');
+    private ntv_DeinitLayer_1 := GetProcOrNil&<function: clErrorCode>(DeinitLayer_adr);
+    public [MethodImpl(MethodImplOptions.AggressiveInlining)] function DeinitLayer: clErrorCode :=
+      ntv_DeinitLayer_1;
+
   end;
 
   /// id: cl_amd_device_attribute_query

diff --git a/Packing/Template/LowLvl/OpenCL/Log/All Extension's.log b/Packing/Template/LowLvl/OpenCL/Log/All Extension's.log
@@ -10,10 +10,12 @@
 
 # clLoaderLayers (cl_loader_layers)
 	Enum [cl::LAYER_API_VERSION_100]
+	Enum [cl::LAYER_API_VERSION_110]
 	Enum [cl::LAYER_API_VERSION]
 	Enum [cl::LAYER_NAME]
 	Func [cl::GetLayerInfo]
 	Func [cl::InitLayer]
+	Func [cl::DeinitLayer]
 
 # clDeviceAttributeQueryAMD (cl_amd_device_attribute_query)
 	Enum [cl::DEVICE_PREFERRED_WORK_GROUP_SIZE]

diff --git a/Packing/Template/LowLvl/OpenCL/Log/All Func's.log b/Packing/Template/LowLvl/OpenCL/Log/All Func's.log
@@ -516,6 +516,13 @@ errcode_ret: var clErrorCode
 	-------- | ---------- | --------------- |
 	         | context    | errcode_ret     |
 
+# cl::DeinitLayer
+!ppt
+Result: clErrorCode
+!ffo
+1
+	clErrorCode |
+
 # cl::EnqueueAcquireGLObjects
 !ppt
 Result:                  clErrorCode

diff --git a/Packing/Template/LowLvl/OpenCL/Log/Essentials.log b/Packing/Template/LowLvl/OpenCL/Log/Essentials.log
@@ -102,7 +102,7 @@ Group: Packed 113 items
 IdClass: Packed 28 items
 Struct: Packed 16 items
 Delegate: Packed 7 items
-Func: Packed 241 items
+Func: Packed 242 items
 Feature: Packed 1 items
 Extension: Packed 132 items
 Cleanup