From d7c55744ce93926e65f58828715436a8ddd23ea4 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 26 Feb 2006 11:44:34 +0000 Subject: [PATCH] Widened VBO/PBO buffer offsets and sizes to long to better match the GLsizeiptr and GLintptr native types --- .../org/lwjgl/opengl/ARBBufferObject.java | 28 +++--- .../org/lwjgl/opengl/ARBImaging.java | 36 ++++---- .../org/lwjgl/opengl/ARBMatrixPalette.java | 4 +- .../lwjgl/opengl/ARBTextureCompression.java | 28 +++--- .../org/lwjgl/opengl/ARBVertexBlend.java | 4 +- .../org/lwjgl/opengl/ARBVertexProgram.java | 4 +- .../org/lwjgl/opengl/ARBVertexShader.java | 4 +- .../org/lwjgl/opengl/ATIElementArray.java | 4 +- .../lwjgl/opengl/EXTDrawRangeElements.java | 4 +- .../org/lwjgl/opengl/EXTFogCoord.java | 4 +- .../org/lwjgl/opengl/EXTSecondaryColor.java | 4 +- .../org/lwjgl/opengl/EXTVertexShader.java | 4 +- .../org/lwjgl/opengl/EXTVertexWeighting.java | 4 +- src/generated/org/lwjgl/opengl/GL11.java | 92 +++++++++---------- src/generated/org/lwjgl/opengl/GL12.java | 12 +-- src/generated/org/lwjgl/opengl/GL13.java | 28 +++--- src/generated/org/lwjgl/opengl/GL14.java | 8 +- src/generated/org/lwjgl/opengl/GL15.java | 28 +++--- src/generated/org/lwjgl/opengl/GL20.java | 4 +- .../org/lwjgl/opengl/NVVertexProgram.java | 4 +- .../org/lwjgl/util/generator/GLTypeMap.java | 20 ++-- .../util/generator/JNITypeTranslator.java | 3 + .../util/generator/JavaMethodsGenerator.java | 2 +- .../util/generator/JavaTypeTranslator.java | 3 + .../generator/NativeMethodStubsGenerator.java | 2 +- .../org/lwjgl/util/generator/TypeInfo.java | 3 + src/native/common/common_tools.h | 2 +- src/native/common/extgl.h | 9 +- .../org_lwjgl_opengl_ARBBufferObject.c | 6 +- .../generated/org_lwjgl_opengl_ARBImaging.c | 18 ++-- .../org_lwjgl_opengl_ARBMatrixPalette.c | 2 +- .../org_lwjgl_opengl_ARBTextureCompression.c | 14 +-- .../org_lwjgl_opengl_ARBVertexBlend.c | 2 +- .../org_lwjgl_opengl_ARBVertexProgram.c | 2 +- .../org_lwjgl_opengl_ARBVertexShader.c | 2 +- .../org_lwjgl_opengl_ATIElementArray.c | 2 +- .../org_lwjgl_opengl_EXTDrawRangeElements.c | 2 +- .../generated/org_lwjgl_opengl_EXTFogCoord.c | 2 +- .../org_lwjgl_opengl_EXTSecondaryColor.c | 2 +- .../org_lwjgl_opengl_EXTVertexShader.c | 2 +- .../org_lwjgl_opengl_EXTVertexWeighting.c | 2 +- src/native/generated/org_lwjgl_opengl_GL11.c | 46 +++++----- src/native/generated/org_lwjgl_opengl_GL12.c | 6 +- src/native/generated/org_lwjgl_opengl_GL13.c | 14 +-- src/native/generated/org_lwjgl_opengl_GL14.c | 4 +- src/native/generated/org_lwjgl_opengl_GL15.c | 6 +- src/native/generated/org_lwjgl_opengl_GL20.c | 2 +- .../org_lwjgl_opengl_NVVertexProgram.c | 2 +- .../org/lwjgl/opengl/ARB_buffer_object.java | 6 +- src/templates/org/lwjgl/opengl/GL15.java | 6 +- 50 files changed, 257 insertions(+), 245 deletions(-) diff --git a/src/generated/org/lwjgl/opengl/ARBBufferObject.java b/src/generated/org/lwjgl/opengl/ARBBufferObject.java index 6ade012a..749e32aa 100644 --- a/src/generated/org/lwjgl/opengl/ARBBufferObject.java +++ b/src/generated/org/lwjgl/opengl/ARBBufferObject.java @@ -66,7 +66,7 @@ public class ARBBufferObject { } private static native boolean nglIsBufferARB(int buffer, long function_pointer); - public static void glBufferDataARB(int target, int size, int usage) { + public static void glBufferDataARB(int target, long size, int usage) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBufferDataARB(target, size, null, 0, usage, function_pointer); @@ -101,71 +101,71 @@ public class ARBBufferObject { BufferChecks.checkDirect(data); nglBufferDataARB(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); } - private static native void nglBufferDataARB(int target, int size, Buffer data, int data_position, int usage, long function_pointer); + private static native void nglBufferDataARB(int target, long size, Buffer data, int data_position, int usage, long function_pointer); - public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) { + public static void glBufferSubDataARB(int target, long offset, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer); } - public static void glBufferSubDataARB(int target, int offset, DoubleBuffer data) { + public static void glBufferSubDataARB(int target, long offset, DoubleBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubDataARB(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); } - public static void glBufferSubDataARB(int target, int offset, FloatBuffer data) { + public static void glBufferSubDataARB(int target, long offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubDataARB(int target, int offset, IntBuffer data) { + public static void glBufferSubDataARB(int target, long offset, IntBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) { + public static void glBufferSubDataARB(int target, long offset, ShortBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } - private static native void nglBufferSubDataARB(int target, int offset, int size, Buffer data, int data_position, long function_pointer); + private static native void nglBufferSubDataARB(int target, long offset, long size, Buffer data, int data_position, long function_pointer); - public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) { + public static void glGetBufferSubDataARB(int target, long offset, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer); } - public static void glGetBufferSubDataARB(int target, int offset, DoubleBuffer data) { + public static void glGetBufferSubDataARB(int target, long offset, DoubleBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubDataARB(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); } - public static void glGetBufferSubDataARB(int target, int offset, FloatBuffer data) { + public static void glGetBufferSubDataARB(int target, long offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubDataARB(int target, int offset, IntBuffer data) { + public static void glGetBufferSubDataARB(int target, long offset, IntBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) { + public static void glGetBufferSubDataARB(int target, long offset, ShortBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } - private static native void nglGetBufferSubDataARB(int target, int offset, int size, Buffer data, int data_position, long function_pointer); + private static native void nglGetBufferSubDataARB(int target, long offset, long size, Buffer data, int data_position, long function_pointer); /** * glMapBufferARB maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, diff --git a/src/generated/org/lwjgl/opengl/ARBImaging.java b/src/generated/org/lwjgl/opengl/ARBImaging.java index fcef6637..621bc409 100644 --- a/src/generated/org/lwjgl/opengl/ARBImaging.java +++ b/src/generated/org/lwjgl/opengl/ARBImaging.java @@ -109,13 +109,13 @@ public final class ARBImaging { nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2, 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) { + public static void glColorTable(int target, int internalFormat, int width, int format, int type, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglColorTableBO(target, internalFormat, width, format, type, data_buffer_offset, function_pointer); } - private static native void nglColorTableBO(int target, int internalFormat, int width, int format, int type, int data_buffer_offset, long function_pointer); + private static native void nglColorTableBO(int target, int internalFormat, int width, int format, int type, long data_buffer_offset, long function_pointer); public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer; @@ -139,13 +139,13 @@ public final class ARBImaging { nglColorSubTable(target, start, count, format, type, data, data.position() << 2, 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) { + public static void glColorSubTable(int target, int start, int count, int format, int type, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglColorSubTableBO(target, start, count, format, type, data_buffer_offset, function_pointer); } - private static native void nglColorSubTableBO(int target, int start, int count, int format, int type, int data_buffer_offset, long function_pointer); + private static native void nglColorSubTableBO(int target, int start, int count, int format, int type, long data_buffer_offset, long function_pointer); public static void glColorTableParameter(int target, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTableParameteriv_pointer; @@ -277,13 +277,13 @@ public final class ARBImaging { nglGetHistogram(target, reset, format, type, values, values.position() << 1, 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) { + public static void glGetHistogram(int target, boolean reset, int format, int type, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetHistogramBO(target, reset, format, type, values_buffer_offset, function_pointer); } - private static native void nglGetHistogramBO(int target, boolean reset, int format, int type, int values_buffer_offset, long function_pointer); + private static native void nglGetHistogramBO(int target, boolean reset, int format, int type, long values_buffer_offset, long function_pointer); public static void glGetHistogramParameter(int target, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogramParameterfv_pointer; @@ -351,13 +351,13 @@ public final class ARBImaging { nglGetMinmax(target, reset, format, types, values, values.position() << 1, 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) { + public static void glGetMinmax(int target, boolean reset, int format, int types, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetMinmaxBO(target, reset, format, types, values_buffer_offset, function_pointer); } - private static native void nglGetMinmaxBO(int target, boolean reset, int format, int types, int values_buffer_offset, long function_pointer); + private static native void nglGetMinmaxBO(int target, boolean reset, int format, int types, long values_buffer_offset, long function_pointer); public static void glGetMinmaxParameter(int target, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmaxParameterfv_pointer; @@ -411,13 +411,13 @@ public final class ARBImaging { nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 1, 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) { + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, long image_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglConvolutionFilter1DBO(target, internalformat, width, format, type, image_buffer_offset, function_pointer); } - private static native void nglConvolutionFilter1DBO(int target, int internalformat, int width, int format, int type, int image_buffer_offset, long function_pointer); + private static native void nglConvolutionFilter1DBO(int target, int internalformat, int width, int format, int type, long image_buffer_offset, long function_pointer); public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer; @@ -441,13 +441,13 @@ public final class ARBImaging { nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1, 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) { + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, long image_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglConvolutionFilter2DBO(target, internalformat, width, height, format, type, image_buffer_offset, function_pointer); } - private static native void nglConvolutionFilter2DBO(int target, int internalformat, int width, int height, int format, int type, int image_buffer_offset, long function_pointer); + private static native void nglConvolutionFilter2DBO(int target, int internalformat, int width, int height, int format, int type, long image_buffer_offset, long function_pointer); public static void glConvolutionParameterf(int target, int pname, float params) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionParameterf_pointer; @@ -529,13 +529,13 @@ public final class ARBImaging { nglGetConvolutionFilter(target, format, type, image, image.position() << 1, 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) { + public static void glGetConvolutionFilter(int target, int format, int type, long image_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetConvolutionFilterBO(target, format, type, image_buffer_offset, function_pointer); } - private static native void nglGetConvolutionFilterBO(int target, int format, int type, int image_buffer_offset, long function_pointer); + private static native void nglGetConvolutionFilterBO(int target, int format, int type, long image_buffer_offset, long function_pointer); public static void glGetConvolutionParameter(int target, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionParameterfv_pointer; @@ -754,13 +754,13 @@ public final class ARBImaging { nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 1, 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) { + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, long row_buffer_offset, long column_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglSeparableFilter2DBO(target, internalformat, width, height, format, type, row_buffer_offset, column_buffer_offset, function_pointer); } - private static native void nglSeparableFilter2DBO(int target, int internalformat, int width, int height, int format, int type, int row_buffer_offset, int column_buffer_offset, long function_pointer); + private static native void nglSeparableFilter2DBO(int target, int internalformat, int width, int height, int format, int type, long row_buffer_offset, long column_buffer_offset, long function_pointer); public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ByteBuffer span) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; @@ -1483,11 +1483,11 @@ public final class ARBImaging { nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 1, 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) { + public static void glGetSeparableFilter(int target, int format, int type, long row_buffer_offset, long column_buffer_offset, long span_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetSeparableFilterBO(target, format, type, row_buffer_offset, column_buffer_offset, span_buffer_offset, function_pointer); } - 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); + private static native void nglGetSeparableFilterBO(int target, int format, int type, long row_buffer_offset, long column_buffer_offset, long span_buffer_offset, long function_pointer); } diff --git a/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java b/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java index 00c748ca..7dd0f3da 100644 --- a/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java +++ b/src/generated/org/lwjgl/opengl/ARBMatrixPalette.java @@ -54,13 +54,13 @@ public final class ARBMatrixPalette { nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_SHORT, stride, pPointer, pPointer.position() << 1, function_pointer); } private static native void nglMatrixIndexPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glMatrixIndexPointerARB(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glMatrixIndexPointerARB(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglMatrixIndexPointerARBBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglMatrixIndexPointerARBBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglMatrixIndexPointerARBBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); public static void glMatrixIndexuARB(ByteBuffer pIndices) { long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexubvARB_pointer; diff --git a/src/generated/org/lwjgl/opengl/ARBTextureCompression.java b/src/generated/org/lwjgl/opengl/ARBTextureCompression.java index cbcc01e4..b2eb5ea0 100644 --- a/src/generated/org/lwjgl/opengl/ARBTextureCompression.java +++ b/src/generated/org/lwjgl/opengl/ARBTextureCompression.java @@ -59,13 +59,13 @@ public final class ARBTextureCompression { nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1, 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) { + public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, long pData_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage1DARBBO(target, level, internalformat, width, border, imageSize, pData_buffer_offset, function_pointer); } - private static native void nglCompressedTexImage1DARBBO(int target, int level, int internalformat, int width, int border, int imageSize, int pData_buffer_offset, long function_pointer); + private static native void nglCompressedTexImage1DARBBO(int target, int level, int internalformat, int width, int border, int imageSize, long 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) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer; @@ -103,13 +103,13 @@ public final class ARBTextureCompression { nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1, 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) { + public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, long pData_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage2DARBBO(target, level, internalformat, width, height, border, imageSize, pData_buffer_offset, function_pointer); } - 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); + private static native void nglCompressedTexImage2DARBBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, long 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) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer; @@ -147,13 +147,13 @@ public final class ARBTextureCompression { nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1, 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) { + public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long pData_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage3DARBBO(target, level, internalformat, width, height, depth, border, imageSize, pData_buffer_offset, function_pointer); } - 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); + private static native void nglCompressedTexImage3DARBBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long pData_buffer_offset, long function_pointer); public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer; @@ -191,13 +191,13 @@ public final class ARBTextureCompression { nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 1, 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) { + public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, long pData_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage1DARBBO(target, level, xoffset, width, format, imageSize, pData_buffer_offset, function_pointer); } - private static native void nglCompressedTexSubImage1DARBBO(int target, int level, int xoffset, int width, int format, int imageSize, int pData_buffer_offset, long function_pointer); + private static native void nglCompressedTexSubImage1DARBBO(int target, int level, int xoffset, int width, int format, int imageSize, long 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) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer; @@ -235,13 +235,13 @@ public final class ARBTextureCompression { nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 1, 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) { + public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long pData_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage2DARBBO(target, level, xoffset, yoffset, width, height, format, imageSize, pData_buffer_offset, function_pointer); } - 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); + private static native void nglCompressedTexSubImage2DARBBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long pData_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) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer; @@ -279,13 +279,13 @@ public final class ARBTextureCompression { nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 1, 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) { + public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, long pData_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage3DARBBO(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData_buffer_offset, function_pointer); } - 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); + 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, long pData_buffer_offset, long function_pointer); public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer; @@ -323,11 +323,11 @@ public final class ARBTextureCompression { nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1, 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) { + public static void glGetCompressedTexImageARB(int target, int lod, long pImg_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetCompressedTexImageARBBO(target, lod, pImg_buffer_offset, function_pointer); } - private static native void nglGetCompressedTexImageARBBO(int target, int lod, int pImg_buffer_offset, long function_pointer); + private static native void nglGetCompressedTexImageARBBO(int target, int lod, long pImg_buffer_offset, long function_pointer); } diff --git a/src/generated/org/lwjgl/opengl/ARBVertexBlend.java b/src/generated/org/lwjgl/opengl/ARBVertexBlend.java index 16b334c2..cd2d0b7b 100644 --- a/src/generated/org/lwjgl/opengl/ARBVertexBlend.java +++ b/src/generated/org/lwjgl/opengl/ARBVertexBlend.java @@ -159,13 +159,13 @@ public final class ARBVertexBlend { nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pPointer, pPointer.position() << 1, function_pointer); } private static native void nglWeightPointerARB(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glWeightPointerARB(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glWeightPointerARB(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglWeightPointerARBBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglWeightPointerARBBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglWeightPointerARBBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); public static void glVertexBlendARB(int count) { long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glVertexBlendARB_pointer; diff --git a/src/generated/org/lwjgl/opengl/ARBVertexProgram.java b/src/generated/org/lwjgl/opengl/ARBVertexProgram.java index d49d705d..1341311b 100644 --- a/src/generated/org/lwjgl/opengl/ARBVertexProgram.java +++ b/src/generated/org/lwjgl/opengl/ARBVertexProgram.java @@ -186,13 +186,13 @@ public final class ARBVertexProgram extends ARBProgram { nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer); } private static native void nglVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, Buffer buffer, int buffer_position, long function_pointer); - public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset) { + public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glVertexAttribPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexAttribPointerARBBO(index, size, type, normalized, stride, buffer_buffer_offset, function_pointer); } - private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset, long function_pointer); + private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset, long function_pointer); public static void glEnableVertexAttribArrayARB(int index) { long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glEnableVertexAttribArrayARB_pointer; diff --git a/src/generated/org/lwjgl/opengl/ARBVertexShader.java b/src/generated/org/lwjgl/opengl/ARBVertexShader.java index 4c35cd60..29cba61a 100644 --- a/src/generated/org/lwjgl/opengl/ARBVertexShader.java +++ b/src/generated/org/lwjgl/opengl/ARBVertexShader.java @@ -195,13 +195,13 @@ public final class ARBVertexShader { nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer); } private static native void nglVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, Buffer buffer, int buffer_position, long function_pointer); - public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset) { + public static void glVertexAttribPointerARB(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glVertexAttribPointerARB_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexAttribPointerARBBO(index, size, type, normalized, stride, buffer_buffer_offset, function_pointer); } - private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset, long function_pointer); + private static native void nglVertexAttribPointerARBBO(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset, long function_pointer); public static void glEnableVertexAttribArrayARB(int index) { long function_pointer = GLContext.getCapabilities().ARB_vertex_shader_glEnableVertexAttribArrayARB_pointer; diff --git a/src/generated/org/lwjgl/opengl/ATIElementArray.java b/src/generated/org/lwjgl/opengl/ATIElementArray.java index dfe8cc5a..f6d61806 100644 --- a/src/generated/org/lwjgl/opengl/ATIElementArray.java +++ b/src/generated/org/lwjgl/opengl/ATIElementArray.java @@ -40,13 +40,13 @@ public final class ATIElementArray { 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) { + public static void glElementPointerATI(int type, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().ATI_element_array_glElementPointerATI_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglElementPointerATIBO(type, pPointer_buffer_offset, function_pointer); } - private static native void nglElementPointerATIBO(int type, int pPointer_buffer_offset, long function_pointer); + private static native void nglElementPointerATIBO(int type, long pPointer_buffer_offset, long function_pointer); public static void glDrawElementArrayATI(int mode, int count) { long function_pointer = GLContext.getCapabilities().ATI_element_array_glDrawElementArrayATI_pointer; diff --git a/src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java b/src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java index e455e740..d05ce9e7 100644 --- a/src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java +++ b/src/generated/org/lwjgl/opengl/EXTDrawRangeElements.java @@ -36,11 +36,11 @@ public final class EXTDrawRangeElements { nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_SHORT, pIndices, pIndices.position() << 1, function_pointer); } private static native void nglDrawRangeElementsEXT(int mode, int start, int end, int count, int type, Buffer pIndices, int pIndices_position, long function_pointer); - public static void glDrawRangeElementsEXT(int mode, int start, int end, int count, int type, int pIndices_buffer_offset) { + public static void glDrawRangeElementsEXT(int mode, int start, int end, int count, int type, long pIndices_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_draw_range_elements_glDrawRangeElementsEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureElementVBOenabled(); nglDrawRangeElementsEXTBO(mode, start, end, count, type, pIndices_buffer_offset, function_pointer); } - private static native void nglDrawRangeElementsEXTBO(int mode, int start, int end, int count, int type, int pIndices_buffer_offset, long function_pointer); + private static native void nglDrawRangeElementsEXTBO(int mode, int start, int end, int count, int type, long pIndices_buffer_offset, long function_pointer); } diff --git a/src/generated/org/lwjgl/opengl/EXTFogCoord.java b/src/generated/org/lwjgl/opengl/EXTFogCoord.java index 23d22e31..b91e1068 100644 --- a/src/generated/org/lwjgl/opengl/EXTFogCoord.java +++ b/src/generated/org/lwjgl/opengl/EXTFogCoord.java @@ -51,11 +51,11 @@ public final class EXTFogCoord { nglFogCoordPointerEXT(GL11.GL_FLOAT, stride, data, data.position() << 2, function_pointer); } private static native void nglFogCoordPointerEXT(int type, int stride, Buffer data, int data_position, long function_pointer); - public static void glFogCoordPointerEXT(int type, int stride, int data_buffer_offset) { + public static void glFogCoordPointerEXT(int type, int stride, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_fog_coord_glFogCoordPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglFogCoordPointerEXTBO(type, stride, data_buffer_offset, function_pointer); } - private static native void nglFogCoordPointerEXTBO(int type, int stride, int data_buffer_offset, long function_pointer); + private static native void nglFogCoordPointerEXTBO(int type, int stride, long data_buffer_offset, long function_pointer); } diff --git a/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java b/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java index 8b4c9c02..0198eb3e 100644 --- a/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java +++ b/src/generated/org/lwjgl/opengl/EXTSecondaryColor.java @@ -72,11 +72,11 @@ public final class EXTSecondaryColor { nglSecondaryColorPointerEXT(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position(), function_pointer); } private static native void nglSecondaryColorPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glSecondaryColorPointerEXT(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glSecondaryColorPointerEXT(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_secondary_color_glSecondaryColorPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglSecondaryColorPointerEXTBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglSecondaryColorPointerEXTBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglSecondaryColorPointerEXTBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); } diff --git a/src/generated/org/lwjgl/opengl/EXTVertexShader.java b/src/generated/org/lwjgl/opengl/EXTVertexShader.java index 8d8b4fae..ee0f2dfe 100644 --- a/src/generated/org/lwjgl/opengl/EXTVertexShader.java +++ b/src/generated/org/lwjgl/opengl/EXTVertexShader.java @@ -384,13 +384,13 @@ public final class EXTVertexShader { nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1, function_pointer); } private static native void nglVariantPointerEXT(int id, int type, int stride, Buffer pAddr, int pAddr_position, long function_pointer); - public static void glVariantPointerEXT(int id, int type, int stride, int pAddr_buffer_offset) { + public static void glVariantPointerEXT(int id, int type, int stride, long pAddr_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVariantPointerEXTBO(id, type, stride, pAddr_buffer_offset, function_pointer); } - private static native void nglVariantPointerEXTBO(int id, int type, int stride, int pAddr_buffer_offset, long function_pointer); + private static native void nglVariantPointerEXTBO(int id, int type, int stride, long pAddr_buffer_offset, long function_pointer); public static void glEnableVariantClientStateEXT(int id) { long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glEnableVariantClientStateEXT_pointer; diff --git a/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java b/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java index b44a2992..7a97ee18 100644 --- a/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java +++ b/src/generated/org/lwjgl/opengl/EXTVertexWeighting.java @@ -41,11 +41,11 @@ public final class EXTVertexWeighting { nglVertexWeightPointerEXT(size, GL11.GL_FLOAT, stride, pPointer, pPointer.position() << 2, function_pointer); } private static native void nglVertexWeightPointerEXT(int size, int type, int stride, Buffer pPointer, int pPointer_position, long function_pointer); - public static void glVertexWeightPointerEXT(int size, int type, int stride, int pPointer_buffer_offset) { + public static void glVertexWeightPointerEXT(int size, int type, int stride, long pPointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().EXT_vertex_weighting_glVertexWeightPointerEXT_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexWeightPointerEXTBO(size, type, stride, pPointer_buffer_offset, function_pointer); } - private static native void nglVertexWeightPointerEXTBO(int size, int type, int stride, int pPointer_buffer_offset, long function_pointer); + private static native void nglVertexWeightPointerEXTBO(int size, int type, int stride, long pPointer_buffer_offset, long function_pointer); } diff --git a/src/generated/org/lwjgl/opengl/GL11.java b/src/generated/org/lwjgl/opengl/GL11.java index c2d27647..f9993593 100644 --- a/src/generated/org/lwjgl/opengl/GL11.java +++ b/src/generated/org/lwjgl/opengl/GL11.java @@ -621,13 +621,13 @@ public final class GL11 { nglBitmap(width, height, xorig, yorig, xmove, ymove, bitmap, bitmap.position(), function_pointer); } private static native void nglBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, ByteBuffer bitmap, int bitmap_position, long function_pointer); - public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int bitmap_buffer_offset) { + public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, long bitmap_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glBitmap_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglBitmapBO(width, height, xorig, yorig, xmove, ymove, bitmap_buffer_offset, function_pointer); } - private static native void nglBitmapBO(int width, int height, float xorig, float yorig, float xmove, float ymove, int bitmap_buffer_offset, long function_pointer); + private static native void nglBitmapBO(int width, int height, float xorig, float yorig, float xmove, float ymove, long bitmap_buffer_offset, long function_pointer); public static void glBindTexture(int target, int texture) { long function_pointer = GLContext.getCapabilities().GL11_glBindTexture_pointer; @@ -746,13 +746,13 @@ public final class GL11 { nglColorPointer(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pointer, pointer.position(), function_pointer); } private static native void nglColorPointer(int size, int type, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glColorPointer(int size, int type, int stride, int pointer_buffer_offset) { + public static void glColorPointer(int size, int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glColorPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglColorPointerBO(size, type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglColorPointerBO(int size, int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglColorPointerBO(int size, int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glColorMaterial(int face, int mode) { long function_pointer = GLContext.getCapabilities().GL11_glColorMaterial_pointer; @@ -932,13 +932,13 @@ public final class GL11 { nglEdgeFlagPointer(stride, pointer, pointer.position(), function_pointer); } private static native void nglEdgeFlagPointer(int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glEdgeFlagPointer(int stride, int pointer_buffer_offset) { + public static void glEdgeFlagPointer(int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glEdgeFlagPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglEdgeFlagPointerBO(stride, pointer_buffer_offset, function_pointer); } - private static native void nglEdgeFlagPointerBO(int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglEdgeFlagPointerBO(int stride, long pointer_buffer_offset, long function_pointer); public static void glEdgeFlag(boolean flag) { long function_pointer = GLContext.getCapabilities().GL11_glEdgeFlag_pointer; @@ -969,13 +969,13 @@ public final class GL11 { nglDrawPixels(width, height, format, type, pixels, pixels.position() << 1, 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) { + public static void glDrawPixels(int width, int height, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glDrawPixels_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglDrawPixelsBO(width, height, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglDrawPixelsBO(int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglDrawPixelsBO(int width, int height, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glDrawElements(int mode, ByteBuffer indices) { long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer; @@ -999,13 +999,13 @@ public final class GL11 { nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer); } private static native void nglDrawElements(int mode, int count, int type, Buffer indices, int indices_position, long function_pointer); - public static void glDrawElements(int mode, int count, int type, int indices_buffer_offset) { + public static void glDrawElements(int mode, int count, int type, long indices_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureElementVBOenabled(); nglDrawElementsBO(mode, count, type, indices_buffer_offset, function_pointer); } - private static native void nglDrawElementsBO(int mode, int count, int type, int indices_buffer_offset, long function_pointer); + private static native void nglDrawElementsBO(int mode, int count, int type, long indices_buffer_offset, long function_pointer); public static void glDrawBuffer(int mode) { long function_pointer = GLContext.getCapabilities().GL11_glDrawBuffer_pointer; @@ -1058,13 +1058,13 @@ public final class GL11 { nglGetPixelMapfv(map, values, values.position(), function_pointer); } private static native void nglGetPixelMapfv(int map, FloatBuffer values, int values_position, long function_pointer); - public static void glGetPixelMapfv(int map, int values_buffer_offset) { + public static void glGetPixelMapfv(int map, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapfv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPixelMapfvBO(map, values_buffer_offset, function_pointer); } - private static native void nglGetPixelMapfvBO(int map, int values_buffer_offset, long function_pointer); + private static native void nglGetPixelMapfvBO(int map, long values_buffer_offset, long function_pointer); public static void glGetPixelMapu(int map, IntBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapuiv_pointer; @@ -1074,13 +1074,13 @@ public final class GL11 { nglGetPixelMapuiv(map, values, values.position(), function_pointer); } private static native void nglGetPixelMapuiv(int map, IntBuffer values, int values_position, long function_pointer); - public static void glGetPixelMapuiv(int map, int values_buffer_offset) { + public static void glGetPixelMapuiv(int map, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapuiv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPixelMapuivBO(map, values_buffer_offset, function_pointer); } - private static native void nglGetPixelMapuivBO(int map, int values_buffer_offset, long function_pointer); + private static native void nglGetPixelMapuivBO(int map, long values_buffer_offset, long function_pointer); public static void glGetPixelMapu(int map, ShortBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapusv_pointer; @@ -1090,13 +1090,13 @@ public final class GL11 { nglGetPixelMapusv(map, values, values.position(), function_pointer); } private static native void nglGetPixelMapusv(int map, ShortBuffer values, int values_position, long function_pointer); - public static void glGetPixelMapusv(int map, int values_buffer_offset) { + public static void glGetPixelMapusv(int map, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPixelMapusv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPixelMapusvBO(map, values_buffer_offset, function_pointer); } - private static native void nglGetPixelMapusvBO(int map, int values_buffer_offset, long function_pointer); + private static native void nglGetPixelMapusvBO(int map, long values_buffer_offset, long function_pointer); public static void glGetMaterial(int face, int pname, FloatBuffer params) { long function_pointer = GLContext.getCapabilities().GL11_glGetMaterialfv_pointer; @@ -1328,13 +1328,13 @@ public final class GL11 { nglInterleavedArrays(format, stride, pointer, pointer.position() << 1, 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) { + public static void glInterleavedArrays(int format, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglInterleavedArraysBO(format, stride, pointer_buffer_offset, function_pointer); } - private static native void nglInterleavedArraysBO(int format, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglInterleavedArraysBO(int format, int stride, long pointer_buffer_offset, long function_pointer); public static void glInitNames() { long function_pointer = GLContext.getCapabilities().GL11_glInitNames_pointer; @@ -1418,13 +1418,13 @@ public final class GL11 { nglGetTexImage(target, level, format, type, pixels, pixels.position() << 1, 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) { + public static void glGetTexImage(int target, int level, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetTexImageBO(target, level, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglGetTexImageBO(int target, int level, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglGetTexImageBO(int target, int level, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glGetTexGen(int coord, int pname, IntBuffer params) { long function_pointer = GLContext.getCapabilities().GL11_glGetTexGeniv_pointer; @@ -1482,13 +1482,13 @@ public final class GL11 { nglGetPolygonStipple(mask, mask.position(), function_pointer); } private static native void nglGetPolygonStipple(ByteBuffer mask, int mask_position, long function_pointer); - public static void glGetPolygonStipple(int mask_buffer_offset) { + public static void glGetPolygonStipple(long mask_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glGetPolygonStipple_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetPolygonStippleBO(mask_buffer_offset, function_pointer); } - private static native void nglGetPolygonStippleBO(int mask_buffer_offset, long function_pointer); + private static native void nglGetPolygonStippleBO(long mask_buffer_offset, long function_pointer); public static boolean glIsList(int list) { long function_pointer = GLContext.getCapabilities().GL11_glIsList_pointer; @@ -1729,13 +1729,13 @@ public final class GL11 { nglPolygonStipple(mask, mask.position(), function_pointer); } private static native void nglPolygonStipple(ByteBuffer mask, int mask_position, long function_pointer); - public static void glPolygonStipple(int mask_buffer_offset) { + public static void glPolygonStipple(long mask_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPolygonStipple_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPolygonStippleBO(mask_buffer_offset, function_pointer); } - private static native void nglPolygonStippleBO(int mask_buffer_offset, long function_pointer); + private static native void nglPolygonStippleBO(long mask_buffer_offset, long function_pointer); public static void glPolygonOffset(float factor, float units) { long function_pointer = GLContext.getCapabilities().GL11_glPolygonOffset_pointer; @@ -1801,13 +1801,13 @@ public final class GL11 { nglPixelMapfv(map, (values.remaining()), values, values.position(), function_pointer); } private static native void nglPixelMapfv(int map, int mapsize, FloatBuffer values, int values_position, long function_pointer); - public static void glPixelMapfv(int map, int mapsize, int values_buffer_offset) { + public static void glPixelMapfv(int map, int mapsize, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapfv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPixelMapfvBO(map, mapsize, values_buffer_offset, function_pointer); } - private static native void nglPixelMapfvBO(int map, int mapsize, int values_buffer_offset, long function_pointer); + private static native void nglPixelMapfvBO(int map, int mapsize, long values_buffer_offset, long function_pointer); public static void glPixelMapu(int map, IntBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapuiv_pointer; @@ -1817,13 +1817,13 @@ public final class GL11 { nglPixelMapuiv(map, (values.remaining()), values, values.position(), function_pointer); } private static native void nglPixelMapuiv(int map, int mapsize, IntBuffer values, int values_position, long function_pointer); - public static void glPixelMapuiv(int map, int mapsize, int values_buffer_offset) { + public static void glPixelMapuiv(int map, int mapsize, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapuiv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPixelMapuivBO(map, mapsize, values_buffer_offset, function_pointer); } - private static native void nglPixelMapuivBO(int map, int mapsize, int values_buffer_offset, long function_pointer); + private static native void nglPixelMapuivBO(int map, int mapsize, long values_buffer_offset, long function_pointer); public static void glPixelMapu(int map, ShortBuffer values) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapusv_pointer; @@ -1833,13 +1833,13 @@ public final class GL11 { nglPixelMapusv(map, (values.remaining()), values, values.position(), function_pointer); } private static native void nglPixelMapusv(int map, int mapsize, ShortBuffer values, int values_position, long function_pointer); - public static void glPixelMapusv(int map, int mapsize, int values_buffer_offset) { + public static void glPixelMapusv(int map, int mapsize, long values_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glPixelMapusv_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglPixelMapusvBO(map, mapsize, values_buffer_offset, function_pointer); } - private static native void nglPixelMapusvBO(int map, int mapsize, int values_buffer_offset, long function_pointer); + private static native void nglPixelMapusvBO(int map, int mapsize, long values_buffer_offset, long function_pointer); public static void glPassThrough(float token) { long function_pointer = GLContext.getCapabilities().GL11_glPassThrough_pointer; @@ -1888,13 +1888,13 @@ public final class GL11 { 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) { + public static void glNormalPointer(int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglNormalPointerBO(type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglNormalPointerBO(int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglNormalPointerBO(int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glNormal3b(byte nx, byte ny, byte nz) { long function_pointer = GLContext.getCapabilities().GL11_glNormal3b_pointer; @@ -2063,13 +2063,13 @@ public final class GL11 { nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 1, 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) { + public static void glReadPixels(int x, int y, int width, int height, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglReadPixelsBO(x, y, width, height, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglReadPixelsBO(int x, int y, int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglReadPixelsBO(int x, int y, int width, int height, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glReadBuffer(int mode) { long function_pointer = GLContext.getCapabilities().GL11_glReadBuffer_pointer; @@ -2231,13 +2231,13 @@ public final class GL11 { 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) { + public static void glVertexPointer(int size, int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glVertexPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexPointerBO(size, type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglVertexPointerBO(int size, int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglVertexPointerBO(int size, int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glVertex2f(float x, float y) { long function_pointer = GLContext.getCapabilities().GL11_glVertex2f_pointer; @@ -2357,13 +2357,13 @@ public final class GL11 { nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 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) { + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexImage1DBO(target, level, internalformat, width, border, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglTexImage1DBO(int target, int level, int internalformat, int width, int border, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglTexImage1DBO(int target, int level, int internalformat, int width, int border, int format, int type, long 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, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; @@ -2406,13 +2406,13 @@ public final class GL11 { nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 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) { + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexImage2DBO(target, level, internalformat, width, height, border, format, type, pixels_buffer_offset, function_pointer); } - 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); + private static native void nglTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; @@ -2450,13 +2450,13 @@ public final class GL11 { nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 1, 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) { + public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexSubImage1DBO(target, level, xoffset, width, format, type, pixels_buffer_offset, function_pointer); } - private static native void nglTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset, long function_pointer); + private static native void nglTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; @@ -2494,13 +2494,13 @@ public final class GL11 { nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 1, 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) { + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexSubImage2DBO(target, level, xoffset, yoffset, width, height, format, type, pixels_buffer_offset, function_pointer); } - 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); + private static native void nglTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, long pixels_buffer_offset, long function_pointer); public static void glTexParameterf(int target, int pname, float param) { long function_pointer = GLContext.getCapabilities().GL11_glTexParameterf_pointer; @@ -2624,13 +2624,13 @@ public final class GL11 { nglTexCoordPointer(size, GL11.GL_FLOAT, stride, pointer, pointer.position() << 2, function_pointer); } private static native void nglTexCoordPointer(int size, int type, int stride, Buffer pointer, int pointer_position, long function_pointer); - public static void glTexCoordPointer(int size, int type, int stride, int pointer_buffer_offset) { + public static void glTexCoordPointer(int size, int type, int stride, long pointer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL11_glTexCoordPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglTexCoordPointerBO(size, type, stride, pointer_buffer_offset, function_pointer); } - private static native void nglTexCoordPointerBO(int size, int type, int stride, int pointer_buffer_offset, long function_pointer); + private static native void nglTexCoordPointerBO(int size, int type, int stride, long pointer_buffer_offset, long function_pointer); public static void glTexCoord1f(float s) { long function_pointer = GLContext.getCapabilities().GL11_glTexCoord1f_pointer; diff --git a/src/generated/org/lwjgl/opengl/GL12.java b/src/generated/org/lwjgl/opengl/GL12.java index 6b7ebcae..d5a0f73a 100644 --- a/src/generated/org/lwjgl/opengl/GL12.java +++ b/src/generated/org/lwjgl/opengl/GL12.java @@ -71,13 +71,13 @@ public final class GL12 { nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer); } private static native void nglDrawRangeElements(int mode, int start, int end, int count, int type, Buffer indices, int indices_position, long function_pointer); - public static void glDrawRangeElements(int mode, int start, int end, int count, int type, int indices_buffer_offset) { + public static void glDrawRangeElements(int mode, int start, int end, int count, int type, long indices_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL12_glDrawRangeElements_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureElementVBOenabled(); nglDrawRangeElementsBO(mode, start, end, count, type, indices_buffer_offset, function_pointer); } - private static native void nglDrawRangeElementsBO(int mode, int start, int end, int count, int type, int indices_buffer_offset, long function_pointer); + private static native void nglDrawRangeElementsBO(int mode, int start, int end, int count, int type, long indices_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, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer; @@ -120,13 +120,13 @@ public final class GL12 { nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 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) { + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexImage3DBO(target, level, internalFormat, width, height, depth, border, format, type, pixels_buffer_offset, function_pointer); } - 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); + private static native void nglTexImage3DBO(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, long pixels_buffer_offset, 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, ByteBuffer pixels) { long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer; @@ -164,13 +164,13 @@ public final class GL12 { nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 1, 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) { + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, long pixels_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglTexSubImage3DBO(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels_buffer_offset, function_pointer); } - 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); + 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, long pixels_buffer_offset, long function_pointer); public static void glCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height) { long function_pointer = GLContext.getCapabilities().GL12_glCopyTexSubImage3D_pointer; diff --git a/src/generated/org/lwjgl/opengl/GL13.java b/src/generated/org/lwjgl/opengl/GL13.java index 2cd65874..1b5b73c7 100644 --- a/src/generated/org/lwjgl/opengl/GL13.java +++ b/src/generated/org/lwjgl/opengl/GL13.java @@ -158,13 +158,13 @@ public final class GL13 { nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, 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) { + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage1DBO(target, level, internalformat, width, border, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexImage1DBO(int target, int level, int internalformat, int width, int border, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexImage1DBO(int target, int level, int internalformat, int width, int border, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; @@ -202,13 +202,13 @@ public final class GL13 { nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, 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) { + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage2DBO(target, level, internalformat, width, height, border, imageSize, data_buffer_offset, function_pointer); } - 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); + private static native void nglCompressedTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, long 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, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; @@ -246,13 +246,13 @@ public final class GL13 { nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, 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) { + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexImage3DBO(target, level, internalformat, width, height, depth, border, imageSize, data_buffer_offset, function_pointer); } - 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); + private static native void nglCompressedTexImage3DBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, long data_buffer_offset, long function_pointer); public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; @@ -290,13 +290,13 @@ public final class GL13 { nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, 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) { + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage1DBO(target, level, xoffset, width, format, imageSize, data_buffer_offset, function_pointer); } - private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset, long function_pointer); + private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, long 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, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; @@ -334,13 +334,13 @@ public final class GL13 { nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, 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) { + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage2DBO(target, level, xoffset, yoffset, width, height, format, imageSize, data_buffer_offset, function_pointer); } - 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); + private static native void nglCompressedTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, long data_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, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; @@ -378,13 +378,13 @@ public final class GL13 { nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, 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) { + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureUnpackPBOenabled(); nglCompressedTexSubImage3DBO(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data_buffer_offset, function_pointer); } - 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); + 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, long data_buffer_offset, long function_pointer); public static void glGetCompressedTexImage(int target, int lod, ByteBuffer img) { long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer; @@ -408,13 +408,13 @@ public final class GL13 { nglGetCompressedTexImage(target, lod, img, img.position() << 1, 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) { + public static void glGetCompressedTexImage(int target, int lod, long img_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensurePackPBOenabled(); nglGetCompressedTexImageBO(target, lod, img_buffer_offset, function_pointer); } - private static native void nglGetCompressedTexImageBO(int target, int lod, int img_buffer_offset, long function_pointer); + private static native void nglGetCompressedTexImageBO(int target, int lod, long img_buffer_offset, long function_pointer); public static void glMultiTexCoord1f(int target, float s) { long function_pointer = GLContext.getCapabilities().GL13_glMultiTexCoord1f_pointer; diff --git a/src/generated/org/lwjgl/opengl/GL14.java b/src/generated/org/lwjgl/opengl/GL14.java index b85f56c2..bdae7474 100644 --- a/src/generated/org/lwjgl/opengl/GL14.java +++ b/src/generated/org/lwjgl/opengl/GL14.java @@ -96,13 +96,13 @@ public final class GL14 { nglFogCoordPointer(GL11.GL_FLOAT, stride, data, data.position() << 2, function_pointer); } private static native void nglFogCoordPointer(int type, int stride, Buffer data, int data_position, long function_pointer); - public static void glFogCoordPointer(int type, int stride, int data_buffer_offset) { + public static void glFogCoordPointer(int type, int stride, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL14_glFogCoordPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglFogCoordPointerBO(type, stride, data_buffer_offset, function_pointer); } - private static native void nglFogCoordPointerBO(int type, int stride, int data_buffer_offset, long function_pointer); + private static native void nglFogCoordPointerBO(int type, int stride, long data_buffer_offset, long function_pointer); public static void glMultiDrawArrays(int mode, IntBuffer piFirst, IntBuffer piCount) { if (piFirst.remaining() != piCount.remaining()) { @@ -196,13 +196,13 @@ public final class GL14 { nglSecondaryColorPointer(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, data, data.position(), function_pointer); } private static native void nglSecondaryColorPointer(int size, int type, int stride, Buffer data, int data_position, long function_pointer); - public static void glSecondaryColorPointer(int size, int type, int stride, int data_buffer_offset) { + public static void glSecondaryColorPointer(int size, int type, int stride, long data_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL14_glSecondaryColorPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglSecondaryColorPointerBO(size, type, stride, data_buffer_offset, function_pointer); } - private static native void nglSecondaryColorPointerBO(int size, int type, int stride, int data_buffer_offset, long function_pointer); + private static native void nglSecondaryColorPointerBO(int size, int type, int stride, long data_buffer_offset, long function_pointer); public static void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) { long function_pointer = GLContext.getCapabilities().GL14_glBlendFuncSeparate_pointer; diff --git a/src/generated/org/lwjgl/opengl/GL15.java b/src/generated/org/lwjgl/opengl/GL15.java index 001bc016..efee7a6a 100644 --- a/src/generated/org/lwjgl/opengl/GL15.java +++ b/src/generated/org/lwjgl/opengl/GL15.java @@ -90,7 +90,7 @@ public final class GL15 { } private static native boolean nglIsBuffer(int buffer, long function_pointer); - public static void glBufferData(int target, int size, int usage) { + public static void glBufferData(int target, long size, int usage) { long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer; BufferChecks.checkFunctionAddress(function_pointer); nglBufferData(target, size, null, 0, usage, function_pointer); @@ -125,71 +125,71 @@ public final class GL15 { BufferChecks.checkDirect(data); nglBufferData(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer); } - private static native void nglBufferData(int target, int size, Buffer data, int data_position, int usage, long function_pointer); + private static native void nglBufferData(int target, long size, Buffer data, int data_position, int usage, long function_pointer); - public static void glBufferSubData(int target, int offset, ByteBuffer data) { + public static void glBufferSubData(int target, long offset, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } - public static void glBufferSubData(int target, int offset, DoubleBuffer data) { + public static void glBufferSubData(int target, long offset, DoubleBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); } - public static void glBufferSubData(int target, int offset, FloatBuffer data) { + public static void glBufferSubData(int target, long offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubData(int target, int offset, IntBuffer data) { + public static void glBufferSubData(int target, long offset, IntBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glBufferSubData(int target, int offset, ShortBuffer data) { + public static void glBufferSubData(int target, long offset, ShortBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } - private static native void nglBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer); + private static native void nglBufferSubData(int target, long offset, long size, Buffer data, int data_position, long function_pointer); - public static void glGetBufferSubData(int target, int offset, ByteBuffer data) { + public static void glGetBufferSubData(int target, long offset, ByteBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer); } - public static void glGetBufferSubData(int target, int offset, DoubleBuffer data) { + public static void glGetBufferSubData(int target, long offset, DoubleBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 3), data, data.position() << 3, function_pointer); } - public static void glGetBufferSubData(int target, int offset, FloatBuffer data) { + public static void glGetBufferSubData(int target, long offset, FloatBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubData(int target, int offset, IntBuffer data) { + public static void glGetBufferSubData(int target, long offset, IntBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer); } - public static void glGetBufferSubData(int target, int offset, ShortBuffer data) { + public static void glGetBufferSubData(int target, long offset, ShortBuffer data) { long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer; BufferChecks.checkFunctionAddress(function_pointer); BufferChecks.checkDirect(data); nglGetBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer); } - private static native void nglGetBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer); + private static native void nglGetBufferSubData(int target, long offset, long size, Buffer data, int data_position, long function_pointer); /** * glMapBuffer maps a gl vertex buffer buffer to a ByteBuffer. The oldBuffer argument can be null, in which case a new diff --git a/src/generated/org/lwjgl/opengl/GL20.java b/src/generated/org/lwjgl/opengl/GL20.java index b2f36e66..29daec31 100644 --- a/src/generated/org/lwjgl/opengl/GL20.java +++ b/src/generated/org/lwjgl/opengl/GL20.java @@ -645,13 +645,13 @@ public final class GL20 { nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer); } private static native void nglVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, Buffer buffer, int buffer_position, long function_pointer); - public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset) { + public static void glVertexAttribPointer(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset) { long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexAttribPointerBO(index, size, type, normalized, stride, buffer_buffer_offset, function_pointer); } - private static native void nglVertexAttribPointerBO(int index, int size, int type, boolean normalized, int stride, int buffer_buffer_offset, long function_pointer); + private static native void nglVertexAttribPointerBO(int index, int size, int type, boolean normalized, int stride, long buffer_buffer_offset, long function_pointer); public static void glEnableVertexAttribArray(int index) { long function_pointer = GLContext.getCapabilities().GL20_glEnableVertexAttribArray_pointer; diff --git a/src/generated/org/lwjgl/opengl/NVVertexProgram.java b/src/generated/org/lwjgl/opengl/NVVertexProgram.java index d25b6aa9..9ee81e9b 100644 --- a/src/generated/org/lwjgl/opengl/NVVertexProgram.java +++ b/src/generated/org/lwjgl/opengl/NVVertexProgram.java @@ -293,13 +293,13 @@ public final class NVVertexProgram extends NVProgram { nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 1, 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) { + public static void glVertexAttribPointerNV(int index, int size, int type, int stride, long buffer_buffer_offset) { long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribPointerNV_pointer; BufferChecks.checkFunctionAddress(function_pointer); GLChecks.ensureArrayVBOenabled(); nglVertexAttribPointerNVBO(index, size, type, stride, buffer_buffer_offset, function_pointer); } - private static native void nglVertexAttribPointerNVBO(int index, int size, int type, int stride, int buffer_buffer_offset, long function_pointer); + private static native void nglVertexAttribPointerNVBO(int index, int size, int type, int stride, long buffer_buffer_offset, long function_pointer); public static void glVertexAttrib1sNV(int index, short x) { long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttrib1sNV_pointer; diff --git a/src/java/org/lwjgl/util/generator/GLTypeMap.java b/src/java/org/lwjgl/util/generator/GLTypeMap.java index 1607fa25..a7594d46 100644 --- a/src/java/org/lwjgl/util/generator/GLTypeMap.java +++ b/src/java/org/lwjgl/util/generator/GLTypeMap.java @@ -59,21 +59,21 @@ public class GLTypeMap implements TypeMap { native_types_to_primitive.put(GLfloat.class, PrimitiveType.Kind.FLOAT); native_types_to_primitive.put(GLint.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLshort.class, PrimitiveType.Kind.SHORT); - native_types_to_primitive.put(GLsizeiptr.class, PrimitiveType.Kind.INT); + native_types_to_primitive.put(GLsizeiptr.class, PrimitiveType.Kind.LONG); native_types_to_primitive.put(GLuint.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLboolean.class, PrimitiveType.Kind.BOOLEAN); native_types_to_primitive.put(GLchar.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(GLdouble.class, PrimitiveType.Kind.DOUBLE); native_types_to_primitive.put(GLhalf.class, PrimitiveType.Kind.SHORT); - native_types_to_primitive.put(GLintptrARB.class, PrimitiveType.Kind.INT); + native_types_to_primitive.put(GLintptrARB.class, PrimitiveType.Kind.LONG); native_types_to_primitive.put(GLsizei.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLushort.class, PrimitiveType.Kind.SHORT); native_types_to_primitive.put(GLbyte.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(GLclampd.class, PrimitiveType.Kind.DOUBLE); native_types_to_primitive.put(GLenum.class, PrimitiveType.Kind.INT); native_types_to_primitive.put(GLhandleARB.class, PrimitiveType.Kind.INT); - native_types_to_primitive.put(GLintptr.class, PrimitiveType.Kind.INT); - native_types_to_primitive.put(GLsizeiptrARB.class, PrimitiveType.Kind.INT); + native_types_to_primitive.put(GLintptr.class, PrimitiveType.Kind.LONG); + native_types_to_primitive.put(GLsizeiptrARB.class, PrimitiveType.Kind.LONG); native_types_to_primitive.put(GLubyte.class, PrimitiveType.Kind.BYTE); native_types_to_primitive.put(GLvoid.class, PrimitiveType.Kind.BYTE); } @@ -172,8 +172,8 @@ public class GLTypeMap implements TypeMap { private static Class[] getValidBufferTypes(Class type) { if (type.equals(IntBuffer.class)) - return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLintptrARB.class, GLintptrARB.class, - GLsizei.class, GLsizeiptrARB.class, GLsizeiptr.class, GLuint.class}; + return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, + GLsizei.class, GLuint.class}; else if (type.equals(FloatBuffer.class)) return new Class[]{GLclampf.class, GLfloat.class}; else if (type.equals(ByteBuffer.class)) @@ -187,9 +187,11 @@ public class GLTypeMap implements TypeMap { } private static Class[] getValidPrimitiveTypes(Class type) { - if (type.equals(int.class)) - return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLintptrARB.class, GLuint.class, - GLintptr.class, GLintptr.class, GLsizei.class, GLsizeiptrARB.class, GLsizeiptr.class}; + if (type.equals(long .class)) + return new Class[]{GLintptrARB.class, GLuint.class, GLintptr.class, GLsizeiptrARB.class, GLsizeiptr.class}; + else if (type.equals(int.class)) + return new Class[]{GLbitfield.class, GLenum.class, GLhandleARB.class, GLint.class, GLuint.class, + GLsizei.class}; else if (type.equals(double.class)) return new Class[]{GLclampd.class, GLdouble.class}; else if (type.equals(float.class)) diff --git a/src/java/org/lwjgl/util/generator/JNITypeTranslator.java b/src/java/org/lwjgl/util/generator/JNITypeTranslator.java index d64894a5..82f016ae 100644 --- a/src/java/org/lwjgl/util/generator/JNITypeTranslator.java +++ b/src/java/org/lwjgl/util/generator/JNITypeTranslator.java @@ -78,6 +78,9 @@ public class JNITypeTranslator implements TypeVisitor { public void visitPrimitiveType(PrimitiveType t) { String type; switch (t.getKind()) { + case LONG: + type = "jlong"; + break; case INT: type = "jint"; break; diff --git a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java index 6c06f484..b8fdf614 100644 --- a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java +++ b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java @@ -141,7 +141,7 @@ public class JavaMethodsGenerator { if (bo_annotation != null && mode == Mode.BUFFEROBJECT) { if (buffer_type == null) throw new RuntimeException("type of " + param + " is not a nio Buffer parameter but is annotated as buffer object"); - writer.print("int " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); + writer.print("long " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); } else { writer.print(type_info.getType().getSimpleName()); writer.print(" " + param.getSimpleName()); diff --git a/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java b/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java index 5490ef8a..76e0fa6b 100644 --- a/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java +++ b/src/java/org/lwjgl/util/generator/JavaTypeTranslator.java @@ -61,6 +61,9 @@ public class JavaTypeTranslator implements TypeVisitor { public void visitPrimitiveType(PrimitiveType t) { switch (t.getKind()) { + case LONG: + type = long.class; + break; case INT: type = int.class; break; diff --git a/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java b/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java index 5c564a7b..91cb880c 100644 --- a/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java +++ b/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java @@ -70,7 +70,7 @@ public class NativeMethodStubsGenerator { private static void generateParameter(PrintWriter writer, ParameterDeclaration param, Mode mode) { writer.print(", "); if (mode == Mode.BUFFEROBJECT && param.getAnnotation(BufferObject.class) != null) { - writer.print("jint " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); + writer.print("jlong " + param.getSimpleName() + Utils.BUFFER_OBJECT_PARAMETER_POSTFIX); } else { JNITypeTranslator translator = new JNITypeTranslator(); param.getType().accept(translator); diff --git a/src/java/org/lwjgl/util/generator/TypeInfo.java b/src/java/org/lwjgl/util/generator/TypeInfo.java index b8d629df..0841492b 100644 --- a/src/java/org/lwjgl/util/generator/TypeInfo.java +++ b/src/java/org/lwjgl/util/generator/TypeInfo.java @@ -77,6 +77,9 @@ public class TypeInfo { private static Class getTypeFromPrimitiveKind(PrimitiveType.Kind kind) { Class type; switch (kind) { + case LONG: + type = long.class; + break; case INT: type = int.class; break; diff --git a/src/native/common/common_tools.h b/src/native/common/common_tools.h index 1839c41d..dff4bfdb 100644 --- a/src/native/common/common_tools.h +++ b/src/native/common/common_tools.h @@ -105,7 +105,7 @@ static inline jobject safeNewBufferCached(JNIEnv *env, void *p, int size, jobjec } -static inline void *offsetToPointer(jint offset) { +static inline void *offsetToPointer(jlong offset) { return (char *)NULL + offset; } diff --git a/src/native/common/extgl.h b/src/native/common/extgl.h index 5c39c239..b23039d8 100644 --- a/src/native/common/extgl.h +++ b/src/native/common/extgl.h @@ -86,6 +86,7 @@ THE POSSIBILITY OF SUCH DAMAGE. #define __GL_H__ #include +#include #ifndef APIENTRY #define APIENTRY @@ -140,15 +141,15 @@ typedef void GLvoid; #endif // OpenGL 2.0 types -typedef int GLintptr; -typedef unsigned int GLsizeiptr; +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; typedef unsigned char GLchar; // ARB_shader_objects types typedef unsigned int GLhandleARB; // ARB_vertex_buffer_object types -typedef int GLintptrARB; -typedef unsigned int GLsizeiptrARB; +typedef ptrdiff_t GLintptrARB; +typedef ptrdiff_t GLsizeiptrARB; typedef unsigned char GLcharARB; // NV_half_float types diff --git a/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c b/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c index b08b1293..cf0a218a 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c +++ b/src/native/generated/org_lwjgl_opengl_ARBBufferObject.c @@ -38,19 +38,19 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglIsBufferARB( return __result; } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferDataARB(JNIEnv *env, jclass clazz, jint target, jint size, jobject data, jint data_position, jint usage, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferDataARB(JNIEnv *env, jclass clazz, jint target, jlong size, jobject data, jint data_position, jint usage, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)safeGetBufferAddress(env, data)) + data_position)); glBufferDataARBPROC glBufferDataARB = (glBufferDataARBPROC)((intptr_t)function_pointer); glBufferDataARB(target, size, data_address, usage); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glBufferSubDataARBPROC glBufferSubDataARB = (glBufferSubDataARBPROC)((intptr_t)function_pointer); glBufferSubDataARB(target, offset, size, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBBufferObject_nglGetBufferSubDataARB(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { GLvoid *data_address = ((GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glGetBufferSubDataARBPROC glGetBufferSubDataARB = (glGetBufferSubDataARBPROC)((intptr_t)function_pointer); glGetBufferSubDataARB(target, offset, size, data_address); diff --git a/src/native/generated/org_lwjgl_opengl_ARBImaging.c b/src/native/generated/org_lwjgl_opengl_ARBImaging.c index 40588dd9..c8a9c89f 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBImaging.c +++ b/src/native/generated/org_lwjgl_opengl_ARBImaging.c @@ -44,7 +44,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTable(JNIEnv *en glColorTable(target, internalFormat, width, format, type, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableBO(JNIEnv *env, jclass clazz, jint target, jint internalFormat, jint width, jint format, jint type, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableBO(JNIEnv *env, jclass clazz, jint target, jint internalFormat, jint width, jint format, jint type, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glColorTablePROC glColorTable = (glColorTablePROC)((intptr_t)function_pointer); glColorTable(target, internalFormat, width, format, type, data_address); @@ -56,7 +56,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable(JNIEnv glColorSubTable(target, start, count, format, type, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTableBO(JNIEnv *env, jclass clazz, jint target, jint start, jint count, jint format, jint type, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTableBO(JNIEnv *env, jclass clazz, jint target, jint start, jint count, jint format, jint type, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glColorSubTablePROC glColorSubTable = (glColorSubTablePROC)((intptr_t)function_pointer); glColorSubTable(target, start, count, format, type, data_address); @@ -128,7 +128,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram(JNIEnv * glGetHistogram(target, reset, format, type, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint type, jlong values_buffer_offset, jlong function_pointer) { GLvoid *values_address = ((GLvoid *)offsetToPointer(values_buffer_offset)); glGetHistogramPROC glGetHistogram = (glGetHistogramPROC)((intptr_t)function_pointer); glGetHistogram(target, reset, format, type, values_address); @@ -162,7 +162,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax(JNIEnv *env glGetMinmax(target, reset, format, types, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint types, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxBO(JNIEnv *env, jclass clazz, jint target, jboolean reset, jint format, jint types, jlong values_buffer_offset, jlong function_pointer) { GLvoid *values_address = ((GLvoid *)offsetToPointer(values_buffer_offset)); glGetMinmaxPROC glGetMinmax = (glGetMinmaxPROC)((intptr_t)function_pointer); glGetMinmax(target, reset, format, types, values_address); @@ -186,7 +186,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D(J glConvolutionFilter1D(target, internalformat, width, format, type, image_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint format, jint type, jint image_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint format, jint type, jlong image_buffer_offset, jlong function_pointer) { const GLvoid *image_address = ((const GLvoid *)offsetToPointer(image_buffer_offset)); glConvolutionFilter1DPROC glConvolutionFilter1D = (glConvolutionFilter1DPROC)((intptr_t)function_pointer); glConvolutionFilter1D(target, internalformat, width, format, type, image_address); @@ -198,7 +198,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D(J glConvolutionFilter2D(target, internalformat, width, height, format, type, image_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jint image_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jlong image_buffer_offset, jlong function_pointer) { const GLvoid *image_address = ((const GLvoid *)offsetToPointer(image_buffer_offset)); glConvolutionFilter2DPROC glConvolutionFilter2D = (glConvolutionFilter2DPROC)((intptr_t)function_pointer); glConvolutionFilter2D(target, internalformat, width, height, format, type, image_address); @@ -242,7 +242,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter( glGetConvolutionFilter(target, format, type, image_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jint image_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jlong image_buffer_offset, jlong function_pointer) { GLvoid *image_address = ((GLvoid *)offsetToPointer(image_buffer_offset)); glGetConvolutionFilterPROC glGetConvolutionFilter = (glGetConvolutionFilterPROC)((intptr_t)function_pointer); glGetConvolutionFilter(target, format, type, image_address); @@ -267,7 +267,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D(JNI glSeparableFilter2D(target, internalformat, width, height, format, type, row_address, column_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jint row_buffer_offset, jint column_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2DBO(JNIEnv *env, jclass clazz, jint target, jint internalformat, jint width, jint height, jint format, jint type, jlong row_buffer_offset, jlong column_buffer_offset, jlong function_pointer) { const GLvoid *row_address = ((const GLvoid *)offsetToPointer(row_buffer_offset)); const GLvoid *column_address = ((const GLvoid *)offsetToPointer(column_buffer_offset)); glSeparableFilter2DPROC glSeparableFilter2D = (glSeparableFilter2DPROC)((intptr_t)function_pointer); @@ -282,7 +282,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter(JN glGetSeparableFilter(target, format, type, row_address, column_address, span_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jint row_buffer_offset, jint column_buffer_offset, jint span_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilterBO(JNIEnv *env, jclass clazz, jint target, jint format, jint type, jlong row_buffer_offset, jlong column_buffer_offset, jlong span_buffer_offset, jlong function_pointer) { GLvoid *row_address = ((GLvoid *)offsetToPointer(row_buffer_offset)); GLvoid *column_address = ((GLvoid *)offsetToPointer(column_buffer_offset)); GLvoid *span_address = ((GLvoid *)offsetToPointer(span_buffer_offset)); diff --git a/src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c b/src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c index eb5ef350..7da9e722 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c +++ b/src/native/generated/org_lwjgl_opengl_ARBMatrixPalette.c @@ -20,7 +20,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPoin glMatrixIndexPointerARB(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glMatrixIndexPointerARBPROC glMatrixIndexPointerARB = (glMatrixIndexPointerARBPROC)((intptr_t)function_pointer); glMatrixIndexPointerARB(size, type, stride, pPointer_address); diff --git a/src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c b/src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c index 2020f9e2..8a599de2 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c +++ b/src/native/generated/org_lwjgl_opengl_ARBTextureCompression.c @@ -17,7 +17,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressed glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexImage1DARBPROC glCompressedTexImage1DARB = (glCompressedTexImage1DARBPROC)((intptr_t)function_pointer); glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData_address); @@ -29,7 +29,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressed glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexImage2DARBPROC glCompressedTexImage2DARB = (glCompressedTexImage2DARBPROC)((intptr_t)function_pointer); glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData_address); @@ -41,7 +41,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressed glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexImage3DARBPROC glCompressedTexImage3DARB = (glCompressedTexImage3DARBPROC)((intptr_t)function_pointer); glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData_address); @@ -53,7 +53,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressed glCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage1DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexSubImage1DARBPROC glCompressedTexSubImage1DARB = (glCompressedTexSubImage1DARBPROC)((intptr_t)function_pointer); glCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData_address); @@ -65,7 +65,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressed glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage2DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexSubImage2DARBPROC glCompressedTexSubImage2DARB = (glCompressedTexSubImage2DARBPROC)((intptr_t)function_pointer); glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData_address); @@ -77,7 +77,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressed glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jint pData_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTexSubImage3DARBBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jlong pData_buffer_offset, jlong function_pointer) { const GLvoid *pData_address = ((const GLvoid *)offsetToPointer(pData_buffer_offset)); glCompressedTexSubImage3DARBPROC glCompressedTexSubImage3DARB = (glCompressedTexSubImage3DARBPROC)((intptr_t)function_pointer); glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData_address); @@ -89,7 +89,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompres glGetCompressedTexImageARB(target, lod, pImg_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARBBO(JNIEnv *env, jclass clazz, jint target, jint lod, jint pImg_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressedTexImageARBBO(JNIEnv *env, jclass clazz, jint target, jint lod, jlong pImg_buffer_offset, jlong function_pointer) { GLvoid *pImg_address = ((GLvoid *)offsetToPointer(pImg_buffer_offset)); glGetCompressedTexImageARBPROC glGetCompressedTexImageARB = (glGetCompressedTexImageARBPROC)((intptr_t)function_pointer); glGetCompressedTexImageARB(target, lod, pImg_address); diff --git a/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c b/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c index 61334d9c..55b21684 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c +++ b/src/native/generated/org_lwjgl_opengl_ARBVertexBlend.c @@ -68,7 +68,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARB( glWeightPointerARB(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARBBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glWeightPointerARBPROC glWeightPointerARB = (glWeightPointerARBPROC)((intptr_t)function_pointer); glWeightPointerARB(size, type, stride, pPointer_address); diff --git a/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c b/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c index 469aaa76..d5abc7e3 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c +++ b/src/native/generated/org_lwjgl_opengl_ARBVertexProgram.c @@ -95,7 +95,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPoi glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerARBPROC glVertexAttribPointerARB = (glVertexAttribPointerARBPROC)((intptr_t)function_pointer); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); diff --git a/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c b/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c index af0b0090..5dcf2c6e 100644 --- a/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c +++ b/src/native/generated/org_lwjgl_opengl_ARBVertexShader.c @@ -98,7 +98,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPoin glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglVertexAttribPointerARBBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerARBPROC glVertexAttribPointerARB = (glVertexAttribPointerARBPROC)((intptr_t)function_pointer); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_address); diff --git a/src/native/generated/org_lwjgl_opengl_ATIElementArray.c b/src/native/generated/org_lwjgl_opengl_ATIElementArray.c index 9617bf45..a313a292 100644 --- a/src/native/generated/org_lwjgl_opengl_ATIElementArray.c +++ b/src/native/generated/org_lwjgl_opengl_ATIElementArray.c @@ -13,7 +13,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerAT glElementPointerATI(type, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIBO(JNIEnv *env, jclass clazz, jint type, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIBO(JNIEnv *env, jclass clazz, jint type, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glElementPointerATIPROC glElementPointerATI = (glElementPointerATIPROC)((intptr_t)function_pointer); glElementPointerATI(type, pPointer_address); diff --git a/src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c b/src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c index 04194685..8305310e 100644 --- a/src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c +++ b/src/native/generated/org_lwjgl_opengl_EXTDrawRangeElements.c @@ -11,7 +11,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeEl glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint pIndices_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeElementsEXTBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jlong pIndices_buffer_offset, jlong function_pointer) { const GLvoid *pIndices_address = ((const GLvoid *)offsetToPointer(pIndices_buffer_offset)); glDrawRangeElementsEXTPROC glDrawRangeElementsEXT = (glDrawRangeElementsEXTPROC)((intptr_t)function_pointer); glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_address); diff --git a/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c b/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c index 379c8dd1..1d76c606 100644 --- a/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c +++ b/src/native/generated/org_lwjgl_opengl_EXTFogCoord.c @@ -23,7 +23,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT(J glFogCoordPointerEXT(type, stride, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTBO(JNIEnv *env, jclass clazz, jint type, jint stride, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTBO(JNIEnv *env, jclass clazz, jint type, jint stride, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glFogCoordPointerEXTPROC glFogCoordPointerEXT = (glFogCoordPointerEXTPROC)((intptr_t)function_pointer); glFogCoordPointerEXT(type, stride, data_address); diff --git a/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c b/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c index cc92c216..2f720838 100644 --- a/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c +++ b/src/native/generated/org_lwjgl_opengl_EXTSecondaryColor.c @@ -35,7 +35,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColor glSecondaryColorPointerEXT(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glSecondaryColorPointerEXTPROC glSecondaryColorPointerEXT = (glSecondaryColorPointerEXTPROC)((intptr_t)function_pointer); glSecondaryColorPointerEXT(size, type, stride, pPointer_address); diff --git a/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c b/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c index 4c4b7de6..cf8240de 100644 --- a/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c +++ b/src/native/generated/org_lwjgl_opengl_EXTVertexShader.c @@ -179,7 +179,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEX glVariantPointerEXT(id, type, stride, pAddr_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTBO(JNIEnv *env, jclass clazz, jint id, jint type, jint stride, jint pAddr_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTBO(JNIEnv *env, jclass clazz, jint id, jint type, jint stride, jlong pAddr_buffer_offset, jlong function_pointer) { const GLvoid *pAddr_address = ((const GLvoid *)offsetToPointer(pAddr_buffer_offset)); glVariantPointerEXTPROC glVariantPointerEXT = (glVariantPointerEXTPROC)((intptr_t)function_pointer); glVariantPointerEXT(id, type, stride, pAddr_address); diff --git a/src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c b/src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c index b250fdbd..15c95ce2 100644 --- a/src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c +++ b/src/native/generated/org_lwjgl_opengl_EXTVertexWeighting.c @@ -17,7 +17,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightP glVertexWeightPointerEXT(size, type, stride, pPointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pPointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPointerEXTBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pPointer_buffer_offset, jlong function_pointer) { const GLvoid *pPointer_address = ((const GLvoid *)offsetToPointer(pPointer_buffer_offset)); glVertexWeightPointerEXTPROC glVertexWeightPointerEXT = (glVertexWeightPointerEXTPROC)((intptr_t)function_pointer); glVertexWeightPointerEXT(size, type, stride, pPointer_address); diff --git a/src/native/generated/org_lwjgl_opengl_GL11.c b/src/native/generated/org_lwjgl_opengl_GL11.c index a7aee502..4059d1c7 100644 --- a/src/native/generated/org_lwjgl_opengl_GL11.c +++ b/src/native/generated/org_lwjgl_opengl_GL11.c @@ -277,7 +277,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmap(JNIEnv *env, jclass glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmapBO(JNIEnv *env, jclass clazz, jint width, jint height, jfloat xorig, jfloat yorig, jfloat xmove, jfloat ymove, jint bitmap_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmapBO(JNIEnv *env, jclass clazz, jint width, jint height, jfloat xorig, jfloat yorig, jfloat xmove, jfloat ymove, jlong bitmap_buffer_offset, jlong function_pointer) { const GLubyte *bitmap_address = ((const GLubyte *)offsetToPointer(bitmap_buffer_offset)); glBitmapPROC glBitmap = (glBitmapPROC)((intptr_t)function_pointer); glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap_address); @@ -355,7 +355,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointer(JNIEnv *env, j glColorPointer(size, type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glColorPointerPROC glColorPointer = (glColorPointerPROC)((intptr_t)function_pointer); glColorPointer(size, type, stride, pointer_address); @@ -488,7 +488,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointer(JNIEnv *env glEdgeFlagPointer(stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointerBO(JNIEnv *env, jclass clazz, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointerBO(JNIEnv *env, jclass clazz, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glEdgeFlagPointerPROC glEdgeFlagPointer = (glEdgeFlagPointerPROC)((intptr_t)function_pointer); glEdgeFlagPointer(stride, pointer_address); @@ -505,7 +505,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawPixels(JNIEnv *env, jcl glDrawPixels(width, height, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawPixelsBO(JNIEnv *env, jclass clazz, jint width, jint height, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawPixelsBO(JNIEnv *env, jclass clazz, jint width, jint height, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glDrawPixelsPROC glDrawPixels = (glDrawPixelsPROC)((intptr_t)function_pointer); glDrawPixels(width, height, format, type, pixels_address); @@ -517,7 +517,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElements(JNIEnv *env, j glDrawElements(mode, count, type, indices_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElementsBO(JNIEnv *env, jclass clazz, jint mode, jint count, jint type, jint indices_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElementsBO(JNIEnv *env, jclass clazz, jint mode, jint count, jint type, jlong indices_buffer_offset, jlong function_pointer) { const GLvoid *indices_address = ((const GLvoid *)offsetToPointer(indices_buffer_offset)); glDrawElementsPROC glDrawElements = (glDrawElementsPROC)((intptr_t)function_pointer); glDrawElements(mode, count, type, indices_address); @@ -560,7 +560,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapfv(JNIEnv *env, glGetPixelMapfv(map, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jlong values_buffer_offset, jlong function_pointer) { GLfloat *values_address = ((GLfloat *)offsetToPointer(values_buffer_offset)); glGetPixelMapfvPROC glGetPixelMapfv = (glGetPixelMapfvPROC)((intptr_t)function_pointer); glGetPixelMapfv(map, values_address); @@ -572,7 +572,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapuiv(JNIEnv *env, glGetPixelMapuiv(map, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jlong values_buffer_offset, jlong function_pointer) { GLuint *values_address = ((GLuint *)offsetToPointer(values_buffer_offset)); glGetPixelMapuivPROC glGetPixelMapuiv = (glGetPixelMapuivPROC)((intptr_t)function_pointer); glGetPixelMapuiv(map, values_address); @@ -584,7 +584,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapusv(JNIEnv *env, glGetPixelMapusv(map, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jlong values_buffer_offset, jlong function_pointer) { GLushort *values_address = ((GLushort *)offsetToPointer(values_buffer_offset)); glGetPixelMapusvPROC glGetPixelMapusv = (glGetPixelMapusvPROC)((intptr_t)function_pointer); glGetPixelMapusv(map, values_address); @@ -741,7 +741,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArrays(JNIEnv *e glInterleavedArrays(format, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArraysBO(JNIEnv *env, jclass clazz, jint format, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArraysBO(JNIEnv *env, jclass clazz, jint format, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glInterleavedArraysPROC glInterleavedArrays = (glInterleavedArraysPROC)((intptr_t)function_pointer); glInterleavedArrays(format, stride, pointer_address); @@ -787,7 +787,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexImage(JNIEnv *env, jc glGetTexImage(target, level, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexImageBO(JNIEnv *env, jclass clazz, jint target, jint level, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexImageBO(JNIEnv *env, jclass clazz, jint target, jint level, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { GLvoid *pixels_address = ((GLvoid *)offsetToPointer(pixels_buffer_offset)); glGetTexImagePROC glGetTexImage = (glGetTexImagePROC)((intptr_t)function_pointer); glGetTexImage(target, level, format, type, pixels_address); @@ -835,7 +835,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStipple(JNIEnv *e glGetPolygonStipple(mask_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStippleBO(JNIEnv *env, jclass clazz, jint mask_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStippleBO(JNIEnv *env, jclass clazz, jlong mask_buffer_offset, jlong function_pointer) { GLubyte *mask_address = ((GLubyte *)offsetToPointer(mask_buffer_offset)); glGetPolygonStipplePROC glGetPolygonStipple = (glGetPolygonStipplePROC)((intptr_t)function_pointer); glGetPolygonStipple(mask_address); @@ -1016,7 +1016,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStipple(JNIEnv *env, glPolygonStipple(mask_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStippleBO(JNIEnv *env, jclass clazz, jint mask_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStippleBO(JNIEnv *env, jclass clazz, jlong mask_buffer_offset, jlong function_pointer) { const GLubyte *mask_address = ((const GLubyte *)offsetToPointer(mask_buffer_offset)); glPolygonStipplePROC glPolygonStipple = (glPolygonStipplePROC)((intptr_t)function_pointer); glPolygonStipple(mask_address); @@ -1068,7 +1068,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapfv(JNIEnv *env, jcl glPixelMapfv(map, mapsize, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapfvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jlong values_buffer_offset, jlong function_pointer) { const GLfloat *values_address = ((const GLfloat *)offsetToPointer(values_buffer_offset)); glPixelMapfvPROC glPixelMapfv = (glPixelMapfvPROC)((intptr_t)function_pointer); glPixelMapfv(map, mapsize, values_address); @@ -1080,7 +1080,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapuiv(JNIEnv *env, jc glPixelMapuiv(map, mapsize, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapuivBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jlong values_buffer_offset, jlong function_pointer) { const GLuint *values_address = ((const GLuint *)offsetToPointer(values_buffer_offset)); glPixelMapuivPROC glPixelMapuiv = (glPixelMapuivPROC)((intptr_t)function_pointer); glPixelMapuiv(map, mapsize, values_address); @@ -1092,7 +1092,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusv(JNIEnv *env, jc glPixelMapusv(map, mapsize, values_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jint values_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusvBO(JNIEnv *env, jclass clazz, jint map, jint mapsize, jlong values_buffer_offset, jlong function_pointer) { const GLushort *values_address = ((const GLushort *)offsetToPointer(values_buffer_offset)); glPixelMapusvPROC glPixelMapusv = (glPixelMapusvPROC)((intptr_t)function_pointer); glPixelMapusv(map, mapsize, values_address); @@ -1114,7 +1114,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointer(JNIEnv *env, glNormalPointer(type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glNormalPointerPROC glNormalPointer = (glNormalPointerPROC)((intptr_t)function_pointer); glNormalPointer(type, stride, pointer_address); @@ -1220,7 +1220,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixels(JNIEnv *env, jcl glReadPixels(x, y, width, height, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixelsBO(JNIEnv *env, jclass clazz, jint x, jint y, jint width, jint height, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixelsBO(JNIEnv *env, jclass clazz, jint x, jint y, jint width, jint height, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { GLvoid *pixels_address = ((GLvoid *)offsetToPointer(pixels_buffer_offset)); glReadPixelsPROC glReadPixels = (glReadPixelsPROC)((intptr_t)function_pointer); glReadPixels(x, y, width, height, format, type, pixels_address); @@ -1327,7 +1327,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointer(JNIEnv *env, glVertexPointer(size, type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glVertexPointerPROC glVertexPointer = (glVertexPointerPROC)((intptr_t)function_pointer); glVertexPointer(size, type, stride, pointer_address); @@ -1394,7 +1394,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1D(JNIEnv *env, jcl glTexImage1D(target, level, internalformat, width, border, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexImage1DPROC glTexImage1D = (glTexImage1DPROC)((intptr_t)function_pointer); glTexImage1D(target, level, internalformat, width, border, format, type, pixels_address); @@ -1406,7 +1406,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2D(JNIEnv *env, jcl glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexImage2DPROC glTexImage2D = (glTexImage2DPROC)((intptr_t)function_pointer); glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_address); @@ -1418,7 +1418,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage1D(JNIEnv *env, glTexSubImage1D(target, level, xoffset, width, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexSubImage1DPROC glTexSubImage1D = (glTexSubImage1DPROC)((intptr_t)function_pointer); glTexSubImage1D(target, level, xoffset, width, format, type, pixels_address); @@ -1430,7 +1430,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage2D(JNIEnv *env, glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexSubImage2DPROC glTexSubImage2D = (glTexSubImage2DPROC)((intptr_t)function_pointer); glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels_address); @@ -1519,7 +1519,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexCoordPointer(JNIEnv *env glTexCoordPointer(size, type, stride, pointer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexCoordPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint pointer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglTexCoordPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong pointer_buffer_offset, jlong function_pointer) { const GLvoid *pointer_address = ((const GLvoid *)offsetToPointer(pointer_buffer_offset)); glTexCoordPointerPROC glTexCoordPointer = (glTexCoordPointerPROC)((intptr_t)function_pointer); glTexCoordPointer(size, type, stride, pointer_address); diff --git a/src/native/generated/org_lwjgl_opengl_GL12.c b/src/native/generated/org_lwjgl_opengl_GL12.c index e74d89f0..89471b49 100644 --- a/src/native/generated/org_lwjgl_opengl_GL12.c +++ b/src/native/generated/org_lwjgl_opengl_GL12.c @@ -14,7 +14,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElements(JNIEnv *e glDrawRangeElements(mode, start, end, count, type, indices_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint indices_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsBO(JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jlong indices_buffer_offset, jlong function_pointer) { const GLvoid *indices_address = ((const GLvoid *)offsetToPointer(indices_buffer_offset)); glDrawRangeElementsPROC glDrawRangeElements = (glDrawRangeElementsPROC)((intptr_t)function_pointer); glDrawRangeElements(mode, start, end, count, type, indices_address); @@ -26,7 +26,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D(JNIEnv *env, jcl glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalFormat, jint width, jint height, jint depth, jint border, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalFormat, jint width, jint height, jint depth, jint border, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexImage3DPROC glTexImage3D = (glTexImage3DPROC)((intptr_t)function_pointer); glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels_address); @@ -38,7 +38,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3D(JNIEnv *env, glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint type, jint pixels_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint type, jlong pixels_buffer_offset, jlong function_pointer) { const GLvoid *pixels_address = ((const GLvoid *)offsetToPointer(pixels_buffer_offset)); glTexSubImage3DPROC glTexSubImage3D = (glTexSubImage3DPROC)((intptr_t)function_pointer); glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels_address); diff --git a/src/native/generated/org_lwjgl_opengl_GL13.c b/src/native/generated/org_lwjgl_opengl_GL13.c index b5239b31..db5fab38 100644 --- a/src/native/generated/org_lwjgl_opengl_GL13.c +++ b/src/native/generated/org_lwjgl_opengl_GL13.c @@ -42,7 +42,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D(JNIEnv glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint border, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexImage1DPROC glCompressedTexImage1D = (glCompressedTexImage1DPROC)((intptr_t)function_pointer); glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data_address); @@ -54,7 +54,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D(JNIEnv glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint border, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexImage2DPROC glCompressedTexImage2D = (glCompressedTexImage2DPROC)((intptr_t)function_pointer); glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data_address); @@ -66,7 +66,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D(JNIEnv glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint internalformat, jint width, jint height, jint depth, jint border, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexImage3DPROC glCompressedTexImage3D = (glCompressedTexImage3DPROC)((intptr_t)function_pointer); glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data_address); @@ -78,7 +78,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D(JNI glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint width, jint format, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexSubImage1DPROC glCompressedTexSubImage1D = (glCompressedTexSubImage1DPROC)((intptr_t)function_pointer); glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data_address); @@ -90,7 +90,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D(JNI glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint width, jint height, jint format, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexSubImage2DPROC glCompressedTexSubImage2D = (glCompressedTexSubImage2DPROC)((intptr_t)function_pointer); glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data_address); @@ -102,7 +102,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D(JNI glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3DBO(JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint width, jint height, jint depth, jint format, jint imageSize, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glCompressedTexSubImage3DPROC glCompressedTexSubImage3D = (glCompressedTexSubImage3DPROC)((intptr_t)function_pointer); glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data_address); @@ -114,7 +114,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage(JNIEn glGetCompressedTexImage(target, lod, img_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImageBO(JNIEnv *env, jclass clazz, jint target, jint lod, jint img_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImageBO(JNIEnv *env, jclass clazz, jint target, jint lod, jlong img_buffer_offset, jlong function_pointer) { GLvoid *img_address = ((GLvoid *)offsetToPointer(img_buffer_offset)); glGetCompressedTexImagePROC glGetCompressedTexImage = (glGetCompressedTexImagePROC)((intptr_t)function_pointer); glGetCompressedTexImage(target, lod, img_address); diff --git a/src/native/generated/org_lwjgl_opengl_GL14.c b/src/native/generated/org_lwjgl_opengl_GL14.c index 077df1f3..fd960655 100644 --- a/src/native/generated/org_lwjgl_opengl_GL14.c +++ b/src/native/generated/org_lwjgl_opengl_GL14.c @@ -52,7 +52,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer(JNIEnv *env glFogCoordPointer(type, stride, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerBO(JNIEnv *env, jclass clazz, jint type, jint stride, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glFogCoordPointerPROC glFogCoordPointer = (glFogCoordPointerPROC)((intptr_t)function_pointer); glFogCoordPointer(type, stride, data_address); @@ -113,7 +113,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer(JNIEn glSecondaryColorPointer(size, type, stride, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jint data_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerBO(JNIEnv *env, jclass clazz, jint size, jint type, jint stride, jlong data_buffer_offset, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)offsetToPointer(data_buffer_offset)); glSecondaryColorPointerPROC glSecondaryColorPointer = (glSecondaryColorPointerPROC)((intptr_t)function_pointer); glSecondaryColorPointer(size, type, stride, data_address); diff --git a/src/native/generated/org_lwjgl_opengl_GL15.c b/src/native/generated/org_lwjgl_opengl_GL15.c index 77792377..b1a6a767 100644 --- a/src/native/generated/org_lwjgl_opengl_GL15.c +++ b/src/native/generated/org_lwjgl_opengl_GL15.c @@ -46,19 +46,19 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_GL15_nglIsBuffer(JNIEnv *env, j return __result; } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData(JNIEnv *env, jclass clazz, jint target, jint size, jobject data, jint data_position, jint usage, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData(JNIEnv *env, jclass clazz, jint target, jlong size, jobject data, jint data_position, jint usage, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)safeGetBufferAddress(env, data)) + data_position)); glBufferDataPROC glBufferData = (glBufferDataPROC)((intptr_t)function_pointer); glBufferData(target, size, data_address, usage); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { const GLvoid *data_address = ((const GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glBufferSubDataPROC glBufferSubData = (glBufferSubDataPROC)((intptr_t)function_pointer); glBufferSubData(target, offset, size, data_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData(JNIEnv *env, jclass clazz, jint target, jint offset, jint size, jobject data, jint data_position, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData(JNIEnv *env, jclass clazz, jint target, jlong offset, jlong size, jobject data, jint data_position, jlong function_pointer) { GLvoid *data_address = ((GLvoid *)(((char *)(*env)->GetDirectBufferAddress(env, data)) + data_position)); glGetBufferSubDataPROC glGetBufferSubData = (glGetBufferSubDataPROC)((intptr_t)function_pointer); glGetBufferSubData(target, offset, size, data_address); diff --git a/src/native/generated/org_lwjgl_opengl_GL20.c b/src/native/generated/org_lwjgl_opengl_GL20.c index ced5ace9..459e090d 100644 --- a/src/native/generated/org_lwjgl_opengl_GL20.c +++ b/src/native/generated/org_lwjgl_opengl_GL20.c @@ -389,7 +389,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttribPointer(JNIEnv glVertexAttribPointer(index, size, type, normalized, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttribPointerBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL20_nglVertexAttribPointerBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerPROC glVertexAttribPointer = (glVertexAttribPointerPROC)((intptr_t)function_pointer); glVertexAttribPointer(index, size, type, normalized, stride, buffer_address); diff --git a/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c b/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c index 18a1b540..86733893 100644 --- a/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c +++ b/src/native/generated/org_lwjgl_opengl_NVVertexProgram.c @@ -125,7 +125,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPoin glVertexAttribPointerNV(index, size, type, stride, buffer_address); } -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNVBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jint stride, jint buffer_buffer_offset, jlong function_pointer) { +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointerNVBO(JNIEnv *env, jclass clazz, jint index, jint size, jint type, jint stride, jlong buffer_buffer_offset, jlong function_pointer) { const GLvoid *buffer_address = ((const GLvoid *)offsetToPointer(buffer_buffer_offset)); glVertexAttribPointerNVPROC glVertexAttribPointerNV = (glVertexAttribPointerNVPROC)((intptr_t)function_pointer); glVertexAttribPointerNV(index, size, type, stride, buffer_address); diff --git a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java index d5bece40..76447ae1 100644 --- a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java +++ b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java @@ -76,7 +76,7 @@ public interface ARB_buffer_object { boolean glIsBufferARB(@GLuint int buffer); @GenerateAutos - void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB int size, + void glBufferDataARB(@GLenum int target, @AutoSize("data") @GLsizeiptrARB long size, @Const @GLbyte @GLshort @@ -84,7 +84,7 @@ public interface ARB_buffer_object { @GLfloat @GLdouble Buffer data, @GLenum int usage); - void glBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, + void glBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, @Check @Const @GLbyte @@ -93,7 +93,7 @@ public interface ARB_buffer_object { @GLfloat @GLdouble Buffer data); - void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB int offset, @AutoSize("data") @GLsizeiptrARB int size, + void glGetBufferSubDataARB(@GLenum int target, @GLintptrARB long offset, @AutoSize("data") @GLsizeiptrARB long size, @Check @GLbyte @GLshort diff --git a/src/templates/org/lwjgl/opengl/GL15.java b/src/templates/org/lwjgl/opengl/GL15.java index 613e5b74..9eed970e 100644 --- a/src/templates/org/lwjgl/opengl/GL15.java +++ b/src/templates/org/lwjgl/opengl/GL15.java @@ -81,7 +81,7 @@ public interface GL15 { boolean glIsBuffer(@GLuint int buffer); @GenerateAutos - void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr int size, + void glBufferData(@GLenum int target, @AutoSize("data") @GLsizeiptr long size, @Const @GLbyte @GLshort @@ -89,7 +89,7 @@ public interface GL15 { @GLfloat @GLdouble Buffer data, @GLenum int usage); - void glBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, + void glBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @Check @Const @GLbyte @@ -98,7 +98,7 @@ public interface GL15 { @GLfloat @GLdouble Buffer data); - void glGetBufferSubData(@GLenum int target, @GLintptr int offset, @AutoSize("data") @GLsizeiptr int size, + void glGetBufferSubData(@GLenum int target, @GLintptr long offset, @AutoSize("data") @GLsizeiptr long size, @Check @GLbyte @GLshort