adapt packing to PR CL#1215

SunSerega · Aug 31, 2024 · 66d14c8 · 66d14c8
1 parent a6b735e
commit 66d14c8
Show file tree

Hide file tree

Showing 14 changed files with 1,695 additions and 1,346 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/1215 2>&1) && (echo [pull-own]: && git pull SunSerega pretest/1215) && (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/1215'.
+SubReps Update: OpenCL[OUT] : Already on 'pretest/1215'
 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/1215 -> FETCH_HEAD
 SubReps Update: OpenCL[OUT] : Already up to date.
 SubReps Update: OpenCL[OUT] : [fetch-main]
 SubReps Update: OpenCL[OUT] : [merge-main]

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/1215 2>&1) && (echo [pull-own]: && git pull SunSerega pretest/1215) && (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/1215'.
+SubReps Update: OpenCL[OUT] : Already on 'pretest/1215'
 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/1215 -> FETCH_HEAD
 SubReps Update: OpenCL[OUT] : Already up to date.
 SubReps Update: OpenCL[OUT] : [fetch-main]
 SubReps Update: OpenCL[OUT] : [merge-main]

diff --git a/Modules.Packed/OpenCL.pas b/Modules.Packed/OpenCL.pas
diff --git a/Packing/Descriptions/OpenCL.predoc b/Packing/Descriptions/OpenCL.predoc
diff --git a/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_khr_command_buffer.dat b/Packing/Template/LowLvl/Fixers/Func/OpenCL/cl_khr_command_buffer.dat
@@ -1,47 +1,63 @@
 
 
 
+# cl::CommandBarrierWithWaitList+KHR
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+
+# cl::CommandCopyBuffer+KHR
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+
 # cl::CommandCopyBufferRect+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *	| *	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *	| *	| *	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *	| *	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *	| *	| *	| *	| *							| *							| *								|
 
-# cl::CommandCopyImage+KHR
+# cl::CommandCopyBufferToImage+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| *	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
 
-# cl::CommandCopyBufferToImage+KHR
+# cl::CommandCopyImage+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
 
 # cl::CommandCopyImageToBuffer+KHR
 !possible_par_types
- *	| *	| *	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *							| *							| *								|
- *	| *	| *	| *	| *	| IntPtr			const	| IntPtr			const	| *	| *	| *							| *							| *								|
-
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| *	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| *	| *	| *							| *							| *								|
 
+# cl::CommandFillBuffer+KHR
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| +var T const	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 
 # cl::CommandFillImage+KHR
 !possible_par_types
- *	| *	| *	| *	| +var T const	| -array of UIntPtr const -IntPtr const	| -array of UIntPtr const -IntPtr const	| *	| -array of UInt32 const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
-
-
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| +var T const	| -array of UIntPtr const -IntPtr const	| -array of UIntPtr const -IntPtr const	| *	| -array of UInt32 const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 
 # cl::CommandNDRangeKernel+KHR
 !possible_par_types
- *	| *	| *	| -array of cl::NDRangeKernelCommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| -array of UIntPtr	const	| -array of UIntPtr	const	| -array of UIntPtr	const	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 !limit_ovrs
- *	| *	| *	| var cl::NDRangeKernelCommandProperties		const	| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
- *	| *	| *	| IntPtr										const	| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| var UIntPtr		const	| var UIntPtr		const	| var UIntPtr		const	| *	| *							| *							| *								|
+ *	| *	| *	| *											| *	| *	| IntPtr			const	| IntPtr			const	| IntPtr			const	| *	| *							| *							| *								|
+
+# cl::CommandSVMMemcpy+KHR 
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
+
+# cl::CommandSVMMemFill+KHR 
+!possible_par_types
+ *	| *	| *	| -array of cl::CommandProperties	const	| *	| *	| *	| *	| *	| -array of UInt32	const	| -array of UInt32 -IntPtr	| -array of cl::mutable_command	|
 
 
diff --git a/Packing/Template/LowLvl/Fixers/Group/OpenCL/0Misc.dat b/Packing/Template/LowLvl/Fixers/Group/OpenCL/0Misc.dat
@@ -39,10 +39,6 @@ cl::DeviceSVMCapabilities
 !rename
 cl::DeviceOnDeviceEnqueueCapabilities
 
-# cl::NdrangeKernelCommandProperties
-!rename
-cl::NDRangeKernelCommandProperties
-
 # cl::D3d[%v:10,11%]Device[%end:Set,Source%]
 !rename
 cl::D3D{%v%}Device{%end%}