From 520487da25a6afb1d1b8bc00883000616df82e6f Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 3 Jun 2023 10:42:08 +0100 Subject: [PATCH] Patch compiler errors in generated code again --- src/generated/java/org/lwjgl/opengl/Display.java | 9 --------- src/generated/java/org/lwjgl/opengl/Pbuffer.java | 2 +- src/generated/java/org/lwjgl/opengl/SharedDrawable.java | 4 ++-- src/generated/java/org/lwjgl/util/glu/GLU.java | 4 ++-- src/generated/java/org/lwjglx/openal/ALC10.java | 5 +++-- .../java/org/lwjglx/opengl/ARBFragmentProgram.java | 2 +- .../java/org/lwjglx/opengl/ARBPixelBufferObject.java | 2 +- .../java/org/lwjglx/opengl/ARBVertexBufferObject.java | 2 +- .../java/org/lwjglx/opengl/ARBVertexProgram.java | 2 +- .../java/org/lwjglx/opengl/EXTPixelBufferObject.java | 2 +- 10 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/generated/java/org/lwjgl/opengl/Display.java b/src/generated/java/org/lwjgl/opengl/Display.java index 897d9de..1aae90a 100644 --- a/src/generated/java/org/lwjgl/opengl/Display.java +++ b/src/generated/java/org/lwjgl/opengl/Display.java @@ -31,15 +31,6 @@ public class Display { throw new UnsupportedOperationException(); } - public static void create(org.lwjgl.opengl.PixelFormatLWJGL arg0, org.lwjgl.opengl.Drawable arg1, - org.lwjgl.opengles.ContextAttribs arg2) { - throw new UnsupportedOperationException(); - } - - public static void create(org.lwjgl.opengl.PixelFormatLWJGL arg0, org.lwjgl.opengles.ContextAttribs arg1) { - throw new UnsupportedOperationException(); - } - public static void destroy() { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/opengl/Pbuffer.java b/src/generated/java/org/lwjgl/opengl/Pbuffer.java index 2df6792..830c04b 100644 --- a/src/generated/java/org/lwjgl/opengl/Pbuffer.java +++ b/src/generated/java/org/lwjgl/opengl/Pbuffer.java @@ -1,6 +1,6 @@ package org.lwjgl.opengl; -public class Pbuffer extends org.lwjgl.opengl.DrawableGL { +public class Pbuffer extends org.lwjglx.opengl.DrawableGL { public static final int BACK_LEFT_BUFFER = (int) 8325; public static final int BACK_RIGHT_BUFFER = (int) 8326; diff --git a/src/generated/java/org/lwjgl/opengl/SharedDrawable.java b/src/generated/java/org/lwjgl/opengl/SharedDrawable.java index 93aaa89..95477bf 100644 --- a/src/generated/java/org/lwjgl/opengl/SharedDrawable.java +++ b/src/generated/java/org/lwjgl/opengl/SharedDrawable.java @@ -1,8 +1,8 @@ package org.lwjgl.opengl; -public class SharedDrawable extends org.lwjgl.opengl.DrawableGL { +public class SharedDrawable extends org.lwjglx.opengl.DrawableGL { - public org.lwjgl.opengl.ContextGL createSharedContext() { + public org.lwjglx.opengl.ContextGL createSharedContext() { throw new UnsupportedOperationException(); } diff --git a/src/generated/java/org/lwjgl/util/glu/GLU.java b/src/generated/java/org/lwjgl/util/glu/GLU.java index b174fb9..dd4afeb 100644 --- a/src/generated/java/org/lwjgl/util/glu/GLU.java +++ b/src/generated/java/org/lwjgl/util/glu/GLU.java @@ -14,7 +14,7 @@ public class GLU { public static final int GLU_ERROR = (int) 100103; public static final int GLU_EXTENSIONS = (int) 100801; public static final int GLU_EXTERIOR = (int) 100123; - public static final boolean GLU_FALSE = (boolean) 0; + public static final boolean GLU_FALSE = false; public static final int GLU_FILL = (int) 100012; public static final int GLU_FLAT = (int) 100001; public static final int GLU_INCOMPATIBLE_GL_VERSION = (int) 100903; @@ -110,7 +110,7 @@ public class GLU { public static final int GLU_TESS_WINDING_ODD = (int) 100130; public static final int GLU_TESS_WINDING_POSITIVE = (int) 100132; public static final int GLU_TESS_WINDING_RULE = (int) 100140; - public static final boolean GLU_TRUE = (boolean) 1; + public static final boolean GLU_TRUE = true; public static final int GLU_UNKNOWN = (int) 100124; public static final int GLU_U_STEP = (int) 100206; public static final int GLU_VERSION = (int) 100800; diff --git a/src/generated/java/org/lwjglx/openal/ALC10.java b/src/generated/java/org/lwjglx/openal/ALC10.java index 0ec27f1..65406f1 100644 --- a/src/generated/java/org/lwjglx/openal/ALC10.java +++ b/src/generated/java/org/lwjglx/openal/ALC10.java @@ -32,14 +32,15 @@ public class ALC10 { public static org.lwjglx.openal.ALCcontext alcCreateContext(org.lwjglx.openal.ALCdevice arg0, java.nio.IntBuffer arg1) { - org.lwjglx.openal.ALCcontext returnValue = org.lwjgl.openal.ALC10.alcCreateContext(arg0.device, arg1); + org.lwjglx.openal.ALCcontext returnValue = new ALCcontext( + org.lwjgl.openal.ALC10.alcCreateContext(arg0.device, arg1)); return returnValue; } public static org.lwjglx.openal.ALCcontext alcGetCurrentContext() { - org.lwjglx.openal.ALCcontext returnValue = org.lwjgl.openal.ALC10.alcGetCurrentContext(); + org.lwjglx.openal.ALCcontext returnValue = new ALCcontext(org.lwjgl.openal.ALC10.alcGetCurrentContext()); return returnValue; } diff --git a/src/generated/java/org/lwjglx/opengl/ARBFragmentProgram.java b/src/generated/java/org/lwjglx/opengl/ARBFragmentProgram.java index 73ea734..c13b998 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBFragmentProgram.java +++ b/src/generated/java/org/lwjglx/opengl/ARBFragmentProgram.java @@ -1,6 +1,6 @@ package org.lwjglx.opengl; -public class ARBFragmentProgram extends org.lwjglx.opengl.ARBProgram { +public class ARBFragmentProgram extends org.lwjgl.opengl.ARBProgram { public static final int GL_FRAGMENT_PROGRAM_ARB = (int) 34820; public static final int GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB = (int) 34827; diff --git a/src/generated/java/org/lwjglx/opengl/ARBPixelBufferObject.java b/src/generated/java/org/lwjglx/opengl/ARBPixelBufferObject.java index 2ecad79..1498aa9 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBPixelBufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/ARBPixelBufferObject.java @@ -1,6 +1,6 @@ package org.lwjglx.opengl; -public class ARBPixelBufferObject extends org.lwjglx.opengl.ARBBufferObject { +public class ARBPixelBufferObject extends org.lwjgl.opengl.ARBBufferObject { public static final int GL_PIXEL_PACK_BUFFER_ARB = (int) 35051; public static final int GL_PIXEL_PACK_BUFFER_BINDING_ARB = (int) 35053; diff --git a/src/generated/java/org/lwjglx/opengl/ARBVertexBufferObject.java b/src/generated/java/org/lwjglx/opengl/ARBVertexBufferObject.java index 122bf6b..35c9f65 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBVertexBufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/ARBVertexBufferObject.java @@ -1,6 +1,6 @@ package org.lwjglx.opengl; -public class ARBVertexBufferObject extends org.lwjglx.opengl.ARBBufferObject { +public class ARBVertexBufferObject extends org.lwjgl.opengl.ARBBufferObject { public static final int GL_ARRAY_BUFFER_ARB = (int) 34962; public static final int GL_ARRAY_BUFFER_BINDING_ARB = (int) 34964; diff --git a/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java b/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java index 8d5b68a..170db5c 100644 --- a/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java +++ b/src/generated/java/org/lwjglx/opengl/ARBVertexProgram.java @@ -1,6 +1,6 @@ package org.lwjglx.opengl; -public class ARBVertexProgram extends org.lwjglx.opengl.ARBProgram { +public class ARBVertexProgram extends org.lwjgl.opengl.ARBProgram { public static final int GL_COLOR_SUM_ARB = (int) 33880; public static final int GL_CURRENT_VERTEX_ATTRIB_ARB = (int) 34342; diff --git a/src/generated/java/org/lwjglx/opengl/EXTPixelBufferObject.java b/src/generated/java/org/lwjglx/opengl/EXTPixelBufferObject.java index a94573f..e7b9468 100644 --- a/src/generated/java/org/lwjglx/opengl/EXTPixelBufferObject.java +++ b/src/generated/java/org/lwjglx/opengl/EXTPixelBufferObject.java @@ -1,6 +1,6 @@ package org.lwjglx.opengl; -public class EXTPixelBufferObject extends org.lwjglx.opengl.ARBBufferObject { +public class EXTPixelBufferObject extends org.lwjgl.opengl.ARBBufferObject { public static final int GL_PIXEL_PACK_BUFFER_BINDING_EXT = (int) 35053; public static final int GL_PIXEL_PACK_BUFFER_EXT = (int) 35051;