extended RuntimeConfig & version bump

aardvark-platform · Dec 19, 2023 · a926cde · a926cde
1 parent d641e6f
commit a926cde
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 5.4.10-prerelease0003
+- [GL] added flag to disable multidraw (experimental)
+
 ### 5.4.10-prerelease0003
 - [FontResolve] fixed null family name failure
 

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