From fecbafc097202285b6c96909263ee7e9d619b6ed Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 4 Apr 2005 11:19:18 +0000 Subject: [PATCH] Don't emit initNativeStub() when generating context-specific OpenGL java classes --- src/java/org/lwjgl/opengl/ARBBufferObject.java | 1 - src/java/org/lwjgl/opengl/ARBColorBufferFloat.java | 1 - src/java/org/lwjgl/opengl/ARBDrawBuffers.java | 1 - src/java/org/lwjgl/opengl/ARBImaging.java | 1 - src/java/org/lwjgl/opengl/ARBMatrixPalette.java | 1 - src/java/org/lwjgl/opengl/ARBMultisample.java | 1 - src/java/org/lwjgl/opengl/ARBMultitexture.java | 1 - src/java/org/lwjgl/opengl/ARBOcclusionQuery.java | 1 - src/java/org/lwjgl/opengl/ARBPointParameters.java | 1 - src/java/org/lwjgl/opengl/ARBProgram.java | 1 - src/java/org/lwjgl/opengl/ARBShaderObjects.java | 1 - src/java/org/lwjgl/opengl/ARBTextureCompression.java | 1 - src/java/org/lwjgl/opengl/ARBTransposeMatrix.java | 1 - src/java/org/lwjgl/opengl/ARBVertexBlend.java | 1 - src/java/org/lwjgl/opengl/ARBVertexProgram.java | 1 - src/java/org/lwjgl/opengl/ARBVertexShader.java | 1 - src/java/org/lwjgl/opengl/ARBWindowPos.java | 1 - src/java/org/lwjgl/opengl/ATIDrawBuffers.java | 1 - src/java/org/lwjgl/opengl/ATIElementArray.java | 1 - src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java | 1 - src/java/org/lwjgl/opengl/ATIFragmentShader.java | 1 - src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java | 1 - src/java/org/lwjgl/opengl/ATIPnTriangles.java | 1 - src/java/org/lwjgl/opengl/ATISeparateStencil.java | 1 - src/java/org/lwjgl/opengl/ATIVertexArrayObject.java | 1 - src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java | 1 - src/java/org/lwjgl/opengl/ATIVertexStreams.java | 1 - src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java | 1 - src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java | 1 - src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java | 1 - src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java | 1 - src/java/org/lwjgl/opengl/EXTDrawRangeElements.java | 1 - src/java/org/lwjgl/opengl/EXTFogCoord.java | 1 - src/java/org/lwjgl/opengl/EXTFramebufferObject.java | 1 - src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java | 1 - src/java/org/lwjgl/opengl/EXTPalettedTexture.java | 1 - src/java/org/lwjgl/opengl/EXTPointParameters.java | 1 - src/java/org/lwjgl/opengl/EXTSecondaryColor.java | 1 - src/java/org/lwjgl/opengl/EXTStencilTwoSide.java | 1 - src/java/org/lwjgl/opengl/EXTVertexShader.java | 1 - src/java/org/lwjgl/opengl/EXTVertexWeighting.java | 1 - src/java/org/lwjgl/opengl/GL11.java | 1 - src/java/org/lwjgl/opengl/GL12.java | 1 - src/java/org/lwjgl/opengl/GL13.java | 1 - src/java/org/lwjgl/opengl/GL14.java | 1 - src/java/org/lwjgl/opengl/GL15.java | 1 - src/java/org/lwjgl/opengl/GL20.java | 1 - src/java/org/lwjgl/opengl/NVEvaluators.java | 1 - src/java/org/lwjgl/opengl/NVFence.java | 1 - src/java/org/lwjgl/opengl/NVFragmentProgram.java | 1 - src/java/org/lwjgl/opengl/NVHalfFloat.java | 1 - src/java/org/lwjgl/opengl/NVOcclusionQuery.java | 1 - src/java/org/lwjgl/opengl/NVPixelDataRange.java | 1 - src/java/org/lwjgl/opengl/NVPointSprite.java | 1 - src/java/org/lwjgl/opengl/NVPrimitiveRestart.java | 1 - src/java/org/lwjgl/opengl/NVProgram.java | 1 - src/java/org/lwjgl/opengl/NVRegisterCombiners.java | 1 - src/java/org/lwjgl/opengl/NVRegisterCombiners2.java | 1 - src/java/org/lwjgl/opengl/NVVertexArrayRange.java | 1 - src/java/org/lwjgl/opengl/NVVertexProgram.java | 1 - .../lwjgl/util/generator/ContextCapabilitiesGenerator.java | 4 ++-- src/java/org/lwjgl/util/generator/GeneratorVisitor.java | 2 +- 62 files changed, 3 insertions(+), 63 deletions(-) diff --git a/src/java/org/lwjgl/opengl/ARBBufferObject.java b/src/java/org/lwjgl/opengl/ARBBufferObject.java index cab0b714..e9526911 100644 --- a/src/java/org/lwjgl/opengl/ARBBufferObject.java +++ b/src/java/org/lwjgl/opengl/ARBBufferObject.java @@ -25,7 +25,6 @@ public class ARBBufferObject { public static final int GL_STREAM_READ_ARB = 0x88e1; public static final int GL_STREAM_DRAW_ARB = 0x88e0; - static native void initNativeStubs() throws LWJGLException; public static java.nio.ByteBuffer glGetBufferPointerARB(int target, int pname, int result_size) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferPointervARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBColorBufferFloat.java b/src/java/org/lwjgl/opengl/ARBColorBufferFloat.java index b281f74c..7a4f5545 100644 --- a/src/java/org/lwjgl/opengl/ARBColorBufferFloat.java +++ b/src/java/org/lwjgl/opengl/ARBColorBufferFloat.java @@ -16,7 +16,6 @@ public final class ARBColorBufferFloat { private ARBColorBufferFloat() { } - static native void initNativeStubs() throws LWJGLException; public static void glClampColorARB(int target, int clamp) { long function_pointer = GLContext.getCapabilities().ARB_color_buffer_float_glClampColorARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBDrawBuffers.java b/src/java/org/lwjgl/opengl/ARBDrawBuffers.java index f1d9baf6..7a4b5675 100644 --- a/src/java/org/lwjgl/opengl/ARBDrawBuffers.java +++ b/src/java/org/lwjgl/opengl/ARBDrawBuffers.java @@ -28,7 +28,6 @@ public final class ARBDrawBuffers { private ARBDrawBuffers() { } - static native void initNativeStubs() throws LWJGLException; public static void glDrawBuffersARB(IntBuffer buffers) { long function_pointer = GLContext.getCapabilities().ARB_draw_buffers_glDrawBuffersARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBImaging.java b/src/java/org/lwjgl/opengl/ARBImaging.java index b783e419..ee703503 100644 --- a/src/java/org/lwjgl/opengl/ARBImaging.java +++ b/src/java/org/lwjgl/opengl/ARBImaging.java @@ -86,7 +86,6 @@ public final class ARBImaging { private ARBImaging() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ByteBuffer span) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java index 9e54dc28..e9113da4 100644 --- a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java +++ b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java @@ -21,7 +21,6 @@ public final class ARBMatrixPalette { private ARBMatrixPalette() { } - static native void initNativeStubs() throws LWJGLException; public static void glMatrixIndexuARB(IntBuffer pIndices) { long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexuivARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBMultisample.java b/src/java/org/lwjgl/opengl/ARBMultisample.java index 01dfd5ef..41a3316a 100644 --- a/src/java/org/lwjgl/opengl/ARBMultisample.java +++ b/src/java/org/lwjgl/opengl/ARBMultisample.java @@ -20,7 +20,6 @@ public final class ARBMultisample { private ARBMultisample() { } - static native void initNativeStubs() throws LWJGLException; public static void glSampleCoverageARB(float value, boolean invert) { long function_pointer = GLContext.getCapabilities().ARB_multisample_glSampleCoverageARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBMultitexture.java b/src/java/org/lwjgl/opengl/ARBMultitexture.java index 7d7545b1..d3c5527d 100644 --- a/src/java/org/lwjgl/opengl/ARBMultitexture.java +++ b/src/java/org/lwjgl/opengl/ARBMultitexture.java @@ -46,7 +46,6 @@ public final class ARBMultitexture { private ARBMultitexture() { } - static native void initNativeStubs() throws LWJGLException; public static void glMultiTexCoord4sARB(int target, short s, short t, short r, short q) { long function_pointer = GLContext.getCapabilities().ARB_multitexture_glMultiTexCoord4sARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java b/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java index 102d1afc..333a5254 100644 --- a/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java +++ b/src/java/org/lwjgl/opengl/ARBOcclusionQuery.java @@ -16,7 +16,6 @@ public final class ARBOcclusionQuery { private ARBOcclusionQuery() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetQueryObjectuARB(int id, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().ARB_occlusion_query_glGetQueryObjectuivARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBPointParameters.java b/src/java/org/lwjgl/opengl/ARBPointParameters.java index 50ef104b..e74c21ce 100644 --- a/src/java/org/lwjgl/opengl/ARBPointParameters.java +++ b/src/java/org/lwjgl/opengl/ARBPointParameters.java @@ -15,7 +15,6 @@ public final class ARBPointParameters { private ARBPointParameters() { } - static native void initNativeStubs() throws LWJGLException; public static void glPointParameterARB(int pname, FloatBuffer pfParams) { long function_pointer = GLContext.getCapabilities().ARB_point_parameters_glPointParameterfvARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBProgram.java b/src/java/org/lwjgl/opengl/ARBProgram.java index 295b28a5..7bc89819 100644 --- a/src/java/org/lwjgl/opengl/ARBProgram.java +++ b/src/java/org/lwjgl/opengl/ARBProgram.java @@ -71,7 +71,6 @@ public class ARBProgram { public static final int GL_PROGRAM_LENGTH_ARB = 0x8627; public static final int GL_PROGRAM_FORMAT_ASCII_ARB = 0x8875; - static native void initNativeStubs() throws LWJGLException; public static boolean glIsProgramARB(int program) { long function_pointer = GLContext.getCapabilities().ARB_program_glIsProgramARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBShaderObjects.java b/src/java/org/lwjgl/opengl/ARBShaderObjects.java index f33c97b6..e5014f4a 100644 --- a/src/java/org/lwjgl/opengl/ARBShaderObjects.java +++ b/src/java/org/lwjgl/opengl/ARBShaderObjects.java @@ -47,7 +47,6 @@ public final class ARBShaderObjects { private ARBShaderObjects() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetShaderSourceARB(int obj, IntBuffer length, ByteBuffer source) { long function_pointer = GLContext.getCapabilities().ARB_shader_objects_glGetShaderSourceARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBTextureCompression.java b/src/java/org/lwjgl/opengl/ARBTextureCompression.java index 526fad65..4338ad0e 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureCompression.java +++ b/src/java/org/lwjgl/opengl/ARBTextureCompression.java @@ -22,7 +22,6 @@ public final class ARBTextureCompression { private ARBTextureCompression() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java b/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java index 586c2d46..8f872952 100644 --- a/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java +++ b/src/java/org/lwjgl/opengl/ARBTransposeMatrix.java @@ -15,7 +15,6 @@ public final class ARBTransposeMatrix { private ARBTransposeMatrix() { } - static native void initNativeStubs() throws LWJGLException; public static void glMultTransposeMatrixARB(FloatBuffer pfMtx) { long function_pointer = GLContext.getCapabilities().ARB_transpose_matrix_glMultTransposeMatrixfARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBVertexBlend.java b/src/java/org/lwjgl/opengl/ARBVertexBlend.java index c8aa6779..e4c72905 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexBlend.java +++ b/src/java/org/lwjgl/opengl/ARBVertexBlend.java @@ -53,7 +53,6 @@ public final class ARBVertexBlend { private ARBVertexBlend() { } - static native void initNativeStubs() throws LWJGLException; public static void glVertexBlendARB(int count) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glVertexBlendARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/java/org/lwjgl/opengl/ARBVertexProgram.java index 181948cd..ffc4f572 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexProgram.java +++ b/src/java/org/lwjgl/opengl/ARBVertexProgram.java @@ -27,7 +27,6 @@ public final class ARBVertexProgram extends ARBProgram { private ARBVertexProgram() { } - static native void initNativeStubs() throws LWJGLException; public static java.nio.ByteBuffer glGetVertexAttribPointerARB(int index, int pname, int result_size) { long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glGetVertexAttribPointervARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBVertexShader.java b/src/java/org/lwjgl/opengl/ARBVertexShader.java index 2cff48a4..f9bf498c 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexShader.java +++ b/src/java/org/lwjgl/opengl/ARBVertexShader.java @@ -37,7 +37,6 @@ public final class ARBVertexShader { private ARBVertexShader() { } - static native void initNativeStubs() throws LWJGLException; public static int glGetAttribLocationARB(int programObj, ByteBuffer name) { long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glGetAttribLocationARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ARBWindowPos.java b/src/java/org/lwjgl/opengl/ARBWindowPos.java index 899a1b40..58d756c3 100644 --- a/src/java/org/lwjgl/opengl/ARBWindowPos.java +++ b/src/java/org/lwjgl/opengl/ARBWindowPos.java @@ -11,7 +11,6 @@ public final class ARBWindowPos { private ARBWindowPos() { } - static native void initNativeStubs() throws LWJGLException; public static void glWindowPos3sARB(short x, short y, short z) { long function_pointer = GLContext.getCapabilities().ARB_window_pos_glWindowPos3sARB_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIDrawBuffers.java b/src/java/org/lwjgl/opengl/ATIDrawBuffers.java index c651839c..7389c668 100644 --- a/src/java/org/lwjgl/opengl/ATIDrawBuffers.java +++ b/src/java/org/lwjgl/opengl/ATIDrawBuffers.java @@ -28,7 +28,6 @@ public final class ATIDrawBuffers { private ATIDrawBuffers() { } - static native void initNativeStubs() throws LWJGLException; public static void glDrawBuffersATI(IntBuffer buffers) { long function_pointer = GLContext.getCapabilities().ATI_draw_buffers_glDrawBuffersATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIElementArray.java b/src/java/org/lwjgl/opengl/ATIElementArray.java index d9ab1ac6..12e5661c 100644 --- a/src/java/org/lwjgl/opengl/ATIElementArray.java +++ b/src/java/org/lwjgl/opengl/ATIElementArray.java @@ -14,7 +14,6 @@ public final class ATIElementArray { private ATIElementArray() { } - static native void initNativeStubs() throws LWJGLException; public static void glDrawRangeElementArrayATI(int mode, int start, int end, int count) { long function_pointer = GLContext.getCapabilities().ATI_element_array_glDrawRangeElementArrayATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java b/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java index 5fbc334d..1b9e915e 100644 --- a/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java +++ b/src/java/org/lwjgl/opengl/ATIEnvmapBumpmap.java @@ -19,7 +19,6 @@ public final class ATIEnvmapBumpmap { private ATIEnvmapBumpmap() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetTexBumpParameterATI(int pname, IntBuffer param) { long function_pointer = GLContext.getCapabilities().ATI_envmap_bumpmap_glGetTexBumpParameterivATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIFragmentShader.java b/src/java/org/lwjgl/opengl/ATIFragmentShader.java index 6457a09f..4e3b5bbf 100644 --- a/src/java/org/lwjgl/opengl/ATIFragmentShader.java +++ b/src/java/org/lwjgl/opengl/ATIFragmentShader.java @@ -115,7 +115,6 @@ public final class ATIFragmentShader { private ATIFragmentShader() { } - static native void initNativeStubs() throws LWJGLException; public static void glSetFragmentShaderConstantATI(int dst, FloatBuffer pfValue) { long function_pointer = GLContext.getCapabilities().ATI_fragment_shader_glSetFragmentShaderConstantATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java b/src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java index b9a192c1..a614fc3b 100644 --- a/src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java +++ b/src/java/org/lwjgl/opengl/ATIMapObjectBuffer.java @@ -11,7 +11,6 @@ public final class ATIMapObjectBuffer { private ATIMapObjectBuffer() { } - static native void initNativeStubs() throws LWJGLException; public static void glUnmapObjectBufferATI(int buffer) { long function_pointer = GLContext.getCapabilities().ATI_map_object_buffer_glUnmapObjectBufferATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIPnTriangles.java b/src/java/org/lwjgl/opengl/ATIPnTriangles.java index 9ba080d8..6c0a2da9 100644 --- a/src/java/org/lwjgl/opengl/ATIPnTriangles.java +++ b/src/java/org/lwjgl/opengl/ATIPnTriangles.java @@ -20,7 +20,6 @@ public final class ATIPnTriangles { private ATIPnTriangles() { } - static native void initNativeStubs() throws LWJGLException; public static void glPNTrianglesiATI(int pname, int param) { long function_pointer = GLContext.getCapabilities().ATI_pn_triangles_glPNTrianglesiATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATISeparateStencil.java b/src/java/org/lwjgl/opengl/ATISeparateStencil.java index c89a4206..de06d982 100644 --- a/src/java/org/lwjgl/opengl/ATISeparateStencil.java +++ b/src/java/org/lwjgl/opengl/ATISeparateStencil.java @@ -15,7 +15,6 @@ public final class ATISeparateStencil { private ATISeparateStencil() { } - static native void initNativeStubs() throws LWJGLException; public static void glStencilFuncSeparateATI(int frontfunc, int backfunc, int ref, int mask) { long function_pointer = GLContext.getCapabilities().ATI_separate_stencil_glStencilFuncSeparateATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java index d9d85fe1..a509dcef 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java +++ b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java @@ -19,7 +19,6 @@ public final class ATIVertexArrayObject { private ATIVertexArrayObject() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetVariantArrayObjectATI(int id, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glGetVariantArrayObjectivATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java b/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java index 18140deb..60924a4b 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java +++ b/src/java/org/lwjgl/opengl/ATIVertexAttribArrayObject.java @@ -11,7 +11,6 @@ public final class ATIVertexAttribArrayObject { private ATIVertexAttribArrayObject() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetVertexAttribArrayObjectATI(int index, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().ATI_vertex_attrib_array_object_glGetVertexAttribArrayObjectivATI_pointer; diff --git a/src/java/org/lwjgl/opengl/ATIVertexStreams.java b/src/java/org/lwjgl/opengl/ATIVertexStreams.java index 5d65f1fe..81d3a7dd 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexStreams.java +++ b/src/java/org/lwjgl/opengl/ATIVertexStreams.java @@ -21,7 +21,6 @@ public final class ATIVertexStreams { private ATIVertexStreams() { } - static native void initNativeStubs() throws LWJGLException; public static void glVertexBlendEnviATI(int pname, int param) { long function_pointer = GLContext.getCapabilities().ATI_vertex_streams_glVertexBlendEnviATI_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java b/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java index cd2dc8a3..8e687b3f 100644 --- a/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java +++ b/src/java/org/lwjgl/opengl/EXTBlendEquationSeparate.java @@ -13,7 +13,6 @@ public final class EXTBlendEquationSeparate { private EXTBlendEquationSeparate() { } - static native void initNativeStubs() throws LWJGLException; public static void glBlendEquationSeparateEXT(int modeRGB, int modeAlpha) { long function_pointer = GLContext.getCapabilities().EXT_blend_equation_separate_glBlendEquationSeparateEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java b/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java index 99d76e25..43e502b8 100644 --- a/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java +++ b/src/java/org/lwjgl/opengl/EXTBlendFuncSeparate.java @@ -15,7 +15,6 @@ public final class EXTBlendFuncSeparate { private EXTBlendFuncSeparate() { } - static native void initNativeStubs() throws LWJGLException; public static void glBlendFuncSeparateEXT(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) { long function_pointer = GLContext.getCapabilities().EXT_blend_func_separate_glBlendFuncSeparateEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java b/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java index 37491005..12d868b9 100644 --- a/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java +++ b/src/java/org/lwjgl/opengl/EXTCompiledVertexArray.java @@ -13,7 +13,6 @@ public final class EXTCompiledVertexArray { private EXTCompiledVertexArray() { } - static native void initNativeStubs() throws LWJGLException; public static void glUnlockArraysEXT() { long function_pointer = GLContext.getCapabilities().EXT_compiled_vertex_array_glUnlockArraysEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java b/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java index a6090306..4e024112 100644 --- a/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java +++ b/src/java/org/lwjgl/opengl/EXTDepthBoundsTest.java @@ -13,7 +13,6 @@ public final class EXTDepthBoundsTest { private EXTDepthBoundsTest() { } - static native void initNativeStubs() throws LWJGLException; public static void glDepthBoundsEXT(double zmin, double zmax) { long function_pointer = GLContext.getCapabilities().EXT_depth_bounds_test_glDepthBoundsEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java index 3a59c936..ba017ae0 100644 --- a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java +++ b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java @@ -13,7 +13,6 @@ public final class EXTDrawRangeElements { private EXTDrawRangeElements() { } - static native void initNativeStubs() throws LWJGLException; public static void glDrawRangeElementsEXT(int mode, int start, int end, ByteBuffer pIndices) { long function_pointer = GLContext.getCapabilities().EXT_draw_range_elements_glDrawRangeElementsEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTFogCoord.java b/src/java/org/lwjgl/opengl/EXTFogCoord.java index 5c81bdf6..130bb7ff 100644 --- a/src/java/org/lwjgl/opengl/EXTFogCoord.java +++ b/src/java/org/lwjgl/opengl/EXTFogCoord.java @@ -19,7 +19,6 @@ public final class EXTFogCoord { private EXTFogCoord() { } - static native void initNativeStubs() throws LWJGLException; public static void glFogCoordPointerEXT(int stride, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().EXT_fog_coord_glFogCoordPointerEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTFramebufferObject.java b/src/java/org/lwjgl/opengl/EXTFramebufferObject.java index 77cedccc..6497a59c 100644 --- a/src/java/org/lwjgl/opengl/EXTFramebufferObject.java +++ b/src/java/org/lwjgl/opengl/EXTFramebufferObject.java @@ -68,7 +68,6 @@ public final class EXTFramebufferObject { private EXTFramebufferObject() { } - static native void initNativeStubs() throws LWJGLException; public static void glGenerateMipmapEXT(int target) { long function_pointer = GLContext.getCapabilities().EXT_framebuffer_object_glGenerateMipmapEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java b/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java index a02c1f7a..7fd08240 100644 --- a/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java +++ b/src/java/org/lwjgl/opengl/EXTMultiDrawArrays.java @@ -11,7 +11,6 @@ public final class EXTMultiDrawArrays { private EXTMultiDrawArrays() { } - static native void initNativeStubs() throws LWJGLException; public static void glMultiDrawArraysEXT(int mode, IntBuffer piFirst, IntBuffer piCount) { if (piFirst.remaining() != piCount.remaining()) { diff --git a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java b/src/java/org/lwjgl/opengl/EXTPalettedTexture.java index 92ad7c90..1ea05a58 100644 --- a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java +++ b/src/java/org/lwjgl/opengl/EXTPalettedTexture.java @@ -26,7 +26,6 @@ public final class EXTPalettedTexture { private EXTPalettedTexture() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetColorTableParameterEXT(int target, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableParameterfvEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTPointParameters.java b/src/java/org/lwjgl/opengl/EXTPointParameters.java index dc284824..4dcd5b86 100644 --- a/src/java/org/lwjgl/opengl/EXTPointParameters.java +++ b/src/java/org/lwjgl/opengl/EXTPointParameters.java @@ -15,7 +15,6 @@ public final class EXTPointParameters { private EXTPointParameters() { } - static native void initNativeStubs() throws LWJGLException; public static void glPointParameterEXT(int pname, FloatBuffer pfParams) { long function_pointer = GLContext.getCapabilities().EXT_point_parameters_glPointParameterfvEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTSecondaryColor.java b/src/java/org/lwjgl/opengl/EXTSecondaryColor.java index be320a2b..02d515b4 100644 --- a/src/java/org/lwjgl/opengl/EXTSecondaryColor.java +++ b/src/java/org/lwjgl/opengl/EXTSecondaryColor.java @@ -18,7 +18,6 @@ public final class EXTSecondaryColor { private EXTSecondaryColor() { } - static native void initNativeStubs() throws LWJGLException; public static void glSecondaryColorPointerEXT(int size, int stride, FloatBuffer pPointer) { long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColorPointerEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java b/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java index 1d3e21f0..8c790954 100644 --- a/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java +++ b/src/java/org/lwjgl/opengl/EXTStencilTwoSide.java @@ -13,7 +13,6 @@ public final class EXTStencilTwoSide { private EXTStencilTwoSide() { } - static native void initNativeStubs() throws LWJGLException; public static void glActiveStencilFaceEXT(int face) { long function_pointer = GLContext.getCapabilities().EXT_stencil_two_side_glActiveStencilFaceEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTVertexShader.java b/src/java/org/lwjgl/opengl/EXTVertexShader.java index 06672b29..347819f9 100644 --- a/src/java/org/lwjgl/opengl/EXTVertexShader.java +++ b/src/java/org/lwjgl/opengl/EXTVertexShader.java @@ -121,7 +121,6 @@ public final class EXTVertexShader { private EXTVertexShader() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetLocalConstantFloatEXT(int id, int value, FloatBuffer pbData) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glGetLocalConstantFloatvEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/EXTVertexWeighting.java b/src/java/org/lwjgl/opengl/EXTVertexWeighting.java index d88b113a..55085a3c 100644 --- a/src/java/org/lwjgl/opengl/EXTVertexWeighting.java +++ b/src/java/org/lwjgl/opengl/EXTVertexWeighting.java @@ -24,7 +24,6 @@ public final class EXTVertexWeighting { private EXTVertexWeighting() { } - static native void initNativeStubs() throws LWJGLException; public static void glVertexWeightPointerEXT(int size, int stride, FloatBuffer pPointer) { long function_pointer = GLContext.getCapabilities().EXT_vertex_weighting_glVertexWeightPointerEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/GL11.java b/src/java/org/lwjgl/opengl/GL11.java index 606fba05..b0146237 100644 --- a/src/java/org/lwjgl/opengl/GL11.java +++ b/src/java/org/lwjgl/opengl/GL11.java @@ -543,7 +543,6 @@ public final class GL11 { private GL11() { } - static native void initNativeStubs() throws LWJGLException; public static void glViewport(int x, int y, int width, int height) { long function_pointer = GLContext.getCapabilities().GL11_glViewport_pointer; diff --git a/src/java/org/lwjgl/opengl/GL12.java b/src/java/org/lwjgl/opengl/GL12.java index b81cab0d..e6e1d1cf 100644 --- a/src/java/org/lwjgl/opengl/GL12.java +++ b/src/java/org/lwjgl/opengl/GL12.java @@ -48,7 +48,6 @@ public final class GL12 { private GL12() { } - static native void initNativeStubs() throws LWJGLException; public static void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height) { long function_pointer = GLContext.getCapabilities().GL12_glCopyTexSubImage3D_pointer; diff --git a/src/java/org/lwjgl/opengl/GL13.java b/src/java/org/lwjgl/opengl/GL13.java index 6f104c7e..bfe483c6 100644 --- a/src/java/org/lwjgl/opengl/GL13.java +++ b/src/java/org/lwjgl/opengl/GL13.java @@ -107,7 +107,6 @@ public final class GL13 { private GL13() { } - static native void initNativeStubs() throws LWJGLException; public static void glSampleCoverage(float value, boolean invert) { long function_pointer = GLContext.getCapabilities().GL13_glSampleCoverage_pointer; diff --git a/src/java/org/lwjgl/opengl/GL14.java b/src/java/org/lwjgl/opengl/GL14.java index b1122e56..8277e146 100644 --- a/src/java/org/lwjgl/opengl/GL14.java +++ b/src/java/org/lwjgl/opengl/GL14.java @@ -50,7 +50,6 @@ public final class GL14 { private GL14() { } - static native void initNativeStubs() throws LWJGLException; public static void glWindowPos3i(int x, int y, int z) { long function_pointer = GLContext.getCapabilities().GL14_glWindowPos3i_pointer; diff --git a/src/java/org/lwjgl/opengl/GL15.java b/src/java/org/lwjgl/opengl/GL15.java index b27585ec..c11c6225 100644 --- a/src/java/org/lwjgl/opengl/GL15.java +++ b/src/java/org/lwjgl/opengl/GL15.java @@ -47,7 +47,6 @@ public final class GL15 { private GL15() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetQueryObjectu(int id, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().GL15_glGetQueryObjectuiv_pointer; diff --git a/src/java/org/lwjgl/opengl/GL20.java b/src/java/org/lwjgl/opengl/GL20.java index 7e5d96cd..94a0299b 100644 --- a/src/java/org/lwjgl/opengl/GL20.java +++ b/src/java/org/lwjgl/opengl/GL20.java @@ -96,7 +96,6 @@ public final class GL20 { private GL20() { } - static native void initNativeStubs() throws LWJGLException; public static void glBlendEquationSeparate(int modeRGB, int modeAlpha) { long function_pointer = GLContext.getCapabilities().GL20_glBlendEquationSeparate_pointer; diff --git a/src/java/org/lwjgl/opengl/NVEvaluators.java b/src/java/org/lwjgl/opengl/NVEvaluators.java index 945bedf8..7b975a2a 100644 --- a/src/java/org/lwjgl/opengl/NVEvaluators.java +++ b/src/java/org/lwjgl/opengl/NVEvaluators.java @@ -35,7 +35,6 @@ public final class NVEvaluators { private NVEvaluators() { } - static native void initNativeStubs() throws LWJGLException; public static void glEvalMapsNV(int target, int mode) { long function_pointer = GLContext.getCapabilities().NV_evaluators_glEvalMapsNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVFence.java b/src/java/org/lwjgl/opengl/NVFence.java index 3871f84a..96bd9633 100644 --- a/src/java/org/lwjgl/opengl/NVFence.java +++ b/src/java/org/lwjgl/opengl/NVFence.java @@ -14,7 +14,6 @@ public final class NVFence { private NVFence() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetFenceivNV(int fence, int pname, IntBuffer piParams) { long function_pointer = GLContext.getCapabilities().NV_fence_glGetFenceivNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVFragmentProgram.java b/src/java/org/lwjgl/opengl/NVFragmentProgram.java index 20ada989..c09021af 100644 --- a/src/java/org/lwjgl/opengl/NVFragmentProgram.java +++ b/src/java/org/lwjgl/opengl/NVFragmentProgram.java @@ -16,7 +16,6 @@ public final class NVFragmentProgram extends NVProgram { private NVFragmentProgram() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetProgramNamedParameterNV(int id, ByteBuffer name, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().NV_fragment_program_glGetProgramNamedParameterfvNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVHalfFloat.java b/src/java/org/lwjgl/opengl/NVHalfFloat.java index 73ba3e49..46e427ab 100644 --- a/src/java/org/lwjgl/opengl/NVHalfFloat.java +++ b/src/java/org/lwjgl/opengl/NVHalfFloat.java @@ -12,7 +12,6 @@ public final class NVHalfFloat { private NVHalfFloat() { } - static native void initNativeStubs() throws LWJGLException; public static void glVertexAttribs4NV(int index, ShortBuffer attribs) { long function_pointer = GLContext.getCapabilities().NV_half_float_glVertexAttribs4hvNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVOcclusionQuery.java b/src/java/org/lwjgl/opengl/NVOcclusionQuery.java index 5e022dcc..50685816 100644 --- a/src/java/org/lwjgl/opengl/NVOcclusionQuery.java +++ b/src/java/org/lwjgl/opengl/NVOcclusionQuery.java @@ -17,7 +17,6 @@ public final class NVOcclusionQuery { private NVOcclusionQuery() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetOcclusionQueryNV(int id, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().NV_occlusion_query_glGetOcclusionQueryivNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVPixelDataRange.java b/src/java/org/lwjgl/opengl/NVPixelDataRange.java index 77b4992a..d519a402 100644 --- a/src/java/org/lwjgl/opengl/NVPixelDataRange.java +++ b/src/java/org/lwjgl/opengl/NVPixelDataRange.java @@ -17,7 +17,6 @@ public final class NVPixelDataRange { private NVPixelDataRange() { } - static native void initNativeStubs() throws LWJGLException; public static void glFlushPixelDataRangeNV(int target) { long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glFlushPixelDataRangeNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVPointSprite.java b/src/java/org/lwjgl/opengl/NVPointSprite.java index 9350ce8d..8f00e6c5 100644 --- a/src/java/org/lwjgl/opengl/NVPointSprite.java +++ b/src/java/org/lwjgl/opengl/NVPointSprite.java @@ -14,7 +14,6 @@ public final class NVPointSprite { private NVPointSprite() { } - static native void initNativeStubs() throws LWJGLException; public static void glPointParameterNV(int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().NV_point_sprite_glPointParameterivNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java b/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java index ea2ae826..e118bb2b 100644 --- a/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java +++ b/src/java/org/lwjgl/opengl/NVPrimitiveRestart.java @@ -13,7 +13,6 @@ public final class NVPrimitiveRestart { private NVPrimitiveRestart() { } - static native void initNativeStubs() throws LWJGLException; public static void glPrimitiveRestartIndexNV(int index) { long function_pointer = GLContext.getCapabilities().NV_primitive_restart_glPrimitiveRestartIndexNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVProgram.java b/src/java/org/lwjgl/opengl/NVProgram.java index cae9c9d7..2acfa25a 100644 --- a/src/java/org/lwjgl/opengl/NVProgram.java +++ b/src/java/org/lwjgl/opengl/NVProgram.java @@ -14,7 +14,6 @@ public class NVProgram { public static final int GL_PROGRAM_LENGTH_NV = 0x8627; public static final int GL_PROGRAM_TARGET_NV = 0x8646; - static native void initNativeStubs() throws LWJGLException; public static void glRequestResidentProgramsNV(IntBuffer programIDs) { long function_pointer = GLContext.getCapabilities().NV_program_glRequestResidentProgramsNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVRegisterCombiners.java b/src/java/org/lwjgl/opengl/NVRegisterCombiners.java index daed73c6..8c4b74e9 100644 --- a/src/java/org/lwjgl/opengl/NVRegisterCombiners.java +++ b/src/java/org/lwjgl/opengl/NVRegisterCombiners.java @@ -62,7 +62,6 @@ public final class NVRegisterCombiners { private NVRegisterCombiners() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetFinalCombinerInputParameterNV(int variable, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().NV_register_combiners_glGetFinalCombinerInputParameterivNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java b/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java index 67f29776..5314c0cc 100644 --- a/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java +++ b/src/java/org/lwjgl/opengl/NVRegisterCombiners2.java @@ -12,7 +12,6 @@ public final class NVRegisterCombiners2 { private NVRegisterCombiners2() { } - static native void initNativeStubs() throws LWJGLException; public static void glGetCombinerStageParameterNV(int stage, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().NV_register_combiners2_glGetCombinerStageParameterfvNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java index 9e3c0f05..6e7c64c8 100644 --- a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java +++ b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java @@ -16,7 +16,6 @@ public final class NVVertexArrayRange { private NVVertexArrayRange() { } - static native void initNativeStubs() throws LWJGLException; public static void glFreeMemoryNV(ByteBuffer pointer) { long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glFreeMemoryNV_pointer; diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram.java b/src/java/org/lwjgl/opengl/NVVertexProgram.java index 59df2bc2..03a60f32 100644 --- a/src/java/org/lwjgl/opengl/NVVertexProgram.java +++ b/src/java/org/lwjgl/opengl/NVVertexProgram.java @@ -89,7 +89,6 @@ public final class NVVertexProgram extends NVProgram { private NVVertexProgram() { } - static native void initNativeStubs() throws LWJGLException; public static void glVertexAttribs4NV(int index, FloatBuffer v) { long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribs4fvNV_pointer; diff --git a/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java b/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java index a2e31a25..f9dccbb3 100644 --- a/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java +++ b/src/java/org/lwjgl/util/generator/ContextCapabilitiesGenerator.java @@ -110,7 +110,7 @@ public class ContextCapabilitiesGenerator { if (!context_specific) { writer.println("\t\tif (" + STUBS_LOADED_NAME + ")"); writer.println("\t\t\treturn GLContext.getSupportedExtensions();"); - writer.println("\t\torg.lwjgl.opengl.GL11.initNativeStubs();"); + writer.println("\t\torg.lwjgl.opengl.GL11." + Utils.STUB_INITIALIZER_NAME + "();"); } else { writer.println("\t\tif (!" + getAddressesInitializerName("GL11") + "())"); writer.println("\t\t\tthrow new LWJGLException(\"GL11 not supported\");"); @@ -143,7 +143,7 @@ public class ContextCapabilitiesGenerator { writer.print("\t\t\t" + CACHED_EXTS_VAR_NAME + ".remove(\""); writer.println(translateFieldName(d.getSimpleName()) + "\");"); } else { - writer.print("\t\tGLContext.initNativeStubs(" + Utils.getSimpleClassName(d)); + writer.print("\t\tGLContext." + Utils.STUB_INITIALIZER_NAME + "(" + Utils.getSimpleClassName(d)); writer.println(".class, supported_extensions, \"" + translateFieldName(d.getSimpleName()) + "\");"); } } diff --git a/src/java/org/lwjgl/util/generator/GeneratorVisitor.java b/src/java/org/lwjgl/util/generator/GeneratorVisitor.java index 7d741246..11d913d4 100644 --- a/src/java/org/lwjgl/util/generator/GeneratorVisitor.java +++ b/src/java/org/lwjgl/util/generator/GeneratorVisitor.java @@ -194,7 +194,7 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { java_writer.println("\t}"); java_writer.println(); } - if (d.getMethods().size() > 0) + if (d.getMethods().size() > 0 && !context_specific) java_writer.println("\tstatic native void " + Utils.STUB_INITIALIZER_NAME + "() throws LWJGLException;"); JavaMethodsGenerator.generateMethodsJava(env, type_map, java_writer, d, generate_error_checks, context_specific); java_writer.println("}");