Revert "extended RuntimeConfig & version bump"

This reverts commit a926cde. # Conflicts: # RELEASE_NOTES.md
aardvark-platform · Dec 21, 2023 · 1b252b5 · 1b252b5
1 parent 58cd259
commit 1b252b5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -3,7 +3,6 @@
 
 ### 5.4.10-prerelease0003
 - [FontResolve] fixed null family name failure
-
 ### 5.4.10-prerelease0002
 - [PathSegment] minor fixes
 

diff --git a/src/Aardvark.Rendering.GL/Core/Config.fs b/src/Aardvark.Rendering.GL/Core/Config.fs
@@ -101,8 +101,6 @@ module RuntimeConfig =
     /// </summary>
     let mutable AllowConcurrentResourceAccess = false
 
-    let mutable AllowMultiDrawIndirect = false
-
 
 /// Reporting modes for OpenGL errors.
 type ErrorFlagCheck =

diff --git a/src/Aardvark.Rendering.GL/Instructions/OpenGL.fs b/src/Aardvark.Rendering.GL/Instructions/OpenGL.fs
@@ -665,20 +665,12 @@ module OpenGl =
         /// <summary>
         /// https://www.opengl.org/sdk/docs/man/html/glMultiDrawArraysIndirect.xhtml
         /// </summary>
-        let MultiDrawArraysIndirect = 
-            if RuntimeConfig.AllowMultiDrawIndirect then
-                getProcAddress "glMultiDrawArraysIndirect"
-            else 
-                0n
+        let MultiDrawArraysIndirect = getProcAddress "glMultiDrawArraysIndirect"
 
         /// <summary>
         /// https://www.opengl.org/sdk/docs/man/html/glMultiDrawElementsIndirect.xhtml
         /// </summary>
-        let MultiDrawElementsIndirect = 
-            if RuntimeConfig.AllowMultiDrawIndirect then
-                 getProcAddress "glMultiDrawElementsIndirect"
-            else
-                0n
+        let MultiDrawElementsIndirect = getProcAddress "glMultiDrawElementsIndirect"
 
 
         /// <summary>