Skip to content

Commit

Permalink
Pull upstream (with the latest GL kind attr cleanup)
Browse files Browse the repository at this point in the history
  • Loading branch information
@SunSerega
SunSerega committed Aug 26, 2024
1 parent bdf7540 commit abdf2f8
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 85 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/upstream pretest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
git config --global --add url.https://github.com/.insteadOf "[email protected]:"
Expand Down Expand Up @@ -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 @"
Expand Down
2 changes: 1 addition & 1 deletion DataScraping/Reps/OpenCL-Docs
Submodule OpenCL-Docs updated from 2cf4f6 to 9b0faa
2 changes: 1 addition & 1 deletion DataScraping/Reps/OpenGL-Registry
Submodule OpenGL-Registry updated from 0eb55e to 94f9d6
7 changes: 1 addition & 6 deletions DataScraping/XML/OpenCL/ScrapXML.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file modified DataScraping/XML/OpenGL/funcs.bin
View file
Binary file not shown.
28 changes: 8 additions & 20 deletions Modules.Packed/OpenGL.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44668,39 +44668,33 @@ gdi_pixel_format_descriptor = record

public ColorTableParameterfv_adr := GetProcAddress('glColorTableParameterfv');
private ntv_ColorTableParameterfv_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single)>(ColorTableParameterfv_adr);
private ntv_ColorTableParameterfv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f)>(ColorTableParameterfv_adr);
private ntv_ColorTableParameterfv_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfv_adr);
private ntv_ColorTableParameterfv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfv_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of single);
type PSingle = ^single;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameterfv_1(target, pname, &params[0]) else
ntv_ColorTableParameterfv_1(target, pname, PSingle(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f) :=
ntv_ColorTableParameterfv_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single) :=
ntv_ColorTableParameterfv_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameterfv_3(target, pname, &params);
ntv_ColorTableParameterfv_2(target, pname, &params);

public ColorTableParameteriv_adr := GetProcAddress('glColorTableParameteriv');
private ntv_ColorTableParameteriv_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32)>(ColorTableParameteriv_adr);
private ntv_ColorTableParameteriv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i)>(ColorTableParameteriv_adr);
private ntv_ColorTableParameteriv_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameteriv_adr);
private ntv_ColorTableParameteriv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameteriv_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of Int32);
type PInt32 = ^Int32;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameteriv_1(target, pname, &params[0]) else
ntv_ColorTableParameteriv_1(target, pname, PInt32(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i) :=
ntv_ColorTableParameteriv_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32) :=
ntv_ColorTableParameteriv_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameteriv_3(target, pname, &params);
ntv_ColorTableParameteriv_2(target, pname, &params);

public CopyColorTable_adr := GetProcAddress('glCopyColorTable');
private ntv_CopyColorTable_1 := GetProcOrNil&<procedure(target: glColorTableTarget; internalformat: glInternalFormat; x: Int32; y: Int32; width: Int32)>(CopyColorTable_adr);
Expand Down Expand Up @@ -69246,39 +69240,33 @@ gdi_pixel_format_descriptor = record

public ColorTableParameterfvSGI_adr := GetProcAddress('glColorTableParameterfvSGI');
private ntv_ColorTableParameterfvSGI_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single)>(ColorTableParameterfvSGI_adr);
private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f)>(ColorTableParameterfvSGI_adr);
private ntv_ColorTableParameterfvSGI_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfvSGI_adr);
private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfvSGI_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of single);
type PSingle = ^single;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameterfvSGI_1(target, pname, &params[0]) else
ntv_ColorTableParameterfvSGI_1(target, pname, PSingle(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f) :=
ntv_ColorTableParameterfvSGI_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single) :=
ntv_ColorTableParameterfvSGI_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameterfvSGI_3(target, pname, &params);
ntv_ColorTableParameterfvSGI_2(target, pname, &params);

public ColorTableParameterivSGI_adr := GetProcAddress('glColorTableParameterivSGI');
private ntv_ColorTableParameterivSGI_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32)>(ColorTableParameterivSGI_adr);
private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i)>(ColorTableParameterivSGI_adr);
private ntv_ColorTableParameterivSGI_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterivSGI_adr);
private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterivSGI_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of Int32);
type PInt32 = ^Int32;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameterivSGI_1(target, pname, &params[0]) else
ntv_ColorTableParameterivSGI_1(target, pname, PInt32(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i) :=
ntv_ColorTableParameterivSGI_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32) :=
ntv_ColorTableParameterivSGI_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameterivSGI_3(target, pname, &params);
ntv_ColorTableParameterivSGI_2(target, pname, &params);

public CopyColorTableSGI_adr := GetProcAddress('glCopyColorTableSGI');
private ntv_CopyColorTableSGI_1 := GetProcOrNil&<procedure(target: glColorTableTarget; internalformat: glInternalFormat; x: Int32; y: Int32; width: Int32)>(CopyColorTableSGI_adr);
Expand Down
28 changes: 8 additions & 20 deletions Packing/Descriptions/OpenGL.predoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44649,39 +44649,33 @@ type

public ColorTableParameterfv_adr := GetProcAddress('glColorTableParameterfv');
private ntv_ColorTableParameterfv_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single)>(ColorTableParameterfv_adr);
private ntv_ColorTableParameterfv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f)>(ColorTableParameterfv_adr);
private ntv_ColorTableParameterfv_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfv_adr);
private ntv_ColorTableParameterfv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfv_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of single);
type PSingle = ^single;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameterfv_1(target, pname, &params[0]) else
ntv_ColorTableParameterfv_1(target, pname, PSingle(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f) :=
ntv_ColorTableParameterfv_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single) :=
ntv_ColorTableParameterfv_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameterfv_3(target, pname, &params);
ntv_ColorTableParameterfv_2(target, pname, &params);

public ColorTableParameteriv_adr := GetProcAddress('glColorTableParameteriv');
private ntv_ColorTableParameteriv_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32)>(ColorTableParameteriv_adr);
private ntv_ColorTableParameteriv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i)>(ColorTableParameteriv_adr);
private ntv_ColorTableParameteriv_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameteriv_adr);
private ntv_ColorTableParameteriv_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameteriv_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of Int32);
type PInt32 = ^Int32;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameteriv_1(target, pname, &params[0]) else
ntv_ColorTableParameteriv_1(target, pname, PInt32(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i) :=
ntv_ColorTableParameteriv_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32) :=
ntv_ColorTableParameteriv_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameteriv(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameteriv_3(target, pname, &params);
ntv_ColorTableParameteriv_2(target, pname, &params);

public CopyColorTable_adr := GetProcAddress('glCopyColorTable');
private ntv_CopyColorTable_1 := GetProcOrNil&<procedure(target: glColorTableTarget; internalformat: glInternalFormat; x: Int32; y: Int32; width: Int32)>(CopyColorTable_adr);
Expand Down Expand Up @@ -69227,39 +69221,33 @@ type

public ColorTableParameterfvSGI_adr := GetProcAddress('glColorTableParameterfvSGI');
private ntv_ColorTableParameterfvSGI_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single)>(ColorTableParameterfvSGI_adr);
private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f)>(ColorTableParameterfvSGI_adr);
private ntv_ColorTableParameterfvSGI_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfvSGI_adr);
private ntv_ColorTableParameterfvSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterfvSGI_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of single);
type PSingle = ^single;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameterfvSGI_1(target, pname, &params[0]) else
ntv_ColorTableParameterfvSGI_1(target, pname, PSingle(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4f) :=
ntv_ColorTableParameterfvSGI_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: single) :=
ntv_ColorTableParameterfvSGI_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterfvSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameterfvSGI_3(target, pname, &params);
ntv_ColorTableParameterfvSGI_2(target, pname, &params);

public ColorTableParameterivSGI_adr := GetProcAddress('glColorTableParameterivSGI');
private ntv_ColorTableParameterivSGI_1 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32)>(ColorTableParameterivSGI_adr);
private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i)>(ColorTableParameterivSGI_adr);
private ntv_ColorTableParameterivSGI_3 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterivSGI_adr);
private ntv_ColorTableParameterivSGI_2 := GetProcOrNil&<procedure(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr)>(ColorTableParameterivSGI_adr);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: array of Int32);
type PInt32 = ^Int32;
begin
if (&params<>nil) and (&params.Length<>0) then
ntv_ColorTableParameterivSGI_1(target, pname, &params[0]) else
ntv_ColorTableParameterivSGI_1(target, pname, PInt32(nil)^);
end;
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Vec4i) :=
ntv_ColorTableParameterivSGI_2(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; var &params: Int32) :=
ntv_ColorTableParameterivSGI_1(target, pname, &params);
public [MethodImpl(MethodImplOptions.AggressiveInlining)] procedure ColorTableParameterivSGI(target: glColorTableTarget; pname: glColorTableParameterPName; &params: IntPtr) :=
ntv_ColorTableParameterivSGI_3(target, pname, &params);
ntv_ColorTableParameterivSGI_2(target, pname, &params);

public CopyColorTableSGI_adr := GetProcAddress('glCopyColorTableSGI');
private ntv_CopyColorTableSGI_1 := GetProcOrNil&<procedure(target: glColorTableTarget; internalformat: glInternalFormat; x: Int32; y: Int32; width: Int32)>(CopyColorTableSGI_adr);
Expand Down
Loading

0 comments on commit abdf2f8

Please sign in to comment.