Sync with #2288

Silk.NET.sln

@@ -44,9 +44,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A5578D12
 		tests\Directory.Build.targets = tests\Directory.Build.targets
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "sources\SilkTouch\Silk.NET.SilkTouch.csproj", "{76F747A6-D971-4162-BF35-A226177FCA08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SilkTouch", "sources\SilkTouch\SilkTouch\Silk.NET.SilkTouch.csproj", "{76F747A6-D971-4162-BF35-A226177FCA08}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.SilkTouch.UnitTests", "tests\SilkTouch\Silk.NET.SilkTouch.UnitTests.csproj", "{600D712C-4ABF-44C4-96C3-B1DEE1F38298}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.SilkTouch.UnitTests", "tests\SilkTouch\SilkTouch\Silk.NET.SilkTouch.UnitTests.csproj", "{600D712C-4ABF-44C4-96C3-B1DEE1F38298}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{475AEF7B-0154-4989-AF82-97E3A95A96AF}"
 EndProject
@@ -56,19 +56,37 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground", "sources\Playg
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.UnitTests", "tests\Core\Core\Silk.NET.Core.UnitTests.csproj", "{A87E1861-07E4-4B7A-9173-0853370A7D4E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths", "sources\Maths\Silk.NET.Maths.csproj", "{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths", "sources\Maths\Maths\Silk.NET.Maths.csproj", "{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Tests", "tests\Maths\Silk.NET.Maths.Tests.csproj", "{01683C11-4721-43AB-B53C-15EBE935B48F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Tests", "tests\Maths\Maths\Silk.NET.Maths.Tests.csproj", "{01683C11-4721-43AB-B53C-15EBE935B48F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{B681E21A-47A2-4635-96EE-60D8D63FBEA9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Maths.Benchmarks", "eng\benchmarks\Silk.NET.Maths.Benchmarks\Silk.NET.Maths.Benchmarks.csproj", "{AF6C70ED-D6A8-4C57-8DB3-EAFF94396049}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenGL", "sources\OpenGL\Silk.NET.OpenGL.csproj", "{9625C977-25BE-48F3-9B6F-BC94B8B799A6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenGL", "sources\OpenGL\OpenGL\Silk.NET.OpenGL.csproj", "{9625C977-25BE-48F3-9B6F-BC94B8B799A6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL", "sources\SDL\Silk.NET.SDL.csproj", "{19B05730-F97E-43D4-B922-DF4697E5CE5F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL", "sources\SDL\SDL\Silk.NET.SDL.csproj", "{19B05730-F97E-43D4-B922-DF4697E5CE5F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL.UnitTests", "tests\SDL\Silk.NET.SDL.UnitTests.csproj", "{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SDL.UnitTests", "tests\SDL\SDL\Silk.NET.SDL.UnitTests.csproj", "{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{5CD096DB-6C44-48F1-9093-AD4C84B6B7EC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maths", "Maths", "{2452CED9-5211-4A19-BA44-230EC28F409E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL", "OpenGL", "{FA31E483-AD35-4E44-B10A-B33C4539DBCB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SilkTouch", "SilkTouch", "{24BD769C-7379-400C-A67F-00C34756DA32}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{EC4D7B06-D277-4411-BD7B-71A6D37683F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{D9ACA4E5-712F-4F15-B8B8-50C85D23D1D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maths", "Maths", "{FCD75AA5-1536-433E-BA9B-3D698C2255EB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{49D426BF-A009-43D5-A9E2-EFAAAA7196FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SilkTouch", "SilkTouch", "{AB25C482-DA9D-4335-8E26-2F29C3700152}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Windowing.Common", "sources\Windowing\Common\Silk.NET.Windowing.Common.csproj", "{75CD2208-F000-4839-B492-50C38C63AEB9}"
 EndProject
@@ -147,23 +165,30 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{76F747A6-D971-4162-BF35-A226177FCA08} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{600D712C-4ABF-44C4-96C3-B1DEE1F38298} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
 		{48F43535-3AFC-45E7-A98D-C2609B3B9757} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{A87E1861-07E4-4B7A-9173-0853370A7D4E} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
-		{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{01683C11-4721-43AB-B53C-15EBE935B48F} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
 		{B681E21A-47A2-4635-96EE-60D8D63FBEA9} = {475AEF7B-0154-4989-AF82-97E3A95A96AF}
 		{AF6C70ED-D6A8-4C57-8DB3-EAFF94396049} = {B681E21A-47A2-4635-96EE-60D8D63FBEA9}
-		{9625C977-25BE-48F3-9B6F-BC94B8B799A6} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{19B05730-F97E-43D4-B922-DF4697E5CE5F} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{5CD096DB-6C44-48F1-9093-AD4C84B6B7EC} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{131C09C1-BF4D-47C1-AF13-4A7E30866B1E} = {5CD096DB-6C44-48F1-9093-AD4C84B6B7EC}
+		{2452CED9-5211-4A19-BA44-230EC28F409E} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{FA31E483-AD35-4E44-B10A-B33C4539DBCB} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{24BD769C-7379-400C-A67F-00C34756DA32} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{EC4D7B06-D277-4411-BD7B-71A6D37683F0} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
+		{19B05730-F97E-43D4-B922-DF4697E5CE5F} = {EC4D7B06-D277-4411-BD7B-71A6D37683F0}
+		{76F747A6-D971-4162-BF35-A226177FCA08} = {24BD769C-7379-400C-A67F-00C34756DA32}
+		{1B21D783-71C3-48D3-91F5-0EEA90FB0DB2} = {2452CED9-5211-4A19-BA44-230EC28F409E}
+		{9625C977-25BE-48F3-9B6F-BC94B8B799A6} = {FA31E483-AD35-4E44-B10A-B33C4539DBCB}
+		{D9ACA4E5-712F-4F15-B8B8-50C85D23D1D5} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{FCD75AA5-1536-433E-BA9B-3D698C2255EB} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{49D426BF-A009-43D5-A9E2-EFAAAA7196FC} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{AB25C482-DA9D-4335-8E26-2F29C3700152} = {A5578D12-9E77-4647-8C22-0DBD17760BFF}
+		{A87E1861-07E4-4B7A-9173-0853370A7D4E} = {D9ACA4E5-712F-4F15-B8B8-50C85D23D1D5}
+		{01683C11-4721-43AB-B53C-15EBE935B48F} = {FCD75AA5-1536-433E-BA9B-3D698C2255EB}
+		{D2B9C43F-A80D-4C9A-9643-BC1AC1B4E807} = {49D426BF-A009-43D5-A9E2-EFAAAA7196FC}
+		{600D712C-4ABF-44C4-96C3-B1DEE1F38298} = {AB25C482-DA9D-4335-8E26-2F29C3700152}
 		{2FA536C6-E68A-44AB-BCAD-DA1442F66F04} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{75CD2208-F000-4839-B492-50C38C63AEB9} = {2FA536C6-E68A-44AB-BCAD-DA1442F66F04}
 		{B3A917B0-027F-4438-99C5-40C31CF3D01C} = {2FA536C6-E68A-44AB-BCAD-DA1442F66F04}
-		{CFA6E293-8A63-4164-BF5C-4610A0B3372E} = {DD29EA8F-B1A6-45AA-8D2E-B38DA56D9EF6}
-		{131C09C1-BF4D-47C1-AF13-4A7E30866B1E} = {CFA6E293-8A63-4164-BF5C-4610A0B3372E}
-		{3664126F-5535-4071-8F71-F019C6B19FA9} = {CFA6E293-8A63-4164-BF5C-4610A0B3372E}
+		{75CD2208-F000-4839-B492-50C38C63AEB9} = {2FA536C6-E68A-44AB-BCAD-DA1442F66F04}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {78D2CF6A-60A1-43E3-837B-00B73C9DA384}

eng/benchmarks/Silk.NET.Maths.Benchmarks/Silk.NET.Maths.Benchmarks.csproj

@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\sources\Maths\Silk.NET.Maths.csproj" />
+      <ProjectReference Include="..\..\..\sources\Maths\Maths\Silk.NET.Maths.csproj" />
     </ItemGroup>
 
 </Project>

eng/silktouch/common.rsp

@@ -27,3 +27,4 @@ multi-file
 trimmable-vtbls
 preview-codegen
 generate-file-scoped-namespaces
+exclude-using-statics-for-enums

eng/silktouch/opengl/settings.rsp

@@ -2,7 +2,7 @@
 --define-macro
 TODO_DEFINE_MACROS=HERE
 --headerFile
-header.txt
+../header.txt
 --include-directory
 ../../../submodules/opengl/api
 ../../../submodules/egl/api

generator.json

@@ -1,25 +1,28 @@
 {
   "Jobs": {
     "Microsoft": {
-      "ClangSharpResponseFiles": [
-        "eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
-      ],
-      "ManualOverrides": {
-        "sources/Windows/um/icm/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs",
-        "sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs",
-        "sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs",
-        "sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs"
-      },
-      "InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
-      "InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows",
-      "OutputSourceRoot": "sources/Windows",
-      "OutputTestRoot": "tests/Windows",
-      "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Solution": "Silk.NET.sln",
+      "SourceProject": "TODO.csproj",
+      "TestProject": "tests/TODO.csproj",
+      "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Mods": [
         "AddIncludes",
+        "ClangScraper",
         "ChangeNamespace"
       ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/submodules/terrafx.interop.windows/generation/**/generate.rsp"
+        ],
+        "ManualOverrides": {
+          "sources/Windows/um/icm/Windows.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Windows/um/icm/Windows.cs",
+          "sources/Gdiplus/um/gdiplustypes/GpRect.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRect.cs",
+          "sources/Gdiplus/um/gdiplustypes/GpRectF.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpRectF.cs",
+          "sources/Gdiplus/um/gdiplustypes/GpPathData.gen.cs": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows/Gdiplus/um/gdiplustypes/GpPathData.cs"
+        },
+        "InputSourceRoot": "eng/submodules/terrafx.interop.windows/sources/Interop/Windows",
+        "InputTestRoot": "eng/submodules/terrafx.interop.windows/tests/Interop/Windows"
+      },
       "ChangeNamespace": {
         "Mappings": {
           "TerraFX.Interop.(.*)": "Silk.NET.$1"
@@ -30,23 +33,26 @@
       ]
     },
     "SDL": {
-      "ClangSharpResponseFiles": [
-        "eng/silktouch/sdl/**/generate.rsp"
-      ],
-      "InputSourceRoot": "sources/SDL",
-      "InputTestRoot": "tests/SDL",
-      "OutputSourceRoot": "sources/SDL",
-      "OutputTestRoot": "tests/SDL",
+      "SourceProject": "sources/SDL/SDL/Silk.NET.SDL.csproj",
+      "TestProject": "tests/SDL/SDL/Silk.NET.SDL.UnitTests.csproj",
       "Solution": "Silk.NET.sln",
       "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Mods": [
         "AddIncludes",
+        "ClangScraper",
         "ExtractNestedTyping",
         "TransformHandles",
         "TransformFunctions",
         "PrettifyNames",
         "AddVTables"
       ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/silktouch/sdl/**/generate.rsp"
+        ],
+        "InputSourceRoot": "sources/SDL",
+        "InputTestRoot": "tests/SDL"
+      },
       "TransformHandles": {
         "AssumeMissingTypesOpaque": true,
         "UseDSL": true
@@ -58,24 +64,26 @@
       }
     },
     "OpenGL": {
-      "ClangSharpResponseFiles": [
-        "eng/silktouch/opengl/**/generate.rsp"
-      ],
-      "InputSourceRoot": "sources/OpenGL",
-      "InputTestRoot": "tests/OpenGL",
-      "OutputSourceRoot": "sources/OpenGL",
-      "OutputTestRoot": "tests/OpenGL",
+      "SourceProject": "sources/OpenGL/OpenGL/Silk.NET.OpenGL.csproj",
       "Solution": "Silk.NET.sln",
       "DefaultLicenseHeader": "eng/silktouch/header.txt",
       "Mods": [
         "AddIncludes",
+        "ClangScraper",
         "AddApiProfiles",
         "MixKhronosData",
         "AddOpaqueStructs",
         "TransformFunctions",
         "PrettifyNames",
         "AddVTables"
       ],
+      "ClangScraper": {
+        "ClangSharpResponseFiles": [
+          "eng/silktouch/opengl/**/generate.rsp"
+        ],
+        "InputSourceRoot": "sources/OpenGL",
+        "InputTestRoot": "tests/OpenGL"
+      },
       "AddApiProfiles": {
         "Profiles": [
           {

sources/Core/Core/Silk.NET.Core.cs

@@ -1,3 +1,3 @@
-// <auto-generated/>
+// <auto-generated/>
 global using static Silk.NET.Core.DSL;
-global using Silk.NET.Core;
+global using Silk.NET.Core;

sources/Core/Core/Silk.NET.Core.csproj

@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Analyzers\Silk.NET.Core.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <Folder Include="Core\" />
   </ItemGroup>
-
+  
   <!-- Dogfooding -->
   <Import Project="Silk.NET.Core.targets" />
 

sources/OpenGL/Enums/AccumOp.gen.cs → sources/OpenGL/OpenGL/Enums/AccumOp.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/AlphaFunction.gen.cs → sources/OpenGL/OpenGL/Enums/AlphaFunction.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/ArrayObjectPNameATI.gen.cs → sources/OpenGL/OpenGL/Enums/ArrayObjectPNameATI.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/ArrayObjectUsageATI.gen.cs → sources/OpenGL/OpenGL/Enums/ArrayObjectUsageATI.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/AtomicCounterBufferPName.gen.cs → sources/OpenGL/OpenGL/Enums/AtomicCounterBufferPName.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/AttribMask.gen.cs → sources/OpenGL/OpenGL/Enums/AttribMask.gen.cs

@@ -1,5 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
+// Ported from the OpenGL headers and corresponding dependencies.
+// Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
 namespace Silk.NET.OpenGL;
 
 [Transformed]

sources/OpenGL/Enums/AttributeType.gen.cs → sources/OpenGL/OpenGL/Enums/AttributeType.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -127,8 +127,6 @@ public enum AttributeType : uint
     UnsignedInt64Vec2ARB = unchecked((uint)0x8FF5),
     UnsignedInt64Vec3ARB = unchecked((uint)0x8FF6),
     UnsignedInt64Vec4ARB = unchecked((uint)0x8FF7),
-    Int64NV = unchecked((uint)0x140E),
-    UnsignedInt64NV = unchecked((uint)0x140F),
     FloatVec2ARB = unchecked((uint)0x8B50),
     FloatVec3ARB = unchecked((uint)0x8B51),
     FloatVec4ARB = unchecked((uint)0x8B52),
@@ -150,6 +148,8 @@ public enum AttributeType : uint
     Sampler2DShadowARB = unchecked((uint)0x8B62),
     Sampler2DRectARB = unchecked((uint)0x8B63),
     Sampler2DRectShadowARB = unchecked((uint)0x8B64),
+    Int64NV = unchecked((uint)0x140E),
+    UnsignedInt64NV = unchecked((uint)0x140F),
     Sampler3DOES = unchecked((uint)0x8B5F),
     Sampler2DShadowEXT = unchecked((uint)0x8B62),
     FloatMAT2X3NV = unchecked((uint)0x8B65),

sources/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs → sources/OpenGL/OpenGL/Enums/BindTransformFeedbackTarget.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/BinormalPointerType.gen.cs → sources/OpenGL/OpenGL/Enums/BinormalPointerType.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

sources/OpenGL/Enums/BlendEquationMode.gen.cs → sources/OpenGL/OpenGL/Enums/BlendEquationMode.gen.cs

@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// Ported from the OpenGL Core Profile headers and corresponding dependencies.
+// Ported from the OpenGL headers and corresponding dependencies.
 // Original source is Copyright 2013-2020 The Khronos Group Inc. Licensed under the MIT license.
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;