[OpenGL] Rewriting GLExtCaps (WIP)

Over-Run · Jan 31, 2024 · da927e3 · da927e3
1 parent af0157a
commit da927e3
Show file tree

Hide file tree

Showing 7 changed files with 660 additions and 668 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -18,5 +18,5 @@ jdkEnablePreview=true
 jdkEarlyAccessDoc=jdk22
 kotlinTargetJdkVersion=21
 
-overrunMarshalVersion=0.1.0-alpha.10-jdk22
+overrunMarshalVersion=0.1.0-alpha.12-jdk22
 overrunPlatformVersion=1.0.0
diff --git a/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/OpenGLGenerator.kt b/modules/overrungl.opengl/src/generator/kotlin/overrungl/opengl/OpenGLGenerator.kt
@@ -3173,7 +3173,6 @@ fun glExtCaps() {
             |import overrungl.opengl.ext.sun.*;
             |import overrun.marshal.Unmarshal;
             |
-            |import java.lang.foreign.MemorySegment;
             |import java.lang.foreign.SegmentAllocator;
             |import java.lang.invoke.MethodHandle;
             |import java.util.ArrayList;
@@ -3220,14 +3219,11 @@ fun glExtCaps() {
         appendLine("    }\n")
         appendLine(
             """
-            |    boolean findExtensionsGL(SegmentAllocator allocator, GLLoadFunc load, int version) {
-            |        var pExts = allocator.allocate(ADDRESS);
+            |    boolean findExtensionsGL(GLLoadFunc load, int version) {
             |        var list = new ArrayList<String>(700);
-            |        if (!getExtensions(allocator, version, pExts, list, load)) return false;
+            |        if (!getExtensions(load, version, list)) return false;
             |
-            |        String exts = Unmarshal.unmarshalAsString(pExts.get(Unmarshal.STR_LAYOUT, 0));
-            |
-            |        ${caps.joinToString(separator = "\n|        ") { "this.$it = hasExtension(version, exts, list, \"$it\");" }}
+            |        ${caps.joinToString(separator = "\n|        ") { "this.$it = list.contains(\"$it\");" }}
             |
             |        return true;
             |    }

diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL14C.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL14C.java
@@ -18,6 +18,7 @@
 
 import overrun.marshal.Marshal;
 import overrun.marshal.gen.Entrypoint;
+import overrun.marshal.gen.Skip;
 import overrungl.opengl.ext.arb.GLARBPointParameters;
 import overrungl.opengl.ext.arb.GLARBShadow;
 import overrungl.opengl.ext.arb.GLARBTextureMirroredRepeat;
@@ -100,7 +101,7 @@ default void multiDrawElements(int mode, MemorySegment count, int type, MemorySe
         throw new ContextException();
     }
 
-    @Entrypoint("glMultiDrawElements")
+    @Skip
     default void multiDrawElements(SegmentAllocator allocator, int mode, int[] count, int type, byte[][] indices, int drawCount) {
         var seg = allocator.allocate(ADDRESS, indices.length);
         for (int i = 0; i < indices.length; i++) {
@@ -109,7 +110,7 @@ default void multiDrawElements(SegmentAllocator allocator, int mode, int[] count
         multiDrawElements(mode, Marshal.marshal(allocator, count), type, seg, drawCount);
     }
 
-    @Entrypoint("glMultiDrawElements")
+    @Skip
     default void multiDrawElements(SegmentAllocator allocator, int mode, int[] count, int type, short[][] indices, int drawCount) {
         var seg = allocator.allocate(ADDRESS, indices.length);
         for (int i = 0; i < indices.length; i++) {
@@ -118,7 +119,7 @@ default void multiDrawElements(SegmentAllocator allocator, int mode, int[] count
         multiDrawElements(mode, Marshal.marshal(allocator, count), type, seg, drawCount);
     }
 
-    @Entrypoint("glMultiDrawElements")
+    @Skip
     default void multiDrawElements(SegmentAllocator allocator, int mode, int[] count, int type, int[][] indices, int drawCount) {
         var seg = allocator.allocate(ADDRESS, indices.length);
         for (int i = 0; i < indices.length; i++) {

diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLCapabilities.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLCapabilities.java
@@ -16,7 +16,6 @@
 
 package overrungl.opengl;
 
-import overrun.marshal.MemoryStack;
 import overrun.marshal.Unmarshal;
 
 import java.lang.foreign.FunctionDescriptor;
@@ -68,10 +67,7 @@ public int load(GLLoadFunc load) {
         int version = findCoreGL(glGetString);
 
         ext = new GLExtCaps(this);
-
-        try (var stack = MemoryStack.stackPush()) {
-            if (!ext.findExtensionsGL(stack, load, version)) return 0;
-        }
+        if (!ext.findExtensionsGL(load, version)) return 0;
         ext.load(load);
 
         rawGLVersion = version;