[OpenGL] Rewrite GL20C, GL30C, GL41C (WIP)

Over-Run · Jan 31, 2024 · bc8e131 · bc8e131
1 parent b36dbfa
commit bc8e131
Show file tree

Hide file tree

Showing 11 changed files with 1,886 additions and 3,342 deletions.
diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL20C.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL20C.java
diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL30C.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL30C.java
diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL41C.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GL41C.java
diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLCapabilities.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLCapabilities.java
@@ -33,24 +33,6 @@
  */
 public final class GLCapabilities {
     private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\.(\\d+).*$");
-    /**
-     * OpenGL 2.0 method handles
-     */
-    public MethodHandle glAttachShader, glBindAttribLocation, glBlendEquationSeparate, glCompileShader, glCreateProgram, glCreateShader,
-        glDeleteProgram, glDeleteShader, glDetachShader, glDisableVertexAttribArray, glDrawBuffers, glEnableVertexAttribArray,
-        glGetActiveAttrib, glGetActiveUniform, glGetAttachedShaders, glGetAttribLocation, glGetProgramInfoLog, glGetProgramiv,
-        glGetShaderInfoLog, glGetShaderSource, glGetShaderiv, glGetUniformLocation, glGetUniformfv, glGetUniformiv,
-        glGetVertexAttribPointerv, glGetVertexAttribdv, glGetVertexAttribfv, glGetVertexAttribiv, glIsProgram, glIsShader,
-        glLinkProgram, glShaderSource, glStencilFuncSeparate, glStencilMaskSeparate, glStencilOpSeparate, glUniform1f,
-        glUniform1fv, glUniform1i, glUniform1iv, glUniform2f, glUniform2fv, glUniform2i, glUniform2iv, glUniform3f,
-        glUniform3fv, glUniform3i, glUniform3iv, glUniform4f, glUniform4fv, glUniform4i, glUniform4iv, glUniformMatrix2fv,
-        glUniformMatrix3fv, glUniformMatrix4fv, glUseProgram, glValidateProgram, glVertexAttrib1d, glVertexAttrib1dv,
-        glVertexAttrib1f, glVertexAttrib1fv, glVertexAttrib1s, glVertexAttrib1sv, glVertexAttrib2d, glVertexAttrib2dv,
-        glVertexAttrib2f, glVertexAttrib2fv, glVertexAttrib2s, glVertexAttrib2sv, glVertexAttrib3d, glVertexAttrib3dv,
-        glVertexAttrib3f, glVertexAttrib3fv, glVertexAttrib3s, glVertexAttrib3sv, glVertexAttrib4Nbv, glVertexAttrib4Niv,
-        glVertexAttrib4Nsv, glVertexAttrib4Nub, glVertexAttrib4Nubv, glVertexAttrib4Nuiv, glVertexAttrib4Nusv, glVertexAttrib4bv,
-        glVertexAttrib4d, glVertexAttrib4dv, glVertexAttrib4f, glVertexAttrib4fv, glVertexAttrib4iv, glVertexAttrib4s,
-        glVertexAttrib4sv, glVertexAttrib4ubv, glVertexAttrib4uiv, glVertexAttrib4usv, glVertexAttribPointer;
     /**
      * OpenGL 3.0 method handles
      */
@@ -149,9 +131,6 @@ public int load(GLLoadFunc load) {
         final MethodHandle glGetString = load.invoke("glGetString", FunctionDescriptor.of(Unmarshal.STR_LAYOUT, ValueLayout.JAVA_INT));
         if (glGetString == null) return 0;
 
-        GL20C.load(this, load);
-        GL30C.load(this, load);
-        GL41C.load(this, load);
         GL45C.load(this, load);
 
         int version = findCoreGL(glGetString);

diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLLoadFunc.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLLoadFunc.java
@@ -31,7 +31,7 @@
  * {@snippet lang = java:
  * // loads OpenGL forward-compatible profile
  * import java.util.Objects;
- * Objects.requireNonNull(GLLoader.load(GLFW::getProcAddress, true), "Failed to load OpenGL");
+ * Objects.requireNonNull(GLLoader.load(glfw::getProcAddress), "Failed to load OpenGL");
  * }
  *
  * @author squid233

diff --git a/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLLoader.java b/modules/overrungl.opengl/src/main/java/overrungl/opengl/GLLoader.java
@@ -48,7 +48,8 @@
  * @since 0.1.0
  */
 public final class GLLoader {
-    private static final boolean DEFAULT_COMPATIBLE = false;
+    private static final boolean DEFAULT_COMPATIBLE = true;
+    @Deprecated(since = "0.1.0")
     private static final ThreadLocal<GLCapabilities> capabilitiesTLS = new ThreadLocal<>();
 
     /**
@@ -57,6 +58,7 @@ public final class GLLoader {
      * <p>This {@code GLCapabilities} instance will be used by any OpenGL call in the current thread, until {@code setCapabilities} is called again with a
      * different value.</p>
      */
+    @Deprecated(since = "0.1.0")
     public static void setCapabilities(@Nullable GLCapabilities caps) {
         capabilitiesTLS.set(caps);
     }
@@ -68,6 +70,7 @@ public static void setCapabilities(@Nullable GLCapabilities caps) {
      *
      * @see #getCapabilities()
      */
+    @Deprecated(since = "0.1.0")
     public static GLCapabilities getCapabilitiesSafe() {
         return capabilitiesTLS.get();
     }
@@ -78,6 +81,7 @@ public static GLCapabilities getCapabilitiesSafe() {
      * @throws IllegalStateException if {@link #setCapabilities} has never been called in the current thread or was last called with a {@code null} value
      * @see #getCapabilitiesSafe()
      */
+    @Deprecated(since = "0.1.0")
     public static GLCapabilities getCapabilities() {
         return checkCapabilities(capabilitiesTLS.get());
     }
@@ -92,10 +96,12 @@ public static GLCapabilities getCapabilities() {
      *
      * @throws IllegalStateException if {@link #setCapabilities} has never been called in the current thread or was last called with a {@code null} value
      */
+    @Deprecated(since = "0.1.0")
     public static GLExtCaps getExtCapabilities() {
         return getCapabilities().ext();
     }
 
+    @Deprecated(since = "0.1.0")
     private static GLCapabilities checkCapabilities(@Nullable GLCapabilities caps) {
         if (RuntimeHelper.CHECKS)
             CheckUtil.check(caps != null, """

diff --git a/modules/samples/src/test/java/overrungl/demo/glfw/GLFWWindowIconTest.java b/modules/samples/src/test/java/overrungl/demo/glfw/GLFWWindowIconTest.java
@@ -109,7 +109,7 @@ private void init(Arena arena) {
     }
 
     private void load() {
-        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress, true), "Failed to load OpenGL");
+        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress), "Failed to load OpenGL");
 
         GL.clearColor(0.4f, 0.6f, 0.9f, 1.0f);
     }

diff --git a/modules/samples/src/test/java/overrungl/demo/opengl/GL10Test.java b/modules/samples/src/test/java/overrungl/demo/opengl/GL10Test.java
@@ -81,7 +81,7 @@ private void init() {
     }
 
     private void load() {
-        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress), "Failed to load OpenGL");
+        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress, false), "Failed to load OpenGL");
 
         GL.clearColor(0.4f, 0.6f, 0.9f, 1.0f);
     }

diff --git a/modules/samples/src/test/java/overrungl/demo/opengl/GL15Test.java b/modules/samples/src/test/java/overrungl/demo/opengl/GL15Test.java
@@ -93,7 +93,7 @@ private void init() {
     }
 
     private void load(Arena arena) {
-        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress), "Failed to load OpenGL");
+        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress, false), "Failed to load OpenGL");
 
         GL.clearColor(0.4f, 0.6f, 0.9f, 1.0f);
         GL.enable(GL.TEXTURE_2D);

diff --git a/modules/samples/src/test/java/overrungl/demo/opengl/GL30Test.java b/modules/samples/src/test/java/overrungl/demo/opengl/GL30Test.java
@@ -99,7 +99,7 @@ private void init() {
     }
 
     private void load(Arena arena) {
-        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress, true), "Failed to load OpenGL");
+        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress), "Failed to load OpenGL");
 
         GL.clearColor(0.4f, 0.6f, 0.9f, 1.0f);
 

diff --git a/modules/samples/src/test/java/overrungl/demo/opengl/GL33Test.java b/modules/samples/src/test/java/overrungl/demo/opengl/GL33Test.java
@@ -111,7 +111,7 @@ private void init() {
     }
 
     private void load(Arena arena) {
-        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress, true), "Failed to load OpenGL");
+        Objects.requireNonNull(GLLoader.load(glfw::getProcAddress), "Failed to load OpenGL");
 
         debugProc = GLUtil.setupDebugMessageCallback();
         GL.clearColor(0.4f, 0.6f, 0.9f, 1.0f);