Merge branch 'master' of github.com:opentk/opentk into delta-time-in-…

…resize-move
Mulwasteve · Jul 17, 2023 · 20536ff · 20536ff
2 parents e279a5c + 1532713
commit 20536ff
Show file tree

Hide file tree

Showing 67 changed files with 2,201 additions and 2,236 deletions.
diff --git a/OpenTK.sln b/OpenTK.sln
@@ -5,6 +5,7 @@ VisualStudioVersion = 17.3.32811.315
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{5EEEC96B-BD2F-45B0-935D-19E9E6D7D969}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
 		CONTRIBUTING.md = CONTRIBUTING.md
 		README.md = README.md

diff --git a/README.md b/README.md
@@ -52,7 +52,8 @@ Instructions
 
 OpenTK is available as a [NuGet Package](http://www.nuget.org/packages/OpenTK/).
 
-OpenTK 4 running on Windows requires "Visual C++ Redistributable 2015" to be installed to run.
+As of OpenTK 4.8 "Visual C++ Redistributable 2015" is not longer required to run OpenTK 4 on windows.
+For earlier versions of OpenTK 4 you can install any version of `OpenTK.redist.glfw >= 3.3.8.35` to remove the "Visual C++ Redistributable 2015" requirement.
 See https://github.com/opentk/glfw-redist for more details.
 
 News

diff --git a/src/Generator.Bind/Specifications/GL2/overrides.xml b/src/Generator.Bind/Specifications/GL2/overrides.xml
@@ -1598,6 +1598,18 @@
       </param>
     </function>
 
+    <function name="GetShadingRateImagePalette" extension="NV">
+      <param name="rate">
+        <type>NvShadingRateImage</type>
+      </param>
+    </function>
+
+    <function name="GetShadingRateSampleLocation" extension="NV">
+      <param name="rate">
+        <type>NvShadingRateImage</type>
+      </param>
+    </function>
+
     <function name="GetTrackMatrix" extension="NV">
       <param name="target">
         <type>AssemblyProgramTargetArb</type>
@@ -1637,6 +1649,24 @@
       </param>
     </function>
 
+    <function name="ShadingRateImagePalette" extension="NV">
+      <param name="rates">
+        <type>NvShadingRateImage</type>
+      </param>
+    </function>
+
+    <function name="ShadingRateSampleOrder" extension="NV">
+      <param name="order">
+        <type>NvShadingRateImage</type>
+      </param>
+    </function>
+
+    <function name="ShadingRateSampleOrderCustom" extension="NV">
+      <param name="rate">
+        <type>NvShadingRateImage</type>
+      </param>
+    </function>
+
     <function name="TrackMatrix" extension="NV">
       <param name="target">
         <type>AssemblyProgramTargetArb</type>

diff --git a/src/Generator.Bind/Specifications/GL2/signatures.xml b/src/Generator.Bind/Specifications/GL2/signatures.xml
@@ -13770,11 +13770,11 @@
     <function name="GetShadingRateImagePaletteNV" category="NV_shading_rate_image" extension="NV">
       <param name="viewport" type="GLuint" flow="in" />
       <param name="entry" type="GLuint" flow="in" />
-      <param name="rate" type="NvShadingRateImage *" flow="out" count="1" />
+      <param name="rate" type="GLenum *" flow="out" count="1" />
       <returns type="void" />
     </function>
     <function name="GetShadingRateSampleLocationivNV" category="NV_shading_rate_image" extension="NV">
-      <param name="rate" type="NvShadingRateImage" flow="in" />
+      <param name="rate" type="GLenum" flow="in" />
       <param name="samples" type="GLuint" flow="in" />
       <param name="index" type="GLuint" flow="in" />
       <param name="location" type="GLint *" flow="out" count="3" />
@@ -19292,17 +19292,17 @@
       <param name="viewport" type="GLuint" flow="in" />
       <param name="first" type="GLuint" flow="in" />
       <param name="count" type="GLsizei" flow="in" />
-      <param name="rates" type="NvShadingRateImage *" flow="in" count="count" />
+      <param name="rates" type="GLenum *" flow="in" count="count" />
       <returns type="void" />
     </function>
     <function name="ShadingRateSampleOrderCustomNV" category="NV_shading_rate_image" extension="NV">
-      <param name="rate" type="NvShadingRateImage" flow="in" />
+      <param name="rate" type="GLenum" flow="in" />
       <param name="samples" type="GLuint" flow="in" />
       <param name="locations" type="GLint *" flow="in" count="COMPSIZE(rate,samples)" />
       <returns type="void" />
     </function>
     <function name="ShadingRateSampleOrderNV" category="NV_shading_rate_image" extension="NV">
-      <param name="order" type="NvShadingRateImage" flow="in" />
+      <param name="order" type="GLenum" flow="in" />
       <returns type="void" />
     </function>
     <function name="SharpenTexFuncSGIS" category="SGIS_sharpen_texture" extension="SGIS">
@@ -39331,11 +39331,11 @@
     <function name="GetShadingRateImagePaletteNV" category="NV_shading_rate_image" extension="NV">
       <param name="viewport" type="GLuint" flow="in" />
       <param name="entry" type="GLuint" flow="in" />
-      <param name="rate" type="NvShadingRateImage *" flow="out" count="1" />
+      <param name="rate" type="GLenum *" flow="out" count="1" />
       <returns type="void" />
     </function>
     <function name="GetShadingRateSampleLocationivNV" category="NV_shading_rate_image" extension="NV">
-      <param name="rate" type="NvShadingRateImage" flow="in" />
+      <param name="rate" type="GLenum" flow="in" />
       <param name="samples" type="GLuint" flow="in" />
       <param name="index" type="GLuint" flow="in" />
       <param name="location" type="GLint *" flow="out" count="3" />
@@ -42320,17 +42320,17 @@
       <param name="viewport" type="GLuint" flow="in" />
       <param name="first" type="GLuint" flow="in" />
       <param name="count" type="GLsizei" flow="in" />
-      <param name="rates" type="NvShadingRateImage *" flow="in" count="count" />
+      <param name="rates" type="GLenum *" flow="in" count="count" />
       <returns type="void" />
     </function>
     <function name="ShadingRateSampleOrderCustomNV" category="NV_shading_rate_image" extension="NV">
-      <param name="rate" type="NvShadingRateImage" flow="in" />
+      <param name="rate" type="GLenum" flow="in" />
       <param name="samples" type="GLuint" flow="in" />
       <param name="locations" type="GLint *" flow="in" count="COMPSIZE(rate,samples)" />
       <returns type="void" />
     </function>
     <function name="ShadingRateSampleOrderNV" category="NV_shading_rate_image" extension="NV">
-      <param name="order" type="NvShadingRateImage" flow="in" />
+      <param name="order" type="GLenum" flow="in" />
       <returns type="void" />
     </function>
     <function name="SignalVkFenceNV" category="NV_draw_vulkan_image" extension="NV">
@@ -62922,11 +62922,11 @@
     <function name="GetShadingRateImagePaletteNV" category="NV_shading_rate_image" extension="NV">
       <param name="viewport" type="GLuint" flow="in" />
       <param name="entry" type="GLuint" flow="in" />
-      <param name="rate" type="NvShadingRateImage *" flow="out" count="1" />
+      <param name="rate" type="GLenum *" flow="out" count="1" />
       <returns type="void" />
     </function>
     <function name="GetShadingRateSampleLocationivNV" category="NV_shading_rate_image" extension="NV">
-      <param name="rate" type="NvShadingRateImage" flow="in" />
+      <param name="rate" type="GLenum" flow="in" />
       <param name="samples" type="GLuint" flow="in" />
       <param name="index" type="GLuint" flow="in" />
       <param name="location" type="GLint *" flow="out" count="3" />
@@ -64292,17 +64292,17 @@
       <param name="viewport" type="GLuint" flow="in" />
       <param name="first" type="GLuint" flow="in" />
       <param name="count" type="GLsizei" flow="in" />
-      <param name="rates" type="NvShadingRateImage *" flow="in" count="count" />
+      <param name="rates" type="GLenum *" flow="in" count="count" />
       <returns type="void" />
     </function>
     <function name="ShadingRateSampleOrderCustomNV" category="NV_shading_rate_image" extension="NV">
-      <param name="rate" type="NvShadingRateImage" flow="in" />
+      <param name="rate" type="GLenum" flow="in" />
       <param name="samples" type="GLuint" flow="in" />
       <param name="locations" type="GLint *" flow="in" count="COMPSIZE(rate,samples)" />
       <returns type="void" />
     </function>
     <function name="ShadingRateSampleOrderNV" category="NV_shading_rate_image" extension="NV">
-      <param name="order" type="NvShadingRateImage" flow="in" />
+      <param name="order" type="GLenum" flow="in" />
       <returns type="void" />
     </function>
     <function name="SignalSemaphoreEXT" category="EXT_semaphore" extension="EXT">

diff --git a/src/OpenAL/OpenTK.OpenAL/AL/AL.cs b/src/OpenAL/OpenTK.OpenAL/AL/AL.cs
@@ -474,14 +474,6 @@ public static void Source(int sid, ALSource3f param, ref Vector3 values)
         public static extern void Source(int sid, ALSourceb param, bool value);
         // FIXME: Double check that the mashaling here works!!
 
-        /// <summary>(Helper) Binds a Buffer to a Source handle.</summary>
-        /// <param name="source">Source name to attach the Buffer to.</param>
-        /// <param name="buffer">Buffer name which is attached to the Source.</param>
-        public static void BindBufferToSource(int source, int buffer)
-        {
-            Source(source, ALSourcei.Buffer, buffer);
-        }
-
         /// <summary>This function sets 3 integer properties of a source.</summary>
         /// <param name="sid">Source name whose attribute is being set.</param>
         /// <param name="param">The name of the attribute to set: EfxAuxiliarySendFilter..</param>
@@ -1094,23 +1086,5 @@ public static ALDistanceModel GetDistanceModel()
         {
             return (ALDistanceModel)Get(ALGetInteger.DistanceModel);
         }
-
-        /// <summary>(Helper) Returns Source state information.</summary>
-        /// <param name="sid">The source to be queried.</param>
-        /// <returns>state information from OpenAL.</returns>
-        public static ALSourceState GetSourceState(int sid)
-        {
-            GetSource(sid, ALGetSourcei.SourceState, out int state);
-            return (ALSourceState)state;
-        }
-
-        /// <summary>(Helper) Returns Source type information.</summary>
-        /// <param name="sid">The source to be queried.</param>
-        /// <returns>type information from OpenAL.</returns>
-        public static ALSourceType GetSourceType(int sid)
-        {
-            GetSource(sid, ALGetSourcei.SourceType, out int temp);
-            return (ALSourceType)temp;
-        }
     }
 }
diff --git a/src/OpenAL/OpenTK.OpenAL/ALC/ALC.cs b/src/OpenAL/OpenTK.OpenAL/ALC/ALC.cs
@@ -21,7 +21,7 @@
 namespace OpenTK.Audio.OpenAL
 {
     /// <summary>Alc = Audio Library Context.</summary>
-    public class ALC : ALBase
+    public partial class ALC : ALBase
     {
         internal const string Lib = AL.Lib;
         internal const CallingConvention AlcCallingConv = CallingConvention.Cdecl;