Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2685] trunk/LWJGL/src
|
From: <eli...@us...> - 2006-11-27 23:04:39
|
Revision: 2685
http://svn.sourceforge.net/java-game-lib/?rev=2685&view=rev
Author: elias_naur
Date: 2006-11-27 15:04:37 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
ARBTextureCompression, GL13: Only allow ByteBuffer for glCompressedTex*Image*D since the spec defines that the image data is interpreted as (unsigned) bytes anyway. Also let the imageSize parameter be automatically determined
Modified Paths:
--------------
trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java
trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ARBTextureCompression.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -23,47 +23,15 @@
}
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) {
+ public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexImage1DARB(target, level, internalformat, width, border, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- 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);
+ private static native void nglCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage1DARB_pointer;
@@ -73,47 +41,15 @@
}
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) {
+ public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- 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);
+ private static native void nglCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer 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, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage2DARB_pointer;
@@ -123,47 +59,15 @@
}
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) {
+ public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- 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);
+ private static native void nglCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer 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, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexImage3DARB_pointer;
@@ -173,47 +77,15 @@
}
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) {
+ public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- 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);
+ private static native void nglCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData, int pData_position, long function_pointer);
public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
@@ -223,47 +95,15 @@
}
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) {
+ public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, (pData.remaining()), pData, pData.position(), function_pointer);
}
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- 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);
+ private static native void nglCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer 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, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
@@ -273,47 +113,15 @@
}
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) {
+ public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer pData) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position(), function_pointer);
+ nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, (pData.remaining()), pData, pData.position(), 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, DoubleBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer pData) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(pData);
- 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);
+ 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, ByteBuffer 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, long pData_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
@@ -331,39 +139,7 @@
BufferChecks.checkDirect(pImg);
nglGetCompressedTexImageARB(target, lod, pImg, pImg.position(), function_pointer);
}
- public static void glGetCompressedTexImageARB(int target, int lod, DoubleBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 3, function_pointer);
- }
- public static void glGetCompressedTexImageARB(int target, int lod, FloatBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
- }
- public static void glGetCompressedTexImageARB(int target, int lod, IntBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
- }
- public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensurePackPBOdisabled(caps);
- BufferChecks.checkDirect(pImg);
- 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);
+ private static native void nglGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg, int pImg_position, long function_pointer);
public static void glGetCompressedTexImageARB(int target, int lod, long pImg_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.ARB_texture_compression_glGetCompressedTexImageARB_pointer;
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/GL13.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -124,46 +124,14 @@
}
private static native void nglClientActiveTexture(int texture, long function_pointer);
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) {
+ public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexImage1D(target, level, internalformat, width, border, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- 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, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
@@ -174,47 +142,15 @@
}
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) {
+ public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexImage2D(target, level, internalformat, width, height, border, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- 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);
+ private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer 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, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage2D_pointer;
@@ -224,47 +160,15 @@
}
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) {
+ public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- 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);
+ private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer 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, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexImage3D_pointer;
@@ -274,47 +178,15 @@
}
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) {
+ public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexSubImage1D(target, level, xoffset, width, format, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- 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);
+ private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data, int data_position, long function_pointer);
public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage1D_pointer;
@@ -324,47 +196,15 @@
}
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) {
+ public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- 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);
+ private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer 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, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage2D_pointer;
@@ -374,47 +214,15 @@
}
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) {
+ public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, ByteBuffer data) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
GLChecks.ensureUnpackPBOdisabled(caps);
BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position(), function_pointer);
+ nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, (data.remaining()), data, data.position(), function_pointer);
}
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, DoubleBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 3, function_pointer);
- }
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer);
- }
- public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) {
- ContextCapabilities caps = GLContext.getCapabilities();
- long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
- BufferChecks.checkFunctionAddress(function_pointer);
- GLChecks.ensureUnpackPBOdisabled(caps);
- BufferChecks.checkDirect(data);
- 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);
+ 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, ByteBuffer 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, long data_buffer_offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.GL13_glCompressedTexSubImage3D_pointer;
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_texture_compression.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -48,72 +48,51 @@
int GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A2;
int GL_COMPRESSED_TEXTURE_FORMATS_ARB = 0x86A3;
- void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize,
+ void glCompressedTexImage1DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @GLsizei int imageSize,
+ void glCompressedTexImage2DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, int border, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @GLsizei int imageSize,
+ void glCompressedTexImage3DARB(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, @GLsizei int height, @GLsizei int depth, int border, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @GLsizei int imageSize,
+ void glCompressedTexSubImage1DARB(@GLenum int target, int level, int xoffset, @GLsizei int width, @GLenum int format, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @GLsizei int imageSize,
+ void glCompressedTexSubImage2DARB(@GLenum int target, int level, int xoffset, int yoffset, @GLsizei int width, @GLsizei int height, @GLenum int format, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
- void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @GLsizei int imageSize,
+ void glCompressedTexSubImage3DARB(@GLenum int target, int level, int xoffset, int yoffset, int zoffset, @GLsizei int width, @GLsizei int height, @GLsizei int depth, @GLenum int format, @AutoSize("pData") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pData);
+ @GLvoid
+ ByteBuffer pData);
void glGetCompressedTexImageARB(@GLenum int target, int lod,
@BufferObject(BufferKind.PackPBO)
@Check
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer pImg);
+ @GLvoid
+ ByteBuffer pImg);
}
Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java 2006-11-27 23:01:01 UTC (rev 2684)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL13.java 2006-11-27 23:04:37 UTC (rev 2685)
@@ -150,65 +150,47 @@
void glClientActiveTexture(@GLenum int texture);
- void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @GLsizei int imageSize,
+ void glCompressedTexImage1D(@GLenum int target, int level, @GLenum int internalformat, @GLsizei int width, int border, @AutoSize("data") @GLsizei int imageSize,
@BufferObject(BufferKind.UnpackPBO)
@Check
@Const
- @GLbyte
- @GLshort
- @GLint
- @GLfloat
- @GLdouble Buffer data);
+ @GLvoid
+ Buffer data);
- void glCompressedTexImage2D(@GLenum int target, int level,...
[truncated message content] |
