From 5d53187baa754d12b2809cedf81f9b148a4a1ffa Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 16 Feb 2005 20:25:23 +0000 Subject: [PATCH] Win32: fixed compilation --- platform_build/win32_ms_cmdline/build.bat | 5 +- .../org/lwjgl/generator/GeneratorVisitor.java | 2 - src/java/org/lwjgl/openal/AL10.java | 8 +- .../org/lwjgl/opengl/ARBBufferObject.java | 48 +- src/java/org/lwjgl/opengl/ARBImaging.java | 1066 ++++++++--------- .../org/lwjgl/opengl/ARBMatrixPalette.java | 14 +- .../lwjgl/opengl/ARBTextureCompression.java | 126 +- src/java/org/lwjgl/opengl/ARBVertexBlend.java | 14 +- .../org/lwjgl/opengl/ARBVertexProgram.java | 14 +- .../org/lwjgl/opengl/ATIElementArray.java | 14 +- .../lwjgl/opengl/ATIVertexArrayObject.java | 52 +- .../lwjgl/opengl/EXTDrawRangeElements.java | 14 +- .../org/lwjgl/opengl/EXTPalettedTexture.java | 36 +- .../org/lwjgl/opengl/EXTVertexShader.java | 38 +- src/java/org/lwjgl/opengl/GL11.java | 244 ++-- src/java/org/lwjgl/opengl/GL12.java | 74 +- src/java/org/lwjgl/opengl/GL13.java | 182 +-- src/java/org/lwjgl/opengl/GL15.java | 72 +- src/java/org/lwjgl/opengl/GL20.java | 14 +- .../org/lwjgl/opengl/NVPixelDataRange.java | 10 +- .../org/lwjgl/opengl/NVVertexArrayRange.java | 10 +- .../org/lwjgl/opengl/NVVertexProgram.java | 14 +- .../arb/org_lwjgl_opengl_ARBBufferObject.c | 1 - .../org_lwjgl_opengl_ARBColorBufferFloat.c | 1 - .../arb/org_lwjgl_opengl_ARBDrawBuffers.c | 1 - .../common/arb/org_lwjgl_opengl_ARBImaging.c | 1 - .../arb/org_lwjgl_opengl_ARBMatrixPalette.c | 1 - .../arb/org_lwjgl_opengl_ARBMultisample.c | 1 - .../arb/org_lwjgl_opengl_ARBMultitexture.c | 1 - .../arb/org_lwjgl_opengl_ARBOcclusionQuery.c | 1 - .../arb/org_lwjgl_opengl_ARBPointParameters.c | 1 - .../common/arb/org_lwjgl_opengl_ARBProgram.c | 1 - .../arb/org_lwjgl_opengl_ARBShaderObjects.c | 1 - .../org_lwjgl_opengl_ARBTextureCompression.c | 1 - .../arb/org_lwjgl_opengl_ARBTransposeMatrix.c | 1 - .../arb/org_lwjgl_opengl_ARBVertexBlend.c | 1 - .../arb/org_lwjgl_opengl_ARBVertexProgram.c | 1 - .../arb/org_lwjgl_opengl_ARBVertexShader.c | 1 - .../arb/org_lwjgl_opengl_ARBWindowPos.c | 1 - .../ati/org_lwjgl_opengl_ATIDrawBuffers.c | 1 - .../ati/org_lwjgl_opengl_ATIElementArray.c | 1 - .../ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c | 1 - .../ati/org_lwjgl_opengl_ATIFragmentShader.c | 1 - .../ati/org_lwjgl_opengl_ATIMapObjectBuffer.c | 1 - .../ati/org_lwjgl_opengl_ATIPnTriangles.c | 1 - .../ati/org_lwjgl_opengl_ATISeparateStencil.c | 1 - .../org_lwjgl_opengl_ATIVertexArrayObject.c | 1 - ..._lwjgl_opengl_ATIVertexAttribArrayObject.c | 1 - .../ati/org_lwjgl_opengl_ATIVertexStreams.c | 1 - src/native/common/common_tools.h | 4 + ...rg_lwjgl_opengl_EXTBlendEquationSeparate.c | 1 - .../org_lwjgl_opengl_EXTBlendFuncSeparate.c | 1 - .../org_lwjgl_opengl_EXTCompiledVertexArray.c | 1 - .../ext/org_lwjgl_opengl_EXTDepthBoundsTest.c | 1 - .../org_lwjgl_opengl_EXTDrawRangeElements.c | 1 - .../common/ext/org_lwjgl_opengl_EXTFogCoord.c | 1 - .../org_lwjgl_opengl_EXTFramebufferObject.c | 1 - .../ext/org_lwjgl_opengl_EXTMultiDrawArrays.c | 1 - .../ext/org_lwjgl_opengl_EXTPalettedTexture.c | 1 - .../ext/org_lwjgl_opengl_EXTPointParameters.c | 1 - .../ext/org_lwjgl_opengl_EXTSecondaryColor.c | 1 - .../ext/org_lwjgl_opengl_EXTStencilTwoSide.c | 1 - .../ext/org_lwjgl_opengl_EXTVertexShader.c | 1 - .../ext/org_lwjgl_opengl_EXTVertexWeighting.c | 1 - .../common/nv/org_lwjgl_opengl_NVEvaluators.c | 1 - .../common/nv/org_lwjgl_opengl_NVFence.c | 1 - .../nv/org_lwjgl_opengl_NVFragmentProgram.c | 1 - .../common/nv/org_lwjgl_opengl_NVHalfFloat.c | 1 - .../nv/org_lwjgl_opengl_NVOcclusionQuery.c | 1 - .../nv/org_lwjgl_opengl_NVPixelDataRange.c | 1 - .../nv/org_lwjgl_opengl_NVPointSprite.c | 1 - .../nv/org_lwjgl_opengl_NVPrimitiveRestart.c | 1 - .../common/nv/org_lwjgl_opengl_NVProgram.c | 1 - .../nv/org_lwjgl_opengl_NVRegisterCombiners.c | 1 - .../org_lwjgl_opengl_NVRegisterCombiners2.c | 1 - .../nv/org_lwjgl_opengl_NVVertexArrayRange.c | 1 - .../nv/org_lwjgl_opengl_NVVertexProgram.c | 1 - src/native/common/org_lwjgl_opengl_GL11.c | 1 - src/native/common/org_lwjgl_opengl_GL12.c | 1 - src/native/common/org_lwjgl_opengl_GL13.c | 1 - src/native/common/org_lwjgl_opengl_GL14.c | 1 - src/native/common/org_lwjgl_opengl_GL15.c | 1 - src/native/common/org_lwjgl_opengl_GL20.c | 1 - .../common/org_lwjgl_opengl_GLContext.c | 6 +- 84 files changed, 1044 insertions(+), 1097 deletions(-) diff --git a/platform_build/win32_ms_cmdline/build.bat b/platform_build/win32_ms_cmdline/build.bat index 43195b2c..120103f2 100644 --- a/platform_build/win32_ms_cmdline/build.bat +++ b/platform_build/win32_ms_cmdline/build.bat @@ -6,7 +6,10 @@ if "%CHOME%" == "" goto errorchome if "%ALHOME%" == "" goto erroralhome if "%DXHOME%" == "" goto errordxhome set COPTIONS=/I"%DXHOME%\include" /I"%CHOME%\include" /I"%PLTSDKHOME%\include" /I"%JAVA_HOME%\include" /I"%JAVA_HOME%\include\win32" /I"%ALHOME%\include" /I"..\..\src\native\common" /Ox /Ob2 /Oi /Ot /Oy /FD /EHsc /MT /Gy /W2 /nologo /c /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "LWJGL_EXPORTS" /D "_WINDLL" -set LINKEROPTS=/link /LIBPATH:"%ALHOME%\libs" /LIBPATH:"%DXHOME%\Lib" /LIBPATH:"%PLTSDKHOME%\Lib" /LIBPATH:"%CHOME%\Lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:X86 /NOLOGO /DLL /DELAYLOAD:jawt.dll +rem Can't get /DELAYLOAD to work +rem set LINKEROPTS=/link /LIBPATH:"%JAVA_HOME%\lib" /LIBPATH:"%ALHOME%\libs" /LIBPATH:"%DXHOME%\Lib" /LIBPATH:"%PLTSDKHOME%\Lib" /LIBPATH:"%CHOME%\Lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:X86 /NOLOGO /DLL /DELAYLOAD:jawt.dll +rem set LIBS=dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib delayimp.lib +set LINKEROPTS=/link /LIBPATH:"%JAVA_HOME%\lib" /LIBPATH:"%ALHOME%\libs" /LIBPATH:"%DXHOME%\Lib" /LIBPATH:"%PLTSDKHOME%\Lib" /LIBPATH:"%CHOME%\Lib" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /MACHINE:X86 /NOLOGO /DLL set LIBS=dinput.lib dxguid.lib OpenGL32.Lib Version.lib user32.lib Gdi32.lib Advapi32.lib jawt.lib for %%x in (..\..\src\native\win32\*.c) do cl %COPTIONS% %%x diff --git a/src/java/org/lwjgl/generator/GeneratorVisitor.java b/src/java/org/lwjgl/generator/GeneratorVisitor.java index 8f287815..c4bed80a 100644 --- a/src/java/org/lwjgl/generator/GeneratorVisitor.java +++ b/src/java/org/lwjgl/generator/GeneratorVisitor.java @@ -206,8 +206,6 @@ public class GeneratorVisitor extends SimpleDeclarationVisitor { native_writer.println("/* MACHINE GENERATED FILE, DO NOT EDIT */"); native_writer.println(); native_writer.println("#include "); - if (context_specific) - native_writer.println("#include "); type_map.printNativeIncludes(native_writer); native_writer.println(); TypedefsGenerator.generateNativeTypedefs(type_map, native_writer, d.getMethods()); diff --git a/src/java/org/lwjgl/openal/AL10.java b/src/java/org/lwjgl/openal/AL10.java index a0e71d86..2f4eed5b 100644 --- a/src/java/org/lwjgl/openal/AL10.java +++ b/src/java/org/lwjgl/openal/AL10.java @@ -581,9 +581,9 @@ public final class AL10 { * @param data location of data * @param freq frequency of data */ - public static void alBufferData(int buffer, int format, IntBuffer data, int freq) { + public static void alBufferData(int buffer, int format, ShortBuffer data, int freq) { BufferChecks.checkDirect(data); - nalBufferData(buffer, format, data, data.position() << 2, (data.remaining() << 2), freq); + nalBufferData(buffer, format, data, data.position() << 1, (data.remaining() << 1), freq); Util.checkALError(); } /** @@ -612,9 +612,9 @@ public final class AL10 { * @param data location of data * @param freq frequency of data */ - public static void alBufferData(int buffer, int format, ShortBuffer data, int freq) { + public static void alBufferData(int buffer, int format, IntBuffer data, int freq) { BufferChecks.checkDirect(data); - nalBufferData(buffer, format, data, data.position() << 1, (data.remaining() << 1), freq); + nalBufferData(buffer, format, data, data.position() << 2, (data.remaining() << 2), freq); Util.checkALError(); } /** diff --git a/src/java/org/lwjgl/opengl/ARBBufferObject.java b/src/java/org/lwjgl/opengl/ARBBufferObject.java index fcc703a1..1738adfb 100644 --- a/src/java/org/lwjgl/opengl/ARBBufferObject.java +++ b/src/java/org/lwjgl/opengl/ARBBufferObject.java @@ -72,11 +72,11 @@ public class ARBBufferObject { } private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer); - public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) { + public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer); + nglGetBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } public static void glGetBufferSubDataARB(int target, int offset, IntBuffer data) { BufferChecks.checkDirect(data); @@ -84,25 +84,25 @@ public class ARBBufferObject { BufferChecks.checkFunctionAddress(function_pointer); nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); - } public static void glGetBufferSubDataARB(int target, int offset, FloatBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } + public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer); + } private static native void nglGetBufferSubDataARB(int target, int offset, int size, Buffer data, int data_position, long function_pointer); - public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) { + public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer); + nglBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } public static void glBufferSubDataARB(int target, int offset, IntBuffer data) { BufferChecks.checkDirect(data); @@ -110,18 +110,18 @@ public class ARBBufferObject { BufferChecks.checkFunctionAddress(function_pointer); nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); - } public static void glBufferSubDataARB(int target, int offset, FloatBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } + public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer); + } private static native void nglBufferSubDataARB(int target, int offset, int size, Buffer data, int data_position, long function_pointer); public static void glBufferDataARB(int target, int size, int usage) { @@ -129,11 +129,11 @@ public class ARBBufferObject { BufferChecks.checkFunctionAddress(function_pointer); nglBufferDataARB(target, size, null, 0, usage, function_pointer); } - public static void glBufferDataARB(int target, ByteBuffer data, int usage) { + public static void glBufferDataARB(int target, ShortBuffer data, int usage) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglBufferDataARB(target, (data.remaining()), data, data.position(), usage, function_pointer); + nglBufferDataARB(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); } public static void glBufferDataARB(int target, IntBuffer data, int usage) { BufferChecks.checkDirect(data); @@ -141,18 +141,18 @@ public class ARBBufferObject { BufferChecks.checkFunctionAddress(function_pointer); nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer); } - public static void glBufferDataARB(int target, ShortBuffer data, int usage) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglBufferDataARB(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); - } public static void glBufferDataARB(int target, FloatBuffer data, int usage) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer); } + public static void glBufferDataARB(int target, ByteBuffer data, int usage) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBufferDataARB(target, (data.remaining()), data, data.position(), usage, function_pointer); + } private static native void nglBufferDataARB(int target, int size, Buffer data, int data_position, int usage, long function_pointer); public static boolean glIsBufferARB(int buffer) { diff --git a/src/java/org/lwjgl/opengl/ARBImaging.java b/src/java/org/lwjgl/opengl/ARBImaging.java index faa1735a..3e3437d9 100644 --- a/src/java/org/lwjgl/opengl/ARBImaging.java +++ b/src/java/org/lwjgl/opengl/ARBImaging.java @@ -88,374 +88,14 @@ public final class ARBImaging { static native void initNativeStubs() throws LWJGLException; - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ByteBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, IntBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, FloatBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer); - } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ByteBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position(), function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 1, function_pointer); } public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, IntBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); @@ -466,15 +106,6 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ShortBuffer span) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - BufferChecks.checkDirect(span); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 1, function_pointer); - } public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, FloatBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); @@ -484,16 +115,25 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ByteBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ByteBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position(), function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, IntBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, IntBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); @@ -502,6 +142,24 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer); } + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer); + } public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); @@ -511,6 +169,15 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer); } + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer); + } public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, FloatBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); @@ -520,79 +187,79 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ByteBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ByteBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, IntBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 1, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ShortBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, IntBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, FloatBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, FloatBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ByteBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ByteBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position(), function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, IntBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ShortBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, IntBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, FloatBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, FloatBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ByteBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ByteBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); @@ -601,14 +268,113 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, IntBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer); } public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); @@ -619,6 +385,15 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer); } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); + } public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, FloatBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); @@ -628,16 +403,25 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ByteBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ByteBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); BufferChecks.checkDirect(span); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer); } - public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, IntBuffer span) { + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, IntBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); @@ -646,6 +430,24 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); + } public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ShortBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); @@ -655,6 +457,15 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer); } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); + } public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, FloatBuffer span) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(row); @@ -664,6 +475,195 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer); } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ShortBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 1, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, IntBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, FloatBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer); + } + public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ByteBuffer span) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + BufferChecks.checkDirect(span); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position(), function_pointer); + } private static native void nglGetSeparableFilter(int target, int format, int type, Buffer row, int row_position, Buffer column, int column_position, Buffer span, int span_position, long function_pointer); public static void glGetSeparableFilter(int target, int format, int type, int row_buffer_offset, int column_buffer_offset, int span_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -673,77 +673,13 @@ public final class ARBImaging { } private static native void nglGetSeparableFilterBO(int target, int format, int type, int row_buffer_offset, int column_buffer_offset, int span_buffer_offset, long function_pointer); - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ByteBuffer column) { + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ShortBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position(), function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, IntBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ShortBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 1, function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, FloatBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ByteBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, IntBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ShortBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, FloatBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer); - } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ByteBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position(), function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 1, function_pointer); } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, IntBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -753,14 +689,6 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 2, function_pointer); } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ShortBuffer column) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(row); - BufferChecks.checkDirect(column); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 1, function_pointer); - } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, FloatBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(row); @@ -769,15 +697,23 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 2, function_pointer); } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ByteBuffer column) { + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ByteBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position(), function_pointer); } - public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, IntBuffer column) { + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ShortBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer); + } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, IntBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(row); BufferChecks.checkDirect(column); @@ -785,6 +721,22 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer); } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, FloatBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer); + } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ByteBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer); + } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ShortBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(row); @@ -793,6 +745,14 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer); } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, IntBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer); + } public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, FloatBuffer column) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(row); @@ -801,6 +761,46 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer); } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ByteBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer); + } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ShortBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 1, function_pointer); + } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, IntBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer); + } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, FloatBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer); + } + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ByteBuffer column) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(row); + BufferChecks.checkDirect(column); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position(), function_pointer); + } private static native void nglSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, int row_position, Buffer column, int column_position, long function_pointer); public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, int row_buffer_offset, int column_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -826,12 +826,12 @@ public final class ARBImaging { } private static native void nglGetConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer); - public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) { + public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(image); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetConvolutionFilter(target, format, type, image, image.position(), function_pointer); + nglGetConvolutionFilter(target, format, type, image, image.position() << 1, function_pointer); } public static void glGetConvolutionFilter(int target, int format, int type, IntBuffer image) { GLBufferChecks.ensurePackPBOdisabled(); @@ -840,13 +840,6 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetConvolutionFilter(target, format, type, image, image.position() << 2, function_pointer); } - public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(image); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetConvolutionFilter(target, format, type, image, image.position() << 1, function_pointer); - } public static void glGetConvolutionFilter(int target, int format, int type, FloatBuffer image) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(image); @@ -854,6 +847,13 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetConvolutionFilter(target, format, type, image, image.position() << 2, function_pointer); } + public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(image); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetConvolutionFilter(target, format, type, image, image.position(), function_pointer); + } private static native void nglGetConvolutionFilter(int target, int format, int type, Buffer image, int image_position, long function_pointer); public static void glGetConvolutionFilter(int target, int format, int type, int image_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -907,12 +907,12 @@ public final class ARBImaging { } private static native void nglConvolutionParameterf(int target, int pname, float params, long function_pointer); - public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) { + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, height, 1)); long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position(), function_pointer); + nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1, function_pointer); } public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer image) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -921,12 +921,12 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 2, function_pointer); } - public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) { + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, height, 1)); long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1, function_pointer); + nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position(), function_pointer); } private static native void nglConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image, int image_position, long function_pointer); public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int image_buffer_offset) { @@ -937,12 +937,12 @@ public final class ARBImaging { } private static native void nglConvolutionFilter2DBO(int target, int internalformat, int width, int height, int format, int type, int image_buffer_offset, long function_pointer); - public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) { + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1)); long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position(), function_pointer); + nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 1, function_pointer); } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -951,13 +951,6 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer); } - public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1)); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 1, function_pointer); - } public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1)); @@ -965,6 +958,13 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer); } + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1)); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position(), function_pointer); + } private static native void nglConvolutionFilter1D(int target, int internalformat, int width, int format, int type, Buffer image, int image_position, long function_pointer); public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, int image_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -990,12 +990,12 @@ public final class ARBImaging { } private static native void nglGetMinmaxParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer); - public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) { + public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkBuffer(values, 4); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetMinmax(target, reset, format, types, values, values.position(), function_pointer); + nglGetMinmax(target, reset, format, types, values, values.position() << 1, function_pointer); } public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) { GLBufferChecks.ensurePackPBOdisabled(); @@ -1004,13 +1004,6 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer); } - public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkBuffer(values, 4); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetMinmax(target, reset, format, types, values, values.position() << 1, function_pointer); - } public static void glGetMinmax(int target, boolean reset, int format, int types, FloatBuffer values) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkBuffer(values, 4); @@ -1018,6 +1011,13 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer); } + public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkBuffer(values, 4); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetMinmax(target, reset, format, types, values, values.position(), function_pointer); + } private static native void nglGetMinmax(int target, boolean reset, int format, int types, Buffer values, int values_position, long function_pointer); public static void glGetMinmax(int target, boolean reset, int format, int types, int values_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -1057,12 +1057,12 @@ public final class ARBImaging { } private static native void nglGetHistogramParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer); - public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) { + public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkBuffer(values, 256); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetHistogram(target, reset, format, type, values, values.position(), function_pointer); + nglGetHistogram(target, reset, format, type, values, values.position() << 1, function_pointer); } public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) { GLBufferChecks.ensurePackPBOdisabled(); @@ -1071,13 +1071,6 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer); } - public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkBuffer(values, 256); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetHistogram(target, reset, format, type, values, values.position() << 1, function_pointer); - } public static void glGetHistogram(int target, boolean reset, int format, int type, FloatBuffer values) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkBuffer(values, 256); @@ -1085,6 +1078,13 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer); } + public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkBuffer(values, 256); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetHistogram(target, reset, format, type, values, values.position(), function_pointer); + } private static native void nglGetHistogram(int target, boolean reset, int format, int type, Buffer values, int values_position, long function_pointer); public static void glGetHistogram(int target, boolean reset, int format, int type, int values_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -1138,18 +1138,18 @@ public final class ARBImaging { } private static native void nglGetColorTableParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer); - public static void glGetColorTable(int target, int format, int type, ByteBuffer data) { - BufferChecks.checkBuffer(data, 256); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetColorTable(target, format, type, data, data.position(), function_pointer); - } public static void glGetColorTable(int target, int format, int type, FloatBuffer data) { BufferChecks.checkBuffer(data, 256); long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglGetColorTable(target, format, type, data, data.position() << 2, function_pointer); } + public static void glGetColorTable(int target, int format, int type, ByteBuffer data) { + BufferChecks.checkBuffer(data, 256); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetColorTable(target, format, type, data, data.position(), function_pointer); + } private static native void nglGetColorTable(int target, int format, int type, Buffer data, int data_position, long function_pointer); public static void glCopyColorTable(int target, int internalformat, int x, int y, int width) { @@ -1182,13 +1182,6 @@ public final class ARBImaging { } private static native void nglColorTableParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer); - public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(data, 256); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglColorSubTable(target, start, count, format, type, data, data.position(), function_pointer); - } public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(data, 256); @@ -1196,6 +1189,13 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglColorSubTable(target, start, count, format, type, data, data.position() << 2, function_pointer); } + public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(data, 256); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglColorSubTable(target, start, count, format, type, data, data.position(), function_pointer); + } private static native void nglColorSubTable(int target, int start, int count, int format, int type, Buffer data, int data_position, long function_pointer); public static void glColorSubTable(int target, int start, int count, int format, int type, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -1205,13 +1205,6 @@ public final class ARBImaging { } private static native void nglColorSubTableBO(int target, int start, int count, int format, int type, int data_buffer_offset, long function_pointer); - public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(data, 256); - long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglColorTable(target, internalFormat, width, format, type, data, data.position(), function_pointer); - } public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(data, 256); @@ -1219,6 +1212,13 @@ public final class ARBImaging { BufferChecks.checkFunctionAddress(function_pointer); nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer); } + public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(data, 256); + long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglColorTable(target, internalFormat, width, format, type, data, data.position(), function_pointer); + } private static native void nglColorTable(int target, int internalFormat, int width, int format, int type, Buffer data, int data_position, long function_pointer); public static void glColorTable(int target, int internalFormat, int width, int format, int type, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); diff --git a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java index cf19bf30..b586791a 100644 --- a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java +++ b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java @@ -47,13 +47,6 @@ public final class ARBMatrixPalette { } private static native void nglMatrixIndexubvARB(int size, ByteBuffer pIndices, int pIndices_position, long function_pointer); - public static void glMatrixIndexPointerARB(int size, int stride, ByteBuffer pPointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexPointerARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_BYTE, stride, pPointer, pPointer.position(), function_pointer); - } public static void glMatrixIndexPointerARB(int size, int stride, IntBuffer pPointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pPointer); @@ -61,6 +54,13 @@ public final class ARBMatrixPalette { BufferChecks.checkFunctionAddress(function_pointer); nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_INT, stride, pPointer, pPointer.position() << 2, function_pointer); } + public static void glMatrixIndexPointerARB(int size, int stride, ByteBuffer pPointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_BYTE, stride, pPointer, pPointer.position(), function_pointer); + } public static void glMatrixIndexPointerARB(int size, int stride, ShortBuffer pPointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pPointer); diff --git a/src/java/org/lwjgl/opengl/ARBTextureCompression.java b/src/java/org/lwjgl/opengl/ARBTextureCompression.java index cd12ff6d..17597496 100644 --- a/src/java/org/lwjgl/opengl/ARBTextureCompression.java +++ b/src/java/org/lwjgl/opengl/ARBTextureCompression.java @@ -24,12 +24,12 @@ public final class ARBTextureCompression { static native void initNativeStubs() throws LWJGLException; - public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) { + public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(pImg); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglGetCompressedTexImageARB(target, lod, pImg, pImg.position(), function_pointer); + nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1, function_pointer); } public static void glGetCompressedTexImageARB(int target, int lod, IntBuffer pImg) { GLBufferChecks.ensurePackPBOdisabled(); @@ -38,13 +38,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer); } - public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(pImg); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1, function_pointer); - } public static void glGetCompressedTexImageARB(int target, int lod, FloatBuffer pImg) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(pImg); @@ -52,6 +45,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer); } + public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(pImg); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetCompressedTexImageARB(target, lod, pImg, pImg.position(), function_pointer); + } private static native void nglGetCompressedTexImageARB(int target, int lod, Buffer pImg, int pImg_position, long function_pointer); public static void glGetCompressedTexImageARB(int target, int lod, int pImg_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -61,12 +61,12 @@ public final class ARBTextureCompression { } private static native void nglGetCompressedTexImageARBBO(int target, int lod, int pImg_buffer_offset, long function_pointer); - public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer pData) { + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position(), function_pointer); + nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 1, function_pointer); } public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -75,13 +75,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer); } - public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer pData) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(pData); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 1, function_pointer); - } public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); @@ -89,6 +82,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer); } + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer pData) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(pData); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position(), function_pointer); + } private static native void nglCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer pData, int pData_position, long function_pointer); public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int pData_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -98,12 +98,12 @@ public final class ARBTextureCompression { } private static native void nglCompressedTexSubImage3DARBBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int pData_buffer_offset, long function_pointer); - public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer pData) { + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position(), function_pointer); + nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 1, function_pointer); } public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -112,13 +112,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer); } - public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer pData) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(pData); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 1, function_pointer); - } public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); @@ -126,6 +119,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer); } + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer pData) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(pData); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position(), function_pointer); + } private static native void nglCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer pData, int pData_position, long function_pointer); public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int pData_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -135,12 +135,12 @@ public final class ARBTextureCompression { } private static native void nglCompressedTexSubImage2DARBBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int pData_buffer_offset, long function_pointer); - public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData) { + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position(), function_pointer); + nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 1, function_pointer); } public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -149,13 +149,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer); } - public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer pData) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(pData); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 1, function_pointer); - } public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); @@ -163,6 +156,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer); } + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(pData); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position(), function_pointer); + } private static native void nglCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, Buffer pData, int pData_position, long function_pointer); public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, int pData_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -172,12 +172,12 @@ public final class ARBTextureCompression { } private static native void nglCompressedTexSubImage1DARBBO(int target, int level, int xoffset, int width, int format, int imageSize, int pData_buffer_offset, long function_pointer); - public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) { + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position(), function_pointer); + nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1, function_pointer); } public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -186,13 +186,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer); } - public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(pData); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1, function_pointer); - } public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); @@ -200,6 +193,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer); } + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(pData); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position(), function_pointer); + } private static native void nglCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer pData, int pData_position, long function_pointer); public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int pData_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -209,12 +209,12 @@ public final class ARBTextureCompression { } private static native void nglCompressedTexImage3DARBBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int pData_buffer_offset, long function_pointer); - public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) { + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position(), function_pointer); + nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1, function_pointer); } public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -223,13 +223,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer); } - public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(pData); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1, function_pointer); - } public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); @@ -237,6 +230,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer); } + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(pData); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position(), function_pointer); + } private static native void nglCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer pData, int pData_position, long function_pointer); public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, int pData_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -246,12 +246,12 @@ public final class ARBTextureCompression { } private static native void nglCompressedTexImage2DARBBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, int pData_buffer_offset, long function_pointer); - public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) { + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position(), function_pointer); + nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1, function_pointer); } public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); @@ -260,13 +260,6 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer); } - public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(pData); - long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1, function_pointer); - } public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer pData) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(pData); @@ -274,6 +267,13 @@ public final class ARBTextureCompression { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer); } + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(pData); + long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position(), function_pointer); + } private static native void nglCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, Buffer pData, int pData_position, long function_pointer); public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, int pData_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); diff --git a/src/java/org/lwjgl/opengl/ARBVertexBlend.java b/src/java/org/lwjgl/opengl/ARBVertexBlend.java index b27b77be..40acffc8 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexBlend.java +++ b/src/java/org/lwjgl/opengl/ARBVertexBlend.java @@ -62,13 +62,6 @@ public final class ARBVertexBlend { } private static native void nglVertexBlendARB(int count, long function_pointer); - public static void glWeightPointerARB(int size, boolean unsigned, int stride, ByteBuffer pPointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position(), function_pointer); - } public static void glWeightPointerARB(int size, boolean unsigned, int stride, IntBuffer pPointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pPointer); @@ -83,6 +76,13 @@ public final class ARBVertexBlend { BufferChecks.checkFunctionAddress(function_pointer); nglWeightPointerARB(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position() << 2, function_pointer); } + public static void glWeightPointerARB(int size, boolean unsigned, int stride, ByteBuffer pPointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position(), function_pointer); + } public static void glWeightPointerARB(int size, boolean unsigned, int stride, ShortBuffer pPointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pPointer); diff --git a/src/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/java/org/lwjgl/opengl/ARBVertexProgram.java index 28c0be7c..438d92fb 100644 --- a/src/java/org/lwjgl/opengl/ARBVertexProgram.java +++ b/src/java/org/lwjgl/opengl/ARBVertexProgram.java @@ -67,13 +67,6 @@ public final class ARBVertexProgram extends ARBProgram { } private static native void nglEnableVertexAttribArrayARB(int index, long function_pointer); - public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(buffer); - long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glVertexAttribPointerARB_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, normalized, stride, buffer, buffer.position(), function_pointer); - } public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(buffer); @@ -88,6 +81,13 @@ public final class ARBVertexProgram extends ARBProgram { BufferChecks.checkFunctionAddress(function_pointer); nglVertexAttribPointerARB(index, size, GL11.GL_FLOAT, normalized, stride, buffer, buffer.position() << 2, function_pointer); } + public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glVertexAttribPointerARB_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, normalized, stride, buffer, buffer.position(), function_pointer); + } public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(buffer); diff --git a/src/java/org/lwjgl/opengl/ATIElementArray.java b/src/java/org/lwjgl/opengl/ATIElementArray.java index f55489fd..9dbbbaf4 100644 --- a/src/java/org/lwjgl/opengl/ATIElementArray.java +++ b/src/java/org/lwjgl/opengl/ATIElementArray.java @@ -30,6 +30,13 @@ public final class ATIElementArray { } private static native void nglDrawElementArrayATI(int mode, int count, long function_pointer); + public static void glElementPointerATI(ShortBuffer pPointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ATI_element_array_glElementPointerATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position() << 1, function_pointer); + } public static void glElementPointerATI(IntBuffer pPointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pPointer); @@ -44,13 +51,6 @@ public final class ATIElementArray { BufferChecks.checkFunctionAddress(function_pointer); nglElementPointerATI(GL11.GL_UNSIGNED_BYTE, pPointer, pPointer.position(), function_pointer); } - public static void glElementPointerATI(ShortBuffer pPointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ATI_element_array_glElementPointerATI_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position() << 1, function_pointer); - } private static native void nglElementPointerATI(int type, Buffer pPointer, int pPointer_position, long function_pointer); public static void glElementPointerATI(int type, int pPointer_buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); diff --git a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java index bfe9b38d..5bbde3f1 100644 --- a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java +++ b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java @@ -90,30 +90,30 @@ public final class ATIVertexArrayObject { } private static native void nglGetObjectBufferfvATI(int buffer, int pname, FloatBuffer params, int params_position, long function_pointer); - public static void glUpdateObjectBufferATI(int buffer, int offset, IntBuffer pPointer, int preserve) { - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer); - } - public static void glUpdateObjectBufferATI(int buffer, int offset, FloatBuffer pPointer, int preserve) { - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer); - } public static void glUpdateObjectBufferATI(int buffer, int offset, ShortBuffer pPointer, int preserve) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 1), pPointer, pPointer.position() << 1, preserve, function_pointer); } + public static void glUpdateObjectBufferATI(int buffer, int offset, IntBuffer pPointer, int preserve) { + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer); + } public static void glUpdateObjectBufferATI(int buffer, int offset, ByteBuffer pPointer, int preserve) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining()), pPointer, pPointer.position(), preserve, function_pointer); } + public static void glUpdateObjectBufferATI(int buffer, int offset, FloatBuffer pPointer, int preserve) { + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer); + } private static native void nglUpdateObjectBufferATI(int buffer, int offset, int size, Buffer pPointer, int pPointer_position, int preserve, long function_pointer); public static boolean glIsObjectBufferATI(int buffer) { @@ -130,20 +130,6 @@ public final class ATIVertexArrayObject { int __result = nglNewObjectBufferATI(size, null, 0, usage, function_pointer); return __result; } - public static int glNewObjectBufferATI(IntBuffer pPointer, int usage) { - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer); - return __result; - } - public static int glNewObjectBufferATI(FloatBuffer pPointer, int usage) { - BufferChecks.checkDirect(pPointer); - long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer); - return __result; - } public static int glNewObjectBufferATI(ShortBuffer pPointer, int usage) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer; @@ -151,6 +137,13 @@ public final class ATIVertexArrayObject { int __result = nglNewObjectBufferATI((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, usage, function_pointer); return __result; } + public static int glNewObjectBufferATI(IntBuffer pPointer, int usage) { + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer); + return __result; + } public static int glNewObjectBufferATI(ByteBuffer pPointer, int usage) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer; @@ -158,5 +151,12 @@ public final class ATIVertexArrayObject { int __result = nglNewObjectBufferATI((pPointer.remaining()), pPointer, pPointer.position(), usage, function_pointer); return __result; } + public static int glNewObjectBufferATI(FloatBuffer pPointer, int usage) { + BufferChecks.checkDirect(pPointer); + long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer); + return __result; + } private static native int nglNewObjectBufferATI(int size, Buffer pPointer, int pPointer_position, int usage, long function_pointer); } diff --git a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java index be88509d..88c687d5 100644 --- a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java +++ b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java @@ -15,13 +15,6 @@ public final class EXTDrawRangeElements { static native void initNativeStubs() throws LWJGLException; - public static void glDrawRangeElementsEXT(int mode, int start, int end, ShortBuffer pIndices) { - GLBufferChecks.ensureElementVBOdisabled(); - BufferChecks.checkDirect(pIndices); - long function_pointer = GLContext.getCapabilities().EXT_draw_range_elements_glDrawRangeElementsEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_SHORT, pIndices, pIndices.position() << 1, function_pointer); - } public static void glDrawRangeElementsEXT(int mode, int start, int end, IntBuffer pIndices) { GLBufferChecks.ensureElementVBOdisabled(); BufferChecks.checkDirect(pIndices); @@ -29,6 +22,13 @@ public final class EXTDrawRangeElements { BufferChecks.checkFunctionAddress(function_pointer); nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_INT, pIndices, pIndices.position() << 2, function_pointer); } + public static void glDrawRangeElementsEXT(int mode, int start, int end, ShortBuffer pIndices) { + GLBufferChecks.ensureElementVBOdisabled(); + BufferChecks.checkDirect(pIndices); + long function_pointer = GLContext.getCapabilities().EXT_draw_range_elements_glDrawRangeElementsEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_SHORT, pIndices, pIndices.position() << 1, function_pointer); + } public static void glDrawRangeElementsEXT(int mode, int start, int end, ByteBuffer pIndices) { GLBufferChecks.ensureElementVBOdisabled(); BufferChecks.checkDirect(pIndices); diff --git a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java b/src/java/org/lwjgl/opengl/EXTPalettedTexture.java index 21eeb057..970e5ca8 100644 --- a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java +++ b/src/java/org/lwjgl/opengl/EXTPalettedTexture.java @@ -50,12 +50,6 @@ public final class EXTPalettedTexture { BufferChecks.checkFunctionAddress(function_pointer); nglGetColorTableEXT(target, format, type, data, data.position(), function_pointer); } - public static void glGetColorTableEXT(int target, int format, int type, IntBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetColorTableEXT(target, format, type, data, data.position() << 2, function_pointer); - } public static void glGetColorTableEXT(int target, int format, int type, ShortBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableEXT_pointer; @@ -68,6 +62,12 @@ public final class EXTPalettedTexture { BufferChecks.checkFunctionAddress(function_pointer); nglGetColorTableEXT(target, format, type, data, data.position() << 2, function_pointer); } + public static void glGetColorTableEXT(int target, int format, int type, IntBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetColorTableEXT(target, format, type, data, data.position() << 2, function_pointer); + } private static native void nglGetColorTableEXT(int target, int format, int type, Buffer data, int data_position, long function_pointer); public static void glColorSubTableEXT(int target, int start, int count, int format, int type, ByteBuffer data) { @@ -76,12 +76,6 @@ public final class EXTPalettedTexture { BufferChecks.checkFunctionAddress(function_pointer); nglColorSubTableEXT(target, start, count, format, type, data, data.position(), function_pointer); } - public static void glColorSubTableEXT(int target, int start, int count, int format, int type, IntBuffer data) { - BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1)); - long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorSubTableEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglColorSubTableEXT(target, start, count, format, type, data, data.position() << 2, function_pointer); - } public static void glColorSubTableEXT(int target, int start, int count, int format, int type, ShortBuffer data) { BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1)); long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorSubTableEXT_pointer; @@ -94,6 +88,12 @@ public final class EXTPalettedTexture { BufferChecks.checkFunctionAddress(function_pointer); nglColorSubTableEXT(target, start, count, format, type, data, data.position() << 2, function_pointer); } + public static void glColorSubTableEXT(int target, int start, int count, int format, int type, IntBuffer data) { + BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1)); + long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorSubTableEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglColorSubTableEXT(target, start, count, format, type, data, data.position() << 2, function_pointer); + } private static native void nglColorSubTableEXT(int target, int start, int count, int format, int type, Buffer data, int data_position, long function_pointer); public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, ByteBuffer data) { @@ -102,12 +102,6 @@ public final class EXTPalettedTexture { BufferChecks.checkFunctionAddress(function_pointer); nglColorTableEXT(target, internalFormat, width, format, type, data, data.position(), function_pointer); } - public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, IntBuffer data) { - BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1)); - long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorTableEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglColorTableEXT(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer); - } public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, ShortBuffer data) { BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1)); long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorTableEXT_pointer; @@ -120,5 +114,11 @@ public final class EXTPalettedTexture { BufferChecks.checkFunctionAddress(function_pointer); nglColorTableEXT(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer); } + public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, IntBuffer data) { + BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1)); + long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorTableEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglColorTableEXT(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer); + } private static native void nglColorTableEXT(int target, int internalFormat, int width, int format, int type, Buffer data, int data_position, long function_pointer); } diff --git a/src/java/org/lwjgl/opengl/EXTVertexShader.java b/src/java/org/lwjgl/opengl/EXTVertexShader.java index 60178a94..fc4be5ea 100644 --- a/src/java/org/lwjgl/opengl/EXTVertexShader.java +++ b/src/java/org/lwjgl/opengl/EXTVertexShader.java @@ -265,13 +265,6 @@ public final class EXTVertexShader { } private static native void nglEnableVariantClientStateEXT(int id, long function_pointer); - public static void glVariantPointerEXT(int id, boolean unsigned, int stride, ShortBuffer pAddr) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pAddr); - long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1, function_pointer); - } public static void glVariantPointerEXT(int id, boolean unsigned, int stride, IntBuffer pAddr) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pAddr); @@ -279,6 +272,13 @@ public final class EXTVertexShader { BufferChecks.checkFunctionAddress(function_pointer); nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pAddr, pAddr.position() << 2, function_pointer); } + public static void glVariantPointerEXT(int id, boolean unsigned, int stride, ShortBuffer pAddr) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pAddr); + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1, function_pointer); + } public static void glVariantPointerEXT(int id, int stride, FloatBuffer pAddr) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pAddr); @@ -358,18 +358,18 @@ public final class EXTVertexShader { } private static native void nglVariantbvEXT(int id, ByteBuffer pAddr, int pAddr_position, long function_pointer); - public static void glSetLocalConstantEXT(int id, boolean unsigned, ShortBuffer pAddr) { - BufferChecks.checkBuffer(pAddr, 4); - long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer); - } public static void glSetLocalConstantEXT(int id, boolean unsigned, IntBuffer pAddr) { BufferChecks.checkBuffer(pAddr, 4); long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2, function_pointer); } + public static void glSetLocalConstantEXT(int id, boolean unsigned, ShortBuffer pAddr) { + BufferChecks.checkBuffer(pAddr, 4); + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer); + } public static void glSetLocalConstantEXT(int id, FloatBuffer pAddr) { BufferChecks.checkBuffer(pAddr, 4); long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer; @@ -384,18 +384,18 @@ public final class EXTVertexShader { } private static native void nglSetLocalConstantEXT(int id, int type, Buffer pAddr, int pAddr_position, long function_pointer); - public static void glSetInvariantEXT(int id, boolean unsigned, ShortBuffer pAddr) { - BufferChecks.checkBuffer(pAddr, 4); - long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer); - } public static void glSetInvariantEXT(int id, boolean unsigned, IntBuffer pAddr) { BufferChecks.checkBuffer(pAddr, 4); long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2, function_pointer); } + public static void glSetInvariantEXT(int id, boolean unsigned, ShortBuffer pAddr) { + BufferChecks.checkBuffer(pAddr, 4); + long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer); + } public static void glSetInvariantEXT(int id, FloatBuffer pAddr) { BufferChecks.checkBuffer(pAddr, 4); long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer; diff --git a/src/java/org/lwjgl/opengl/GL11.java b/src/java/org/lwjgl/opengl/GL11.java index 5810fdf2..11ba0d2c 100644 --- a/src/java/org/lwjgl/opengl/GL11.java +++ b/src/java/org/lwjgl/opengl/GL11.java @@ -700,20 +700,6 @@ public final class GL11 { } private static native void nglTexParameterf(int target, int pname, float param, long function_pointer); - public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 1, function_pointer); - } - public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 2, function_pointer); - } public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, FloatBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); @@ -728,6 +714,20 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position(), function_pointer); } + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 1, function_pointer); + } + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 2, function_pointer); + } private static native void nglTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -737,20 +737,6 @@ public final class GL11 { } private static native void nglTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer); - public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ShortBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 1, function_pointer); - } - public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, IntBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 2, function_pointer); - } public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, FloatBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1)); @@ -765,6 +751,20 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position(), function_pointer); } + public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ShortBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 1, function_pointer); + } + public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, IntBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 2, function_pointer); + } private static native void nglTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -774,22 +774,6 @@ public final class GL11 { } private static native void nglTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset, long function_pointer); - public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - if (pixels != null) - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)); - long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); - } - public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - if (pixels != null) - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)); - long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer); - } public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, FloatBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); if (pixels != null) @@ -806,6 +790,22 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() : 0, function_pointer); } + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + if (pixels != null) + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)); + long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); + } + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + if (pixels != null) + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border)); + long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer); + } private static native void nglTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -815,22 +815,6 @@ public final class GL11 { } private static native void nglTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels_buffer_offset, long function_pointer); - public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - if (pixels != null) - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border)); - long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); - } - public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, IntBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - if (pixels != null) - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border)); - long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer); - } public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, FloatBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); if (pixels != null) @@ -847,6 +831,22 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() : 0, function_pointer); } + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + if (pixels != null) + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border)); + long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); + } + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, IntBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + if (pixels != null) + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border)); + long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer); + } private static native void nglTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -905,13 +905,6 @@ public final class GL11 { } private static native void nglVertex2f(float x, float y, long function_pointer); - public static void glVertexPointer(int size, int stride, IntBuffer pointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pointer); - long function_pointer = GLContext.getCapabilities().GL11_glVertexPointer_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglVertexPointer(size, GL11.GL_INT, stride, pointer, pointer.position() << 2, function_pointer); - } public static void glVertexPointer(int size, int stride, FloatBuffer pointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pointer); @@ -919,6 +912,13 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglVertexPointer(size, GL11.GL_FLOAT, stride, pointer, pointer.position() << 2, function_pointer); } + public static void glVertexPointer(int size, int stride, IntBuffer pointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + long function_pointer = GLContext.getCapabilities().GL11_glVertexPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexPointer(size, GL11.GL_INT, stride, pointer, pointer.position() << 2, function_pointer); + } private static native void nglVertexPointer(int size, int type, int stride, Buffer pointer, int pointer_position, long function_pointer); public static void glVertexPointer(int size, int type, int stride, int pointer_buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); @@ -1042,6 +1042,13 @@ public final class GL11 { } private static native void nglReadBuffer(int mode, long function_pointer); + public static void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer pixels) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglReadPixels(x, y, width, height, format, type, pixels, pixels.position(), function_pointer); + } public static void glReadPixels(int x, int y, int width, int height, int format, int type, ShortBuffer pixels) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); @@ -1056,13 +1063,6 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 2, function_pointer); } - public static void glReadPixels(int x, int y, int width, int height, int format, int type, ByteBuffer pixels) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglReadPixels(x, y, width, height, format, type, pixels, pixels.position(), function_pointer); - } private static native void nglReadPixels(int x, int y, int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glReadPixels(int x, int y, int width, int height, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -1173,13 +1173,6 @@ public final class GL11 { } private static native void nglNormal3b(byte nx, byte ny, byte nz, long function_pointer); - public static void glNormalPointer(int stride, IntBuffer pointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pointer); - long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglNormalPointer(GL11.GL_INT, stride, pointer, pointer.position() << 2, function_pointer); - } public static void glNormalPointer(int stride, FloatBuffer pointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pointer); @@ -1194,6 +1187,13 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglNormalPointer(GL11.GL_BYTE, stride, pointer, pointer.position(), function_pointer); } + public static void glNormalPointer(int stride, IntBuffer pointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglNormalPointer(GL11.GL_INT, stride, pointer, pointer.position() << 2, function_pointer); + } private static native void nglNormalPointer(int type, int stride, Buffer pointer, int pointer_position, long function_pointer); public static void glNormalPointer(int type, int stride, int pointer_buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); @@ -1586,6 +1586,13 @@ public final class GL11 { } private static native void nglGetTexGeniv(int coord, int pname, IntBuffer params, int params_position, long function_pointer); + public static void glGetTexImage(int target, int level, int format, int type, ByteBuffer pixels) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetTexImage(target, level, format, type, pixels, pixels.position(), function_pointer); + } public static void glGetTexImage(int target, int level, int format, int type, ShortBuffer pixels) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1)); @@ -1600,13 +1607,6 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglGetTexImage(target, level, format, type, pixels, pixels.position() << 2, function_pointer); } - public static void glGetTexImage(int target, int level, int format, int type, ByteBuffer pixels) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetTexImage(target, level, format, type, pixels, pixels.position(), function_pointer); - } private static native void nglGetTexImage(int target, int level, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glGetTexImage(int target, int level, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -1662,20 +1662,6 @@ public final class GL11 { } private static native void nglInitNames(long function_pointer); - public static void glInterleavedArrays(int format, int stride, ShortBuffer pointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pointer); - long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglInterleavedArrays(format, stride, pointer, pointer.position() << 1, function_pointer); - } - public static void glInterleavedArrays(int format, int stride, IntBuffer pointer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(pointer); - long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglInterleavedArrays(format, stride, pointer, pointer.position() << 2, function_pointer); - } public static void glInterleavedArrays(int format, int stride, FloatBuffer pointer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(pointer); @@ -1690,6 +1676,20 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglInterleavedArrays(format, stride, pointer, pointer.position(), function_pointer); } + public static void glInterleavedArrays(int format, int stride, ShortBuffer pointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglInterleavedArrays(format, stride, pointer, pointer.position() << 1, function_pointer); + } + public static void glInterleavedArrays(int format, int stride, IntBuffer pointer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(pointer); + long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglInterleavedArrays(format, stride, pointer, pointer.position() << 2, function_pointer); + } private static native void nglInterleavedArrays(int format, int stride, Buffer pointer, int pointer_position, long function_pointer); public static void glInterleavedArrays(int format, int stride, int pointer_buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); @@ -1976,13 +1976,6 @@ public final class GL11 { } private static native void nglDrawBuffer(int mode, long function_pointer); - public static void glDrawElements(int mode, IntBuffer indices) { - GLBufferChecks.ensureElementVBOdisabled(); - BufferChecks.checkDirect(indices); - long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_INT, indices, indices.position() << 2, function_pointer); - } public static void glDrawElements(int mode, ShortBuffer indices) { GLBufferChecks.ensureElementVBOdisabled(); BufferChecks.checkDirect(indices); @@ -1990,6 +1983,13 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer); } + public static void glDrawElements(int mode, IntBuffer indices) { + GLBufferChecks.ensureElementVBOdisabled(); + BufferChecks.checkDirect(indices); + long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_INT, indices, indices.position() << 2, function_pointer); + } public static void glDrawElements(int mode, ByteBuffer indices) { GLBufferChecks.ensureElementVBOdisabled(); BufferChecks.checkDirect(indices); @@ -2006,6 +2006,13 @@ public final class GL11 { } private static native void nglDrawElementsBO(int mode, int count, int type, int indices_buffer_offset, long function_pointer); + public static void glDrawPixels(int width, int height, int format, int type, ByteBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); + long function_pointer = GLContext.getCapabilities().GL11_glDrawPixels_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglDrawPixels(width, height, format, type, pixels, pixels.position(), function_pointer); + } public static void glDrawPixels(int width, int height, int format, int type, ShortBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); @@ -2020,13 +2027,6 @@ public final class GL11 { BufferChecks.checkFunctionAddress(function_pointer); nglDrawPixels(width, height, format, type, pixels, pixels.position() << 2, function_pointer); } - public static void glDrawPixels(int width, int height, int format, int type, ByteBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1)); - long function_pointer = GLContext.getCapabilities().GL11_glDrawPixels_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglDrawPixels(width, height, format, type, pixels, pixels.position(), function_pointer); - } private static native void nglDrawPixels(int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glDrawPixels(int width, int height, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -2352,18 +2352,18 @@ public final class GL11 { } private static native void nglCallList(int list, long function_pointer); - public static void glCallLists(IntBuffer lists) { - BufferChecks.checkDirect(lists); - long function_pointer = GLContext.getCapabilities().GL11_glCallLists_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_INT, lists, lists.position() << 2, function_pointer); - } public static void glCallLists(ShortBuffer lists) { BufferChecks.checkDirect(lists); long function_pointer = GLContext.getCapabilities().GL11_glCallLists_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_SHORT, lists, lists.position() << 1, function_pointer); } + public static void glCallLists(IntBuffer lists) { + BufferChecks.checkDirect(lists); + long function_pointer = GLContext.getCapabilities().GL11_glCallLists_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_INT, lists, lists.position() << 2, function_pointer); + } public static void glCallLists(ByteBuffer lists) { BufferChecks.checkDirect(lists); long function_pointer = GLContext.getCapabilities().GL11_glCallLists_pointer; diff --git a/src/java/org/lwjgl/opengl/GL12.java b/src/java/org/lwjgl/opengl/GL12.java index 724553a9..a39f93a8 100644 --- a/src/java/org/lwjgl/opengl/GL12.java +++ b/src/java/org/lwjgl/opengl/GL12.java @@ -57,20 +57,6 @@ public final class GL12 { } private static native void nglCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height, long function_pointer); - public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth)); - long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 1, function_pointer); - } - public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, IntBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth)); - long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 2, function_pointer); - } public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, FloatBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth)); @@ -85,6 +71,20 @@ public final class GL12 { BufferChecks.checkFunctionAddress(function_pointer); nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position(), function_pointer); } + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth)); + long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 1, function_pointer); + } + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, IntBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth)); + long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 2, function_pointer); + } private static native void nglTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -94,22 +94,6 @@ public final class GL12 { } private static native void nglTexSubImage3DBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int pixels_buffer_offset, long function_pointer); - public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - if (pixels != null) - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)); - long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); - } - public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, IntBuffer pixels) { - GLBufferChecks.ensureUnpackPBOdisabled(); - if (pixels != null) - BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)); - long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer); - } public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, FloatBuffer pixels) { GLBufferChecks.ensureUnpackPBOdisabled(); if (pixels != null) @@ -126,6 +110,22 @@ public final class GL12 { BufferChecks.checkFunctionAddress(function_pointer); nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() : 0, function_pointer); } + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + if (pixels != null) + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)); + long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer); + } + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, IntBuffer pixels) { + GLBufferChecks.ensureUnpackPBOdisabled(); + if (pixels != null) + BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border)); + long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer); + } private static native void nglTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer); public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int pixels_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -135,13 +135,6 @@ public final class GL12 { } private static native void nglTexImage3DBO(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int pixels_buffer_offset, long function_pointer); - public static void glDrawRangeElements(int mode, int start, int end, IntBuffer indices) { - GLBufferChecks.ensureElementVBOdisabled(); - BufferChecks.checkDirect(indices); - long function_pointer = GLContext.getCapabilities().GL12_glDrawRangeElements_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_INT, indices, indices.position() << 2, function_pointer); - } public static void glDrawRangeElements(int mode, int start, int end, ShortBuffer indices) { GLBufferChecks.ensureElementVBOdisabled(); BufferChecks.checkDirect(indices); @@ -149,6 +142,13 @@ public final class GL12 { BufferChecks.checkFunctionAddress(function_pointer); nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer); } + public static void glDrawRangeElements(int mode, int start, int end, IntBuffer indices) { + GLBufferChecks.ensureElementVBOdisabled(); + BufferChecks.checkDirect(indices); + long function_pointer = GLContext.getCapabilities().GL12_glDrawRangeElements_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_INT, indices, indices.position() << 2, function_pointer); + } public static void glDrawRangeElements(int mode, int start, int end, ByteBuffer indices) { GLBufferChecks.ensureElementVBOdisabled(); BufferChecks.checkDirect(indices); diff --git a/src/java/org/lwjgl/opengl/GL13.java b/src/java/org/lwjgl/opengl/GL13.java index 3aafd906..18bf6810 100644 --- a/src/java/org/lwjgl/opengl/GL13.java +++ b/src/java/org/lwjgl/opengl/GL13.java @@ -160,6 +160,13 @@ public final class GL13 { } private static native void nglMultiTexCoord1f(int target, float s, long function_pointer); + public static void glGetCompressedTexImage(int target, int lod, ByteBuffer img) { + GLBufferChecks.ensurePackPBOdisabled(); + BufferChecks.checkDirect(img); + long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetCompressedTexImage(target, lod, img, img.position(), function_pointer); + } public static void glGetCompressedTexImage(int target, int lod, ShortBuffer img) { GLBufferChecks.ensurePackPBOdisabled(); BufferChecks.checkDirect(img); @@ -174,13 +181,6 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglGetCompressedTexImage(target, lod, img, img.position() << 2, function_pointer); } - public static void glGetCompressedTexImage(int target, int lod, ByteBuffer img) { - GLBufferChecks.ensurePackPBOdisabled(); - BufferChecks.checkDirect(img); - long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetCompressedTexImage(target, lod, img, img.position(), function_pointer); - } private static native void nglGetCompressedTexImage(int target, int lod, Buffer img, int img_position, long function_pointer); public static void glGetCompressedTexImage(int target, int lod, int img_buffer_offset) { GLBufferChecks.ensurePackPBOenabled(); @@ -190,20 +190,6 @@ public final class GL13 { } private static native void nglGetCompressedTexImageBO(int target, int lod, int img_buffer_offset, long function_pointer); - public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, function_pointer); - } - public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer); - } public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(data); @@ -218,6 +204,20 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, function_pointer); + } + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer); + } private static native void nglCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer data, int data_position, long function_pointer); public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -227,20 +227,6 @@ public final class GL13 { } private static native void nglCompressedTexSubImage3DBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data_buffer_offset, long function_pointer); - public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, function_pointer); - } - public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer); - } public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(data); @@ -255,6 +241,20 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, function_pointer); + } + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer); + } private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data, int data_position, long function_pointer); public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -264,20 +264,6 @@ public final class GL13 { } private static native void nglCompressedTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data_buffer_offset, long function_pointer); - public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, function_pointer); - } - public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer); - } public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(data); @@ -292,6 +278,20 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, function_pointer); + } + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer); + } private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, Buffer data, int data_position, long function_pointer); public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -301,20 +301,6 @@ public final class GL13 { } private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset, long function_pointer); - public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, function_pointer); - } - public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer); - } public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(data); @@ -329,6 +315,20 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, function_pointer); + } + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer); + } private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer data, int data_position, long function_pointer); public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -338,20 +338,6 @@ public final class GL13 { } private static native void nglCompressedTexImage3DBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data_buffer_offset, long function_pointer); - public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, function_pointer); - } - public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer); - } public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(data); @@ -366,6 +352,20 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, function_pointer); + } + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer); + } private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data, int data_position, long function_pointer); public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); @@ -375,20 +375,6 @@ public final class GL13 { } private static native void nglCompressedTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data_buffer_offset, long function_pointer); - public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, function_pointer); - } - public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) { - GLBufferChecks.ensureUnpackPBOdisabled(); - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer); - } public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) { GLBufferChecks.ensureUnpackPBOdisabled(); BufferChecks.checkDirect(data); @@ -403,6 +389,20 @@ public final class GL13 { BufferChecks.checkFunctionAddress(function_pointer); nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position(), function_pointer); } + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, function_pointer); + } + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) { + GLBufferChecks.ensureUnpackPBOdisabled(); + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer); + } private static native void nglCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, Buffer data, int data_position, long function_pointer); public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int data_buffer_offset) { GLBufferChecks.ensureUnpackPBOenabled(); diff --git a/src/java/org/lwjgl/opengl/GL15.java b/src/java/org/lwjgl/opengl/GL15.java index 3a8a813d..2a2c6a5d 100644 --- a/src/java/org/lwjgl/opengl/GL15.java +++ b/src/java/org/lwjgl/opengl/GL15.java @@ -158,18 +158,6 @@ public final class GL15 { } private static native java.nio.ByteBuffer nglMapBuffer(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer); - public static void glGetBufferSubData(int target, int offset, ShortBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); - } - public static void glGetBufferSubData(int target, int offset, IntBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); - } public static void glGetBufferSubData(int target, int offset, FloatBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; @@ -182,20 +170,20 @@ public final class GL15 { BufferChecks.checkFunctionAddress(function_pointer); nglGetBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } + public static void glGetBufferSubData(int target, int offset, ShortBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); + } + public static void glGetBufferSubData(int target, int offset, IntBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); + } private static native void nglGetBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer); - public static void glBufferSubData(int target, int offset, ShortBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); - } - public static void glBufferSubData(int target, int offset, IntBuffer data) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); - } public static void glBufferSubData(int target, int offset, FloatBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; @@ -208,6 +196,18 @@ public final class GL15 { BufferChecks.checkFunctionAddress(function_pointer); nglBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } + public static void glBufferSubData(int target, int offset, ShortBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); + } + public static void glBufferSubData(int target, int offset, IntBuffer data) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); + } private static native void nglBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer); public static void glBufferData(int target, int size, int usage) { @@ -215,18 +215,6 @@ public final class GL15 { BufferChecks.checkFunctionAddress(function_pointer); nglBufferData(target, size, null, 0, usage, function_pointer); } - public static void glBufferData(int target, ShortBuffer data, int usage) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglBufferData(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); - } - public static void glBufferData(int target, IntBuffer data, int usage) { - BufferChecks.checkDirect(data); - long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglBufferData(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer); - } public static void glBufferData(int target, FloatBuffer data, int usage) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; @@ -239,6 +227,18 @@ public final class GL15 { BufferChecks.checkFunctionAddress(function_pointer); nglBufferData(target, (data.remaining()), data, data.position(), usage, function_pointer); } + public static void glBufferData(int target, ShortBuffer data, int usage) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBufferData(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); + } + public static void glBufferData(int target, IntBuffer data, int usage) { + BufferChecks.checkDirect(data); + long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglBufferData(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer); + } private static native void nglBufferData(int target, int size, Buffer data, int data_position, int usage, long function_pointer); public static boolean glIsBuffer(int buffer) { diff --git a/src/java/org/lwjgl/opengl/GL20.java b/src/java/org/lwjgl/opengl/GL20.java index f8349e10..f371f59a 100644 --- a/src/java/org/lwjgl/opengl/GL20.java +++ b/src/java/org/lwjgl/opengl/GL20.java @@ -203,13 +203,6 @@ public final class GL20 { } private static native void nglEnableVertexAttribArray(int index, long function_pointer); - public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(buffer); - long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, normalized, stride, buffer, buffer.position() << 2, function_pointer); - } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(buffer); @@ -224,6 +217,13 @@ public final class GL20 { BufferChecks.checkFunctionAddress(function_pointer); nglVertexAttribPointer(index, size, GL11.GL_FLOAT, normalized, stride, buffer, buffer.position() << 2, function_pointer); } + public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, normalized, stride, buffer, buffer.position() << 2, function_pointer); + } public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(buffer); diff --git a/src/java/org/lwjgl/opengl/NVPixelDataRange.java b/src/java/org/lwjgl/opengl/NVPixelDataRange.java index 6333d1ca..ce6597c7 100644 --- a/src/java/org/lwjgl/opengl/NVPixelDataRange.java +++ b/src/java/org/lwjgl/opengl/NVPixelDataRange.java @@ -26,11 +26,11 @@ public final class NVPixelDataRange { } private static native void nglFlushPixelDataRangeNV(int target, long function_pointer); - public static void glPixelDataRangeNV(int target, IntBuffer data) { + public static void glPixelDataRangeNV(int target, ShortBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglPixelDataRangeNV(target, (data.remaining() << 2), data, data.position() << 2, function_pointer); + nglPixelDataRangeNV(target, (data.remaining() << 1), data, data.position() << 1, function_pointer); } public static void glPixelDataRangeNV(int target, ByteBuffer data) { BufferChecks.checkDirect(data); @@ -38,13 +38,13 @@ public final class NVPixelDataRange { BufferChecks.checkFunctionAddress(function_pointer); nglPixelDataRangeNV(target, (data.remaining()), data, data.position(), function_pointer); } - public static void glPixelDataRangeNV(int target, ShortBuffer data) { + public static void glPixelDataRangeNV(int target, FloatBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglPixelDataRangeNV(target, (data.remaining() << 1), data, data.position() << 1, function_pointer); + nglPixelDataRangeNV(target, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glPixelDataRangeNV(int target, FloatBuffer data) { + public static void glPixelDataRangeNV(int target, IntBuffer data) { BufferChecks.checkDirect(data); long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java index c873a417..b9b90d85 100644 --- a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java +++ b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java @@ -41,11 +41,11 @@ public final class NVVertexArrayRange { } private static native void nglFlushVertexArrayRangeNV(long function_pointer); - public static void glVertexArrayRangeNV(IntBuffer pPointer) { + public static void glVertexArrayRangeNV(ShortBuffer pPointer) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glVertexArrayRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglVertexArrayRangeNV((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, function_pointer); + nglVertexArrayRangeNV((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, function_pointer); } public static void glVertexArrayRangeNV(ByteBuffer pPointer) { BufferChecks.checkDirect(pPointer); @@ -53,13 +53,13 @@ public final class NVVertexArrayRange { BufferChecks.checkFunctionAddress(function_pointer); nglVertexArrayRangeNV((pPointer.remaining()), pPointer, pPointer.position(), function_pointer); } - public static void glVertexArrayRangeNV(ShortBuffer pPointer) { + public static void glVertexArrayRangeNV(FloatBuffer pPointer) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glVertexArrayRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); - nglVertexArrayRangeNV((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, function_pointer); + nglVertexArrayRangeNV((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, function_pointer); } - public static void glVertexArrayRangeNV(FloatBuffer pPointer) { + public static void glVertexArrayRangeNV(IntBuffer pPointer) { BufferChecks.checkDirect(pPointer); long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glVertexArrayRangeNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram.java b/src/java/org/lwjgl/opengl/NVVertexProgram.java index 648a6bd7..75ef4e73 100644 --- a/src/java/org/lwjgl/opengl/NVVertexProgram.java +++ b/src/java/org/lwjgl/opengl/NVVertexProgram.java @@ -225,13 +225,6 @@ public final class NVVertexProgram extends NVProgram { BufferChecks.checkFunctionAddress(function_pointer); nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 1, function_pointer); } - public static void glVertexAttribPointerNV(int index, int size, int type, int stride, IntBuffer buffer) { - GLBufferChecks.ensureArrayVBOdisabled(); - BufferChecks.checkDirect(buffer); - long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribPointerNV_pointer; - BufferChecks.checkFunctionAddress(function_pointer); - nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 2, function_pointer); - } public static void glVertexAttribPointerNV(int index, int size, int type, int stride, ByteBuffer buffer) { GLBufferChecks.ensureArrayVBOdisabled(); BufferChecks.checkDirect(buffer); @@ -246,6 +239,13 @@ public final class NVVertexProgram extends NVProgram { BufferChecks.checkFunctionAddress(function_pointer); nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 2, function_pointer); } + public static void glVertexAttribPointerNV(int index, int size, int type, int stride, IntBuffer buffer) { + GLBufferChecks.ensureArrayVBOdisabled(); + BufferChecks.checkDirect(buffer); + long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribPointerNV_pointer; + BufferChecks.checkFunctionAddress(function_pointer); + nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 2, function_pointer); + } private static native void nglVertexAttribPointerNV(int index, int size, int type, int stride, Buffer buffer, int buffer_position, long function_pointer); public static void glVertexAttribPointerNV(int index, int size, int type, int stride, int buffer_buffer_offset) { GLBufferChecks.ensureArrayVBOenabled(); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c b/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c index a089b217..bdae0c65 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBBufferObject.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetBufferPointervARBPROC) (GLenum target, GLenum pname, GLvoid ** pointer); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c b/src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c index 8810e0d7..1e89795e 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBColorBufferFloat.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glClampColorARBPROC) (GLenum target, GLenum clamp); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBDrawBuffers.c b/src/native/common/arb/org_lwjgl_opengl_ARBDrawBuffers.c index f3888729..bf45ff1c 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBDrawBuffers.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBDrawBuffers.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glDrawBuffersARBPROC) (GLsizei size, const GLenum * buffers); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBImaging.c b/src/native/common/arb/org_lwjgl_opengl_ARBImaging.c index 26b16d6d..0e9de428 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBImaging.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBImaging.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetSeparableFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c b/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c index 10eb133b..9d2e8687 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glMatrixIndexuivARBPROC) (GLint size, GLuint * pIndices); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.c b/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.c index 2b993557..96682410 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glSampleCoverageARBPROC) (GLclampf value, GLboolean invert); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.c b/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.c index 7306dcc9..39e2f858 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glMultiTexCoord4sARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c b/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c index 065a147a..86da6851 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetQueryObjectuivARBPROC) (GLuint id, GLenum pname, GLint * params); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.c b/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.c index 2a567a5c..a26aa0a3 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glPointParameterfvARBPROC) (GLenum pname, GLfloat * pfParams); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBProgram.c b/src/native/common/arb/org_lwjgl_opengl_ARBProgram.c index 56079bb4..86900e24 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBProgram.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBProgram.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef GLboolean (APIENTRY *glIsProgramARBPROC) (GLuint program); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c b/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c index 6b52fb70..1cc2b75c 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetShaderSourceARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * source); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c b/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c index 4e42ba78..e48261c9 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetCompressedTexImageARBPROC) (GLenum target, GLint lod, GLvoid * pImg); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c b/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c index f1f1fd70..15ee4d8a 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glMultTransposeMatrixfARBPROC) (GLfloat * pfMtx); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c index c61622ee..6696b932 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glVertexBlendARBPROC) (GLint count); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c b/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c index 6cade551..259e8efe 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetVertexAttribPointervARBPROC) (GLuint index, GLenum pname, GLvoid ** result); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.c b/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.c index 498cd1e3..24e9f7b7 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef GLint (APIENTRY *glGetAttribLocationARBPROC) (GLhandleARB programObj, const GLcharARB * name); diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.c b/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.c index b17f5574..1758a6a5 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.c +++ b/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glWindowPos3sARBPROC) (GLshort x, GLshort y, GLshort z); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.c b/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.c index 7da6bcf0..ee1b5ab5 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glDrawBuffersATIPROC) (GLsizei size, const GLenum * buffers); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.c b/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.c index 939b451d..d64209d1 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glDrawRangeElementArrayATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c b/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c index f3be6483..5023ef9f 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetTexBumpParameterivATIPROC) (GLenum pname, GLint * param); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c b/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c index d4093ac8..28f30df5 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glSetFragmentShaderConstantATIPROC) (GLuint dst, const GLfloat * pfValue); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c b/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c index 91012142..fa526d23 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glUnmapObjectBufferATIPROC) (GLuint buffer); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c b/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c index 1fffe67f..0506e3ed 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glPNTrianglesiATIPROC) (GLenum pname, GLint param); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c b/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c index 9d2128e4..572023e9 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glStencilFuncSeparateATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c b/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c index c3344d1c..c228837c 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetVariantArrayObjectivATIPROC) (GLuint id, GLenum pname, GLint * params); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c b/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c index b43cbb46..ae2302ed 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetVertexAttribArrayObjectivATIPROC) (GLuint index, GLenum pname, GLint * params); diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c b/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c index 1d90a592..dedde654 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c +++ b/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glVertexBlendEnviATIPROC) (GLenum pname, GLint param); diff --git a/src/native/common/common_tools.h b/src/native/common/common_tools.h index 190438ca..75645481 100644 --- a/src/native/common/common_tools.h +++ b/src/native/common/common_tools.h @@ -67,6 +67,10 @@ typedef enum {false, true} bool; #ifdef _WIN32 #define inline __inline +#include +typedef INT_PTR intptr_t; +#else +#include #endif static inline void * safeGetBufferAddress(JNIEnv *env, jobject buffer) { diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.c b/src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.c index 61d7d671..11fcfe19 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTBlendEquationSeparate.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glBlendEquationSeparateEXTPROC) (GLenum modeRGB, GLenum modeAlpha); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.c b/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.c index 015c50d9..6efcd8f5 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glBlendFuncSeparateEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c b/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c index e2bedaa1..5910a613 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glUnlockArraysEXTPROC) (); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTDepthBoundsTest.c b/src/native/common/ext/org_lwjgl_opengl_EXTDepthBoundsTest.c index cd3a2c59..4961787e 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTDepthBoundsTest.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTDepthBoundsTest.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glDepthBoundsEXTPROC) (GLclampd zmin, GLclampd zmax); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.c b/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.c index 6bb99aff..04194685 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glDrawRangeElementsEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * pIndices); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.c b/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.c index 19645fa6..b13e9dfb 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glFogCoordPointerEXTPROC) (GLenum type, GLsizei stride, const GLvoid * data); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c b/src/native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c index 12acf9cc..04b35f4f 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTFramebufferObject.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGenerateMipmapEXTPROC) (GLenum target); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.c b/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.c index 56cb069d..fb5f2e94 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glMultiDrawArraysEXTPROC) (GLenum mode, GLint * piFirst, GLsizei * piCount, GLint primcount); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c b/src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c index 484bce91..a99c6e54 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTPalettedTexture.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetColorTableParameterfvEXTPROC) (GLenum target, GLenum pname, GLfloat * params); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.c b/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.c index 9f5a0dab..da7d1e18 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glPointParameterfvEXTPROC) (GLenum pname, const GLfloat * pfParams); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c b/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c index b7553473..2cdcdcb8 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glSecondaryColorPointerEXTPROC) (GLint size, GLenum type, GLsizei stride, GLvoid * pPointer); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.c b/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.c index 584bf4dd..7ef46f74 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glActiveStencilFaceEXTPROC) (GLenum face); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.c b/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.c index c4ab46fa..d1498e26 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetLocalConstantFloatvEXTPROC) (GLuint id, GLenum value, GLfloat * pbData); diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c b/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c index 2d916693..feecb8f1 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c +++ b/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glVertexWeightPointerEXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid * pPointer); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.c b/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.c index f6e4e4ae..e3797838 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glEvalMapsNVPROC) (GLenum target, GLenum mode); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVFence.c b/src/native/common/nv/org_lwjgl_opengl_NVFence.c index 7d94bb94..3118db60 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVFence.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVFence.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetFenceivNVPROC) (GLuint fence, GLenum pname, GLint * piParams); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c b/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c index fd5866c9..13bb37f1 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetProgramNamedParameterfvNVPROC) (GLuint id, GLsizei length, const GLubyte * name, GLfloat * params); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.c b/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.c index e86dd5c1..5e376fad 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glVertexAttribs4hvNVPROC) (GLuint index, GLsizei n, const GLhalf * attribs); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c b/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c index 5f89e590..f36128a3 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetOcclusionQueryivNVPROC) (GLuint id, GLenum pname, GLint * params); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c b/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c index ffcaed03..e899cb07 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glFlushPixelDataRangeNVPROC) (GLenum target); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.c b/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.c index a85a84b5..76f08c7c 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glPointParameterivNVPROC) (GLenum pname, const GLint * params); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c b/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c index fc6d6dfa..437bdcd1 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glPrimitiveRestartIndexNVPROC) (GLuint index); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVProgram.c b/src/native/common/nv/org_lwjgl_opengl_NVProgram.c index fb836758..478de8e6 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVProgram.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVProgram.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glRequestResidentProgramsNVPROC) (GLsizei n, GLuint * programIDs); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c index d1e41bd7..b8c8a94d 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetFinalCombinerInputParameterivNVPROC) (GLenum variable, GLenum pname, GLint * params); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c index 41ac4898..4c50fced 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, GLfloat * params); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c b/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c index deed4a6e..3ba58952 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glFreeMemoryNVPROC) (GLvoid * pointer); diff --git a/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.c b/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.c index e7320cbc..67bfe823 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.c +++ b/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glVertexAttribs4fvNVPROC) (GLuint index, GLsizei n, const GLfloat * v); diff --git a/src/native/common/org_lwjgl_opengl_GL11.c b/src/native/common/org_lwjgl_opengl_GL11.c index de984e3f..19d314c4 100644 --- a/src/native/common/org_lwjgl_opengl_GL11.c +++ b/src/native/common/org_lwjgl_opengl_GL11.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glViewportPROC) (GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/native/common/org_lwjgl_opengl_GL12.c b/src/native/common/org_lwjgl_opengl_GL12.c index 20b0884d..cb2908a7 100644 --- a/src/native/common/org_lwjgl_opengl_GL12.c +++ b/src/native/common/org_lwjgl_opengl_GL12.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glCopyTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/native/common/org_lwjgl_opengl_GL13.c b/src/native/common/org_lwjgl_opengl_GL13.c index 51bfe05d..8365b2a6 100644 --- a/src/native/common/org_lwjgl_opengl_GL13.c +++ b/src/native/common/org_lwjgl_opengl_GL13.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glSampleCoveragePROC) (GLclampf value, GLboolean invert); diff --git a/src/native/common/org_lwjgl_opengl_GL14.c b/src/native/common/org_lwjgl_opengl_GL14.c index fd3d3355..81dd0154 100644 --- a/src/native/common/org_lwjgl_opengl_GL14.c +++ b/src/native/common/org_lwjgl_opengl_GL14.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glWindowPos3iPROC) (GLint x, GLint y, GLint z); diff --git a/src/native/common/org_lwjgl_opengl_GL15.c b/src/native/common/org_lwjgl_opengl_GL15.c index ad080b65..4f0e1b66 100644 --- a/src/native/common/org_lwjgl_opengl_GL15.c +++ b/src/native/common/org_lwjgl_opengl_GL15.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glGetQueryObjectuivPROC) (GLenum id, GLenum pname, GLuint * params); diff --git a/src/native/common/org_lwjgl_opengl_GL20.c b/src/native/common/org_lwjgl_opengl_GL20.c index 56cdebb5..f3e70444 100644 --- a/src/native/common/org_lwjgl_opengl_GL20.c +++ b/src/native/common/org_lwjgl_opengl_GL20.c @@ -1,7 +1,6 @@ /* MACHINE GENERATED FILE, DO NOT EDIT */ #include -#include #include "extgl.h" typedef void (APIENTRY *glBlendEquationSeparatePROC) (GLenum modeRGB, GLenum modeAlpha); diff --git a/src/native/common/org_lwjgl_opengl_GLContext.c b/src/native/common/org_lwjgl_opengl_GLContext.c index 41cff229..8625d93c 100644 --- a/src/native/common/org_lwjgl_opengl_GLContext.c +++ b/src/native/common/org_lwjgl_opengl_GLContext.c @@ -30,15 +30,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include +#include "common_tools.h" #include "org_lwjgl_opengl_GLContext.h" #include "extgl.h" JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_GLContext_getFunctionAddress(JNIEnv *env, jclass clazz, jstring function_name) { + jlong address_jlong; char *function_name_pointer = GetStringNativeChars(env, function_name); void *address = extgl_GetProcAddress(function_name_pointer); free(function_name_pointer); - jlong address_jlong = (jlong)(intptr_t)address; + address_jlong = (jlong)(intptr_t)address; return address_jlong; }