From abdf2f89ff8e6bb8cefb8e192ec128127794a565 Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Mon, 26 Aug 2024 10:40:53 +0200 Subject: [PATCH] Pull upstream (with the latest GL kind attr cleanup) --- .github/workflows/upstream pretest.yaml | 11 +++++++ DataScraping/Reps/OpenCL-Docs | 2 +- DataScraping/Reps/OpenGL-Registry | 2 +- DataScraping/XML/OpenCL/ScrapXML.pas | 7 +---- DataScraping/XML/OpenGL/funcs.bin | Bin 944495 -> 944463 bytes Modules.Packed/OpenGL.pas | 28 +++++------------- Packing/Descriptions/OpenGL.predoc | 28 +++++------------- .../Template/LowLvl/CodeContainerItems.pas | 4 +-- Packing/Template/LowLvl/NamedTypeItems.pas | 6 ++-- .../OpenGL/Extension.Interface.template | 28 +++++------------- .../Template/LowLvl/OpenGL/Log/All Func's.log | 20 +++++-------- 11 files changed, 51 insertions(+), 85 deletions(-) diff --git a/.github/workflows/upstream pretest.yaml b/.github/workflows/upstream pretest.yaml index 4314e7fd..6443abb6 100644 --- a/.github/workflows/upstream pretest.yaml +++ b/.github/workflows/upstream pretest.yaml @@ -271,6 +271,7 @@ jobs: run: | git config --global core.autocrlf false + git config --global advice.detachedHead false git config --global user.name "sun pack bot" git config --global user.email "sunserega2@gmail.com" git config --global --add url.https://github.com/.insteadOf "git@github.com:" @@ -348,6 +349,16 @@ jobs: } + Write-Host "Merging with 0_official/main:" + git merge 0_official/main + if (-not $?) { + Write-Host "git merge failed" + Write-Host "This PR is outdated and cannot be properly tested" + exit 0 + } + git push + if (-not $?) { throw "git push failed" } + Write-Host "Merging with ${fork_main_branch_name}:" $pr_merge_sha = git rev-parse remotes/0_official/pull/$pr_num/merge git merge $fork_main_branch_name --no-ff --commit -m @" diff --git a/DataScraping/Reps/OpenCL-Docs b/DataScraping/Reps/OpenCL-Docs index 2cf4f6c5..9b0faab5 160000 --- a/DataScraping/Reps/OpenCL-Docs +++ b/DataScraping/Reps/OpenCL-Docs @@ -1 +1 @@ -Subproject commit 2cf4f6c50be2ad257d9bb1147bcfb91ba79fa0a3 +Subproject commit 9b0faab5f3dda08812ae7a72b7fc93d30b4f8d02 diff --git a/DataScraping/Reps/OpenGL-Registry b/DataScraping/Reps/OpenGL-Registry index 0eb55e00..94f9d6b1 160000 --- a/DataScraping/Reps/OpenGL-Registry +++ b/DataScraping/Reps/OpenGL-Registry @@ -1 +1 @@ -Subproject commit 0eb55e00f60ab68ec2ce0bf2cc0ee99e3dd1c607 +Subproject commit 94f9d6b1c84cf3144dac9f0d46dd21628d6aa7ef diff --git a/DataScraping/XML/OpenCL/ScrapXML.pas b/DataScraping/XML/OpenCL/ScrapXML.pas index bd573ddc..ffc0d276 100644 --- a/DataScraping/XML/OpenCL/ScrapXML.pas +++ b/DataScraping/XML/OpenCL/ScrapXML.pas @@ -626,12 +626,7 @@ function EnumSource.MakeNewItem: Enum; if gr<>nil then bt := nil; case Ord(bt<>nil)+Ord(gr<>nil)+Ord(cl<>nil)+Ord(s<>nil)+Ord(d<>nil) of - 0: - begin - Otp($'WARNING: [{tname}] is not a defined type'); - Result := nil; - exit; - end; + 0: raise new System.InvalidOperationException($'[{tname}] is not a defined type'); 1: ; else raise new System.NotImplementedException(tname); end; diff --git a/DataScraping/XML/OpenGL/funcs.bin b/DataScraping/XML/OpenGL/funcs.bin index 7a0970039ff0257a31be0402678a0b29afd50c7b..ca5eaa66330b9fd87b7972d09274b08fb5f35e4c 100644 GIT binary patch delta 87 zcmaEV$@2Uq%Z3)l7N#xCvy`R>yy4=QzDkLC5t!8;qs$D%EI`Z(#B4y!4#XTl%(*>A dnd{G!=?NU%8`~v0xq+Amhq~Y nfS7Z;uQJ!~Cm>~<(>*!3H-K5~zc{#om(ColorTableParameterfv_adr); - private ntv_ColorTableParameterfv_2 := GetProcOrNil&(ColorTableParameterfv_adr); - private ntv_ColorTableParameterfv_3 := GetProcOrNil&(ColorTableParameterfv_adr); + private ntv_ColorTableParameterfv_2 := GetProcOrNil&(ColorTableParameterfv_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of single); type PSingle = ^single; begin @@ -44677,17 +44676,14 @@ gdi_pixel_format_descriptor = record ntv_ColorTableParameterfv_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterfv_1(target, pname, PSingle(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4f) := - ntv_ColorTableParameterfv_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: single) := ntv_ColorTableParameterfv_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterfv_3(target, pname, ¶ms); + ntv_ColorTableParameterfv_2(target, pname, ¶ms); public ColorTableParameteriv_adr := GetProcAddress('glColorTableParameteriv'); private ntv_ColorTableParameteriv_1 := GetProcOrNil&(ColorTableParameteriv_adr); - private ntv_ColorTableParameteriv_2 := GetProcOrNil&(ColorTableParameteriv_adr); - private ntv_ColorTableParameteriv_3 := GetProcOrNil&(ColorTableParameteriv_adr); + private ntv_ColorTableParameteriv_2 := GetProcOrNil&(ColorTableParameteriv_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of Int32); type PInt32 = ^Int32; begin @@ -44695,12 +44691,10 @@ gdi_pixel_format_descriptor = record ntv_ColorTableParameteriv_1(target, pname, ¶ms[0]) else ntv_ColorTableParameteriv_1(target, pname, PInt32(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4i) := - ntv_ColorTableParameteriv_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Int32) := ntv_ColorTableParameteriv_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameteriv_3(target, pname, ¶ms); + ntv_ColorTableParameteriv_2(target, pname, ¶ms); public CopyColorTable_adr := GetProcAddress('glCopyColorTable'); private ntv_CopyColorTable_1 := GetProcOrNil&(CopyColorTable_adr); @@ -69246,8 +69240,7 @@ gdi_pixel_format_descriptor = record public ColorTableParameterfvSGI_adr := GetProcAddress('glColorTableParameterfvSGI'); private ntv_ColorTableParameterfvSGI_1 := GetProcOrNil&(ColorTableParameterfvSGI_adr); - private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&(ColorTableParameterfvSGI_adr); - private ntv_ColorTableParameterfvSGI_3 := GetProcOrNil&(ColorTableParameterfvSGI_adr); + private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&(ColorTableParameterfvSGI_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of single); type PSingle = ^single; begin @@ -69255,17 +69248,14 @@ gdi_pixel_format_descriptor = record ntv_ColorTableParameterfvSGI_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterfvSGI_1(target, pname, PSingle(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4f) := - ntv_ColorTableParameterfvSGI_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: single) := ntv_ColorTableParameterfvSGI_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterfvSGI_3(target, pname, ¶ms); + ntv_ColorTableParameterfvSGI_2(target, pname, ¶ms); public ColorTableParameterivSGI_adr := GetProcAddress('glColorTableParameterivSGI'); private ntv_ColorTableParameterivSGI_1 := GetProcOrNil&(ColorTableParameterivSGI_adr); - private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&(ColorTableParameterivSGI_adr); - private ntv_ColorTableParameterivSGI_3 := GetProcOrNil&(ColorTableParameterivSGI_adr); + private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&(ColorTableParameterivSGI_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of Int32); type PInt32 = ^Int32; begin @@ -69273,12 +69263,10 @@ gdi_pixel_format_descriptor = record ntv_ColorTableParameterivSGI_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterivSGI_1(target, pname, PInt32(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4i) := - ntv_ColorTableParameterivSGI_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Int32) := ntv_ColorTableParameterivSGI_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterivSGI_3(target, pname, ¶ms); + ntv_ColorTableParameterivSGI_2(target, pname, ¶ms); public CopyColorTableSGI_adr := GetProcAddress('glCopyColorTableSGI'); private ntv_CopyColorTableSGI_1 := GetProcOrNil&(CopyColorTableSGI_adr); diff --git a/Packing/Descriptions/OpenGL.predoc b/Packing/Descriptions/OpenGL.predoc index bc922acb..6fe8e40f 100644 --- a/Packing/Descriptions/OpenGL.predoc +++ b/Packing/Descriptions/OpenGL.predoc @@ -44649,8 +44649,7 @@ type public ColorTableParameterfv_adr := GetProcAddress('glColorTableParameterfv'); private ntv_ColorTableParameterfv_1 := GetProcOrNil&(ColorTableParameterfv_adr); - private ntv_ColorTableParameterfv_2 := GetProcOrNil&(ColorTableParameterfv_adr); - private ntv_ColorTableParameterfv_3 := GetProcOrNil&(ColorTableParameterfv_adr); + private ntv_ColorTableParameterfv_2 := GetProcOrNil&(ColorTableParameterfv_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of single); type PSingle = ^single; begin @@ -44658,17 +44657,14 @@ type ntv_ColorTableParameterfv_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterfv_1(target, pname, PSingle(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4f) := - ntv_ColorTableParameterfv_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: single) := ntv_ColorTableParameterfv_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterfv_3(target, pname, ¶ms); + ntv_ColorTableParameterfv_2(target, pname, ¶ms); public ColorTableParameteriv_adr := GetProcAddress('glColorTableParameteriv'); private ntv_ColorTableParameteriv_1 := GetProcOrNil&(ColorTableParameteriv_adr); - private ntv_ColorTableParameteriv_2 := GetProcOrNil&(ColorTableParameteriv_adr); - private ntv_ColorTableParameteriv_3 := GetProcOrNil&(ColorTableParameteriv_adr); + private ntv_ColorTableParameteriv_2 := GetProcOrNil&(ColorTableParameteriv_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of Int32); type PInt32 = ^Int32; begin @@ -44676,12 +44672,10 @@ type ntv_ColorTableParameteriv_1(target, pname, ¶ms[0]) else ntv_ColorTableParameteriv_1(target, pname, PInt32(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4i) := - ntv_ColorTableParameteriv_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Int32) := ntv_ColorTableParameteriv_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameteriv_3(target, pname, ¶ms); + ntv_ColorTableParameteriv_2(target, pname, ¶ms); public CopyColorTable_adr := GetProcAddress('glCopyColorTable'); private ntv_CopyColorTable_1 := GetProcOrNil&(CopyColorTable_adr); @@ -69227,8 +69221,7 @@ type public ColorTableParameterfvSGI_adr := GetProcAddress('glColorTableParameterfvSGI'); private ntv_ColorTableParameterfvSGI_1 := GetProcOrNil&(ColorTableParameterfvSGI_adr); - private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&(ColorTableParameterfvSGI_adr); - private ntv_ColorTableParameterfvSGI_3 := GetProcOrNil&(ColorTableParameterfvSGI_adr); + private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&(ColorTableParameterfvSGI_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of single); type PSingle = ^single; begin @@ -69236,17 +69229,14 @@ type ntv_ColorTableParameterfvSGI_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterfvSGI_1(target, pname, PSingle(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4f) := - ntv_ColorTableParameterfvSGI_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: single) := ntv_ColorTableParameterfvSGI_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterfvSGI_3(target, pname, ¶ms); + ntv_ColorTableParameterfvSGI_2(target, pname, ¶ms); public ColorTableParameterivSGI_adr := GetProcAddress('glColorTableParameterivSGI'); private ntv_ColorTableParameterivSGI_1 := GetProcOrNil&(ColorTableParameterivSGI_adr); - private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&(ColorTableParameterivSGI_adr); - private ntv_ColorTableParameterivSGI_3 := GetProcOrNil&(ColorTableParameterivSGI_adr); + private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&(ColorTableParameterivSGI_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of Int32); type PInt32 = ^Int32; begin @@ -69254,12 +69244,10 @@ type ntv_ColorTableParameterivSGI_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterivSGI_1(target, pname, PInt32(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4i) := - ntv_ColorTableParameterivSGI_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Int32) := ntv_ColorTableParameterivSGI_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterivSGI_3(target, pname, ¶ms); + ntv_ColorTableParameterivSGI_2(target, pname, ¶ms); public CopyColorTableSGI_adr := GetProcAddress('glCopyColorTableSGI'); private ntv_CopyColorTableSGI_1 := GetProcOrNil&(CopyColorTableSGI_adr); diff --git a/Packing/Template/LowLvl/CodeContainerItems.pas b/Packing/Template/LowLvl/CodeContainerItems.pas index 4d724fec..d219ec04 100644 --- a/Packing/Template/LowLvl/CodeContainerItems.pas +++ b/Packing/Template/LowLvl/CodeContainerItems.pas @@ -165,7 +165,7 @@ interface var is_enum_to_type_data := false; if ntv_pars.Select(par->par.CalculatedDirectType as Group).Select(gr->gr?.Body as ObjInfoEnumsInGroup).SingleOrDefault(gr_body->gr_body<>nil) is ObjInfoEnumsInGroup(var gr_body) then - is_enum_to_type_data := gr_body.EnmrBindings(self.ntv_pars).Any(b->b.data_par_ind=par_i); + is_enum_to_type_data := gr_body.EnmrBindings(self.name, self.ntv_pars).Any(b->b.data_par_ind=par_i); Result := par.MakePPT(self.ToString, par_i=0, is_enum_to_type_data); end); @@ -277,7 +277,7 @@ interface {$region Find} - var enum_to_type_bindings := enum_to_type_gr_body.EnmrBindings(self.ntv_pars).ToArray; + var enum_to_type_bindings := enum_to_type_gr_body.EnmrBindings(self.name, self.ntv_pars).ToArray; if enum_to_type_bindings.Length=0 then raise new InvalidOperationException; diff --git a/Packing/Template/LowLvl/NamedTypeItems.pas b/Packing/Template/LowLvl/NamedTypeItems.pas index cd6f02ad..a0a3f686 100644 --- a/Packing/Template/LowLvl/NamedTypeItems.pas +++ b/Packing/Template/LowLvl/NamedTypeItems.pas @@ -2620,7 +2620,7 @@ EnumWithObjInfo = record r.OutputT.MarkReferenced; end; - public function EnmrBindings(pars: array of LoadedParData): sequence of EnumToTypeBindingInfo; + public function EnmrBindings(func_name_context: ApiVendorLName; pars: array of LoadedParData): sequence of EnumToTypeBindingInfo; begin if Enums.Any(r->r.HasInput) then @@ -2632,7 +2632,7 @@ EnumWithObjInfo = record and par.CalculatedReadonlyLvls.SequenceEqual(|1|) ); if data_par_i=-1 then - raise new InvalidOperationException; + raise new InvalidOperationException($'Cannot find ett input par in [{func_name_context}] needed for {ObjectToString(Enums.Where(r->r.HasInput).Select(r->r.Enum))}'); var size_par_i := data_par_i-1; if not pars[size_par_i].Name.EndsWith('_value_size') then raise new NotImplementedException; @@ -2648,7 +2648,7 @@ EnumWithObjInfo = record and not par.CalculatedReadonlyLvls.Any ); if data_par_i=-1 then - raise new InvalidOperationException; + raise new InvalidOperationException($'Cannot find ett output par in [{func_name_context}] needed for {ObjectToString(Enums.Where(r->r.HasOutput).Select(r->r.Enum))}'); var size_par_i := data_par_i-1; if not pars[size_par_i].Name.EndsWith('_value_size') then raise new NotImplementedException; diff --git a/Packing/Template/LowLvl/OpenGL/Extension.Interface.template b/Packing/Template/LowLvl/OpenGL/Extension.Interface.template index dc4ca81f..f4243197 100644 --- a/Packing/Template/LowLvl/OpenGL/Extension.Interface.template +++ b/Packing/Template/LowLvl/OpenGL/Extension.Interface.template @@ -4685,8 +4685,7 @@ public ColorTableParameterfv_adr := GetProcAddress('glColorTableParameterfv'); private ntv_ColorTableParameterfv_1 := GetProcOrNil&(ColorTableParameterfv_adr); - private ntv_ColorTableParameterfv_2 := GetProcOrNil&(ColorTableParameterfv_adr); - private ntv_ColorTableParameterfv_3 := GetProcOrNil&(ColorTableParameterfv_adr); + private ntv_ColorTableParameterfv_2 := GetProcOrNil&(ColorTableParameterfv_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of single); type PSingle = ^single; begin @@ -4694,17 +4693,14 @@ ntv_ColorTableParameterfv_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterfv_1(target, pname, PSingle(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4f) := - ntv_ColorTableParameterfv_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: single) := ntv_ColorTableParameterfv_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterfv_3(target, pname, ¶ms); + ntv_ColorTableParameterfv_2(target, pname, ¶ms); public ColorTableParameteriv_adr := GetProcAddress('glColorTableParameteriv'); private ntv_ColorTableParameteriv_1 := GetProcOrNil&(ColorTableParameteriv_adr); - private ntv_ColorTableParameteriv_2 := GetProcOrNil&(ColorTableParameteriv_adr); - private ntv_ColorTableParameteriv_3 := GetProcOrNil&(ColorTableParameteriv_adr); + private ntv_ColorTableParameteriv_2 := GetProcOrNil&(ColorTableParameteriv_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of Int32); type PInt32 = ^Int32; begin @@ -4712,12 +4708,10 @@ ntv_ColorTableParameteriv_1(target, pname, ¶ms[0]) else ntv_ColorTableParameteriv_1(target, pname, PInt32(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4i) := - ntv_ColorTableParameteriv_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Int32) := ntv_ColorTableParameteriv_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameteriv_3(target, pname, ¶ms); + ntv_ColorTableParameteriv_2(target, pname, ¶ms); public CopyColorTable_adr := GetProcAddress('glCopyColorTable'); private ntv_CopyColorTable_1 := GetProcOrNil&(CopyColorTable_adr); @@ -29263,8 +29257,7 @@ public ColorTableParameterfvSGI_adr := GetProcAddress('glColorTableParameterfvSGI'); private ntv_ColorTableParameterfvSGI_1 := GetProcOrNil&(ColorTableParameterfvSGI_adr); - private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&(ColorTableParameterfvSGI_adr); - private ntv_ColorTableParameterfvSGI_3 := GetProcOrNil&(ColorTableParameterfvSGI_adr); + private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&(ColorTableParameterfvSGI_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of single); type PSingle = ^single; begin @@ -29272,17 +29265,14 @@ ntv_ColorTableParameterfvSGI_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterfvSGI_1(target, pname, PSingle(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4f) := - ntv_ColorTableParameterfvSGI_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: single) := ntv_ColorTableParameterfvSGI_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterfvSGI_3(target, pname, ¶ms); + ntv_ColorTableParameterfvSGI_2(target, pname, ¶ms); public ColorTableParameterivSGI_adr := GetProcAddress('glColorTableParameterivSGI'); private ntv_ColorTableParameterivSGI_1 := GetProcOrNil&(ColorTableParameterivSGI_adr); - private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&(ColorTableParameterivSGI_adr); - private ntv_ColorTableParameterivSGI_3 := GetProcOrNil&(ColorTableParameterivSGI_adr); + private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&(ColorTableParameterivSGI_adr); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: array of Int32); type PInt32 = ^Int32; begin @@ -29290,12 +29280,10 @@ ntv_ColorTableParameterivSGI_1(target, pname, ¶ms[0]) else ntv_ColorTableParameterivSGI_1(target, pname, PInt32(nil)^); end; - public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Vec4i) := - ntv_ColorTableParameterivSGI_2(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var ¶ms: Int32) := ntv_ColorTableParameterivSGI_1(target, pname, ¶ms); public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; ¶ms: IntPtr) := - ntv_ColorTableParameterivSGI_3(target, pname, ¶ms); + ntv_ColorTableParameterivSGI_2(target, pname, ¶ms); public CopyColorTableSGI_adr := GetProcAddress('glCopyColorTableSGI'); private ntv_CopyColorTableSGI_1 := GetProcOrNil&(CopyColorTableSGI_adr); diff --git a/Packing/Template/LowLvl/OpenGL/Log/All Func's.log b/Packing/Template/LowLvl/OpenGL/Log/All Func's.log index 589c9e21..c9e28816 100644 --- a/Packing/Template/LowLvl/OpenGL/Log/All Func's.log +++ b/Packing/Template/LowLvl/OpenGL/Log/All Func's.log @@ -1524,11 +1524,10 @@ table: IntPtr const !ppt target: glColorTableTarget pname: glColorTableParameterPName -params: array of single const / var Vec4f const / var single const / IntPtr const +params: array of single const / var single const / IntPtr const !ffo -4 +3 glColorTableTarget | glColorTableParameterPName | array of single const | - glColorTableTarget | glColorTableParameterPName | var Vec4f const | glColorTableTarget | glColorTableParameterPName | var single const | glColorTableTarget | glColorTableParameterPName | IntPtr const | ------------------ | -------------------------- | --------------------- | @@ -1538,11 +1537,10 @@ params: array of single const / var Vec4f const / var single const / IntPtr cons !ppt target: glColorTableTarget pname: glColorTableParameterPName -params: array of Int32 const / var Vec4i const / var Int32 const / IntPtr const +params: array of Int32 const / var Int32 const / IntPtr const !ffo -4 +3 glColorTableTarget | glColorTableParameterPName | array of Int32 const | - glColorTableTarget | glColorTableParameterPName | var Vec4i const | glColorTableTarget | glColorTableParameterPName | var Int32 const | glColorTableTarget | glColorTableParameterPName | IntPtr const | ------------------ | -------------------------- | -------------------- | @@ -38947,11 +38945,10 @@ table: IntPtr const !ppt target: glColorTableTarget pname: glColorTableParameterPName -params: array of single const / var Vec4f const / var single const / IntPtr const +params: array of single const / var single const / IntPtr const !ffo -4 +3 glColorTableTarget | glColorTableParameterPName | array of single const | - glColorTableTarget | glColorTableParameterPName | var Vec4f const | glColorTableTarget | glColorTableParameterPName | var single const | glColorTableTarget | glColorTableParameterPName | IntPtr const | ------------------ | -------------------------- | --------------------- | @@ -38961,11 +38958,10 @@ params: array of single const / var Vec4f const / var single const / IntPtr cons !ppt target: glColorTableTarget pname: glColorTableParameterPName -params: array of Int32 const / var Vec4i const / var Int32 const / IntPtr const +params: array of Int32 const / var Int32 const / IntPtr const !ffo -4 +3 glColorTableTarget | glColorTableParameterPName | array of Int32 const | - glColorTableTarget | glColorTableParameterPName | var Vec4i const | glColorTableTarget | glColorTableParameterPName | var Int32 const | glColorTableTarget | glColorTableParameterPName | IntPtr const | ------------------ | -------------------------- | -------------------- |