diff --git a/src/java/org/lwjgl/generator/TypeInfo.java b/src/java/org/lwjgl/generator/TypeInfo.java
index c070ab8b..437b5885 100644
--- a/src/java/org/lwjgl/generator/TypeInfo.java
+++ b/src/java/org/lwjgl/generator/TypeInfo.java
@@ -140,6 +140,7 @@ public class TypeInfo {
 	private static Collection<TypeInfo> getTypeInfos(TypeMap type_map, Declaration param, TypeMirror decl_type) {
 		Collection<AnnotationMirror> annotations = Utils.getSortedAnnotations(param.getAnnotationMirrors());
 		Map<Class, TypeInfo> types = new HashMap<Class, TypeInfo>();
+		Collection<TypeInfo> multityped_result = new ArrayList<TypeInfo>();
 		boolean add_default_type = true;
 		for (AnnotationMirror annotation : annotations) {
 			NativeType native_type_annotation = NativeTypeTranslator.getAnnotation(annotation, NativeType.class);
@@ -150,12 +151,14 @@ public class TypeInfo {
 				String auto_type = type_map.getAutoTypeFromAnnotation(annotation);
 				if (inverse_type != null) {
 					if (types.containsKey(inverse_type)) {
-						String inverse_auto_type = types.get(inverse_type).getAutoType();
+						TypeInfo inverse_type_info = types.get(inverse_type);
+						String inverse_auto_type = inverse_type_info.getAutoType();
 						auto_type = signedness == Signedness.UNSIGNED ? auto_type + " : " + inverse_auto_type :
 							inverse_auto_type + " : " + auto_type;
 						auto_type = UNSIGNED_PARAMETER_NAME + " ? " + auto_type;
 						signedness = Signedness.BOTH;
 						types.remove(inverse_type);
+						multityped_result.remove(inverse_type_info);
 					}
 				}
 				Class type;
@@ -164,7 +167,9 @@ public class TypeInfo {
 					type = getBufferTypeFromPrimitiveKind(kind);
 				else
 					type = getTypeFromPrimitiveKind(kind);
-				types.put(annotation_type, new TypeInfo(type, signedness, auto_type));
+				TypeInfo type_info = new TypeInfo(type, signedness, auto_type);
+				types.put(annotation_type, type_info);
+				multityped_result.add(type_info);
 				add_default_type = false;
 			}
 		}
@@ -174,7 +179,7 @@ public class TypeInfo {
 			result.add(default_type_info);
 			return result;
 		} else
-			return types.values();
+			return multityped_result;
 	}
 
 	private static Map<ParameterDeclaration, Collection<TypeInfo>> getTypeInfoMap(TypeMap type_map, MethodDeclaration method) {
diff --git a/src/java/org/lwjgl/openal/AL10.java b/src/java/org/lwjgl/openal/AL10.java
index 2f4eed5b..025f24c1 100644
--- a/src/java/org/lwjgl/openal/AL10.java
+++ b/src/java/org/lwjgl/openal/AL10.java
@@ -581,9 +581,9 @@ public final class AL10 {
 	 * @param data location of data
 	 * @param freq frequency of data
 	 */
-	public static void alBufferData(int buffer, int format, ShortBuffer data, int freq) {
+	public static void alBufferData(int buffer, int format, ByteBuffer data, int freq) {
 		BufferChecks.checkDirect(data);
-		nalBufferData(buffer, format, data, data.position() << 1, (data.remaining() << 1), freq);
+		nalBufferData(buffer, format, data, data.position(), (data.remaining()), freq);
 		Util.checkALError();
 	}
 	/**
@@ -643,9 +643,9 @@ public final class AL10 {
 	 * @param data location of data
 	 * @param freq frequency of data
 	 */
-	public static void alBufferData(int buffer, int format, ByteBuffer data, int freq) {
+	public static void alBufferData(int buffer, int format, ShortBuffer data, int freq) {
 		BufferChecks.checkDirect(data);
-		nalBufferData(buffer, format, data, data.position(), (data.remaining()), freq);
+		nalBufferData(buffer, format, data, data.position() << 1, (data.remaining() << 1), freq);
 		Util.checkALError();
 	}
 	private static native void nalBufferData(int buffer, int format, Buffer data, int data_position, int size, int freq);
diff --git a/src/java/org/lwjgl/opengl/ARBBufferObject.java b/src/java/org/lwjgl/opengl/ARBBufferObject.java
index 1738adfb..2e958b4d 100644
--- a/src/java/org/lwjgl/opengl/ARBBufferObject.java
+++ b/src/java/org/lwjgl/opengl/ARBBufferObject.java
@@ -72,17 +72,11 @@ public class ARBBufferObject {
 	}
 	private static native java.nio.ByteBuffer nglMapBufferARB(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
 
-	public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) {
+	public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
-	}
-	public static void glGetBufferSubDataARB(int target, int offset, IntBuffer data) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
+		nglGetBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer);
 	}
 	public static void glGetBufferSubDataARB(int target, int offset, FloatBuffer data) {
 		BufferChecks.checkDirect(data);
@@ -90,25 +84,25 @@ public class ARBBufferObject {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
-	public static void glGetBufferSubDataARB(int target, int offset, ByteBuffer data) {
+	public static void glGetBufferSubDataARB(int target, int offset, IntBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer);
+		nglGetBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
+	}
+	public static void glGetBufferSubDataARB(int target, int offset, ShortBuffer data) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glGetBufferSubDataARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
 	}
 	private static native void nglGetBufferSubDataARB(int target, int offset, int size, Buffer data, int data_position, long function_pointer);
 
-	public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) {
+	public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
-	}
-	public static void glBufferSubDataARB(int target, int offset, IntBuffer data) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
+		nglBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer);
 	}
 	public static void glBufferSubDataARB(int target, int offset, FloatBuffer data) {
 		BufferChecks.checkDirect(data);
@@ -116,11 +110,17 @@ public class ARBBufferObject {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
-	public static void glBufferSubDataARB(int target, int offset, ByteBuffer data) {
+	public static void glBufferSubDataARB(int target, int offset, IntBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferSubDataARB(target, offset, (data.remaining()), data, data.position(), function_pointer);
+		nglBufferSubDataARB(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
+	}
+	public static void glBufferSubDataARB(int target, int offset, ShortBuffer data) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferSubDataARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBufferSubDataARB(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
 	}
 	private static native void nglBufferSubDataARB(int target, int offset, int size, Buffer data, int data_position, long function_pointer);
 
@@ -129,17 +129,11 @@ public class ARBBufferObject {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferDataARB(target, size, null, 0, usage, function_pointer);
 	}
-	public static void glBufferDataARB(int target, ShortBuffer data, int usage) {
+	public static void glBufferDataARB(int target, ByteBuffer data, int usage) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferDataARB(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer);
-	}
-	public static void glBufferDataARB(int target, IntBuffer data, int usage) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
+		nglBufferDataARB(target, (data.remaining()), data, data.position(), usage, function_pointer);
 	}
 	public static void glBufferDataARB(int target, FloatBuffer data, int usage) {
 		BufferChecks.checkDirect(data);
@@ -147,11 +141,17 @@ public class ARBBufferObject {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
 	}
-	public static void glBufferDataARB(int target, ByteBuffer data, int usage) {
+	public static void glBufferDataARB(int target, IntBuffer data, int usage) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferDataARB(target, (data.remaining()), data, data.position(), usage, function_pointer);
+		nglBufferDataARB(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
+	}
+	public static void glBufferDataARB(int target, ShortBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().ARB_buffer_object_glBufferDataARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBufferDataARB(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer);
 	}
 	private static native void nglBufferDataARB(int target, int size, Buffer data, int data_position, int usage, long function_pointer);
 
diff --git a/src/java/org/lwjgl/opengl/ARBImaging.java b/src/java/org/lwjgl/opengl/ARBImaging.java
index 3e3437d9..e3195244 100644
--- a/src/java/org/lwjgl/opengl/ARBImaging.java
+++ b/src/java/org/lwjgl/opengl/ARBImaging.java
@@ -88,563 +88,14 @@ public final class ARBImaging {
 
 	static native void initNativeStubs() throws LWJGLException;
 
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ShortBuffer span) {
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ByteBuffer span) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(row);
 		BufferChecks.checkDirect(column);
 		BufferChecks.checkDirect(span);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, FloatBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ByteBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ShortBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 1, function_pointer);
-	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, IntBuffer span) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		BufferChecks.checkDirect(span);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position(), function_pointer);
 	}
 	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, FloatBuffer span) {
 		GLBufferChecks.ensurePackPBOdisabled();
@@ -655,14 +106,563 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer);
 	}
-	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ByteBuffer span) {
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, IntBuffer span) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(row);
 		BufferChecks.checkDirect(column);
 		BufferChecks.checkDirect(span);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position(), function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ByteBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position(), span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, FloatBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, IntBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ByteBuffer row, ShortBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position(), column, column.position() << 1, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ByteBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, FloatBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, IntBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, FloatBuffer row, ShortBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ByteBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position(), span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, FloatBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, IntBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, IntBuffer row, ShortBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 2, column, column.position() << 1, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ByteBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position(), span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, FloatBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, IntBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 2, span, span.position() << 1, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ByteBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position(), function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, FloatBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, IntBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 2, function_pointer);
+	}
+	public static void glGetSeparableFilter(int target, int format, int type, ShortBuffer row, ShortBuffer column, ShortBuffer span) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		BufferChecks.checkDirect(span);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetSeparableFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetSeparableFilter(target, format, type, row, row.position() << 1, column, column.position() << 1, span, span.position() << 1, function_pointer);
 	}
 	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) {
@@ -673,117 +673,13 @@ public final class ARBImaging {
 	}
 	private static native void nglGetSeparableFilterBO(int target, int format, int type, int row_buffer_offset, int column_buffer_offset, int span_buffer_offset, long function_pointer);
 
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ShortBuffer column) {
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ByteBuffer column) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(row);
 		BufferChecks.checkDirect(column);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 1, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, IntBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 2, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, FloatBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 2, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ByteBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position(), function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ShortBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, IntBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, FloatBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ByteBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ShortBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, IntBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, FloatBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ByteBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ShortBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 1, function_pointer);
-	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, IntBuffer column) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(row);
-		BufferChecks.checkDirect(column);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position(), function_pointer);
 	}
 	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, FloatBuffer column) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -793,13 +689,117 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer);
 	}
-	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ByteBuffer column) {
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, IntBuffer column) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(row);
 		BufferChecks.checkDirect(column);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position(), function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer row, ShortBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position(), column, column.position() << 1, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ByteBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, FloatBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, IntBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, FloatBuffer row, ShortBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ByteBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position(), function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, FloatBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, IntBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer row, ShortBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 2, column, column.position() << 1, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ByteBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position(), function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, FloatBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, IntBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 2, function_pointer);
+	}
+	public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer row, ShortBuffer column) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(row);
+		BufferChecks.checkDirect(column);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glSeparableFilter2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSeparableFilter2D(target, internalformat, width, height, format, type, row, row.position() << 1, column, column.position() << 1, function_pointer);
 	}
 	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) {
@@ -826,19 +826,12 @@ public final class ARBImaging {
 	}
 	private static native void nglGetConvolutionParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
 
-	public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) {
+	public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(image);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetConvolutionFilter(target, format, type, image, image.position() << 1, function_pointer);
-	}
-	public static void glGetConvolutionFilter(int target, int format, int type, IntBuffer image) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(image);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetConvolutionFilter(target, format, type, image, image.position() << 2, function_pointer);
+		nglGetConvolutionFilter(target, format, type, image, image.position(), function_pointer);
 	}
 	public static void glGetConvolutionFilter(int target, int format, int type, FloatBuffer image) {
 		GLBufferChecks.ensurePackPBOdisabled();
@@ -847,12 +840,19 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetConvolutionFilter(target, format, type, image, image.position() << 2, function_pointer);
 	}
-	public static void glGetConvolutionFilter(int target, int format, int type, ByteBuffer image) {
+	public static void glGetConvolutionFilter(int target, int format, int type, IntBuffer image) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(image);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetConvolutionFilter(target, format, type, image, image.position(), function_pointer);
+		nglGetConvolutionFilter(target, format, type, image, image.position() << 2, function_pointer);
+	}
+	public static void glGetConvolutionFilter(int target, int format, int type, ShortBuffer image) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(image);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetConvolutionFilter_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetConvolutionFilter(target, format, type, image, image.position() << 1, function_pointer);
 	}
 	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) {
@@ -907,12 +907,12 @@ public final class ARBImaging {
 	}
 	private static native void nglConvolutionParameterf(int target, int pname, float params, long function_pointer);
 
-	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) {
+	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, height, 1));
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1, function_pointer);
+		nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position(), function_pointer);
 	}
 	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer image) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -921,12 +921,12 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 2, function_pointer);
 	}
-	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image) {
+	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, height, 1));
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position(), function_pointer);
+		nglConvolutionFilter2D(target, internalformat, width, height, format, type, image, image.position() << 1, function_pointer);
 	}
 	private static native void nglConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer image, int image_position, long function_pointer);
 	public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int image_buffer_offset) {
@@ -937,19 +937,12 @@ public final class ARBImaging {
 	}
 	private static native void nglConvolutionFilter2DBO(int target, int internalformat, int width, int height, int format, int type, int image_buffer_offset, long function_pointer);
 
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) {
+	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1));
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 1, function_pointer);
-	}
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1));
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer);
+		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position(), function_pointer);
 	}
 	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -958,12 +951,19 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer);
 	}
-	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image) {
+	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1));
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position(), function_pointer);
+		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 2, function_pointer);
+	}
+	public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(image, GLBufferChecks.calculateImageStorage(image, format, type, width, 1, 1));
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glConvolutionFilter1D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglConvolutionFilter1D(target, internalformat, width, format, type, image, image.position() << 1, function_pointer);
 	}
 	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) {
@@ -990,19 +990,12 @@ public final class ARBImaging {
 	}
 	private static native void nglGetMinmaxParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
 
-	public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) {
+	public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkBuffer(values, 4);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetMinmax(target, reset, format, types, values, values.position() << 1, function_pointer);
-	}
-	public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkBuffer(values, 4);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer);
+		nglGetMinmax(target, reset, format, types, values, values.position(), function_pointer);
 	}
 	public static void glGetMinmax(int target, boolean reset, int format, int types, FloatBuffer values) {
 		GLBufferChecks.ensurePackPBOdisabled();
@@ -1011,12 +1004,19 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer);
 	}
-	public static void glGetMinmax(int target, boolean reset, int format, int types, ByteBuffer values) {
+	public static void glGetMinmax(int target, boolean reset, int format, int types, IntBuffer values) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkBuffer(values, 4);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetMinmax(target, reset, format, types, values, values.position(), function_pointer);
+		nglGetMinmax(target, reset, format, types, values, values.position() << 2, function_pointer);
+	}
+	public static void glGetMinmax(int target, boolean reset, int format, int types, ShortBuffer values) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkBuffer(values, 4);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetMinmax_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetMinmax(target, reset, format, types, values, values.position() << 1, function_pointer);
 	}
 	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) {
@@ -1057,19 +1057,12 @@ public final class ARBImaging {
 	}
 	private static native void nglGetHistogramParameterfv(int target, int pname, FloatBuffer params, int params_position, long function_pointer);
 
-	public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) {
+	public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkBuffer(values, 256);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetHistogram(target, reset, format, type, values, values.position() << 1, function_pointer);
-	}
-	public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkBuffer(values, 256);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer);
+		nglGetHistogram(target, reset, format, type, values, values.position(), function_pointer);
 	}
 	public static void glGetHistogram(int target, boolean reset, int format, int type, FloatBuffer values) {
 		GLBufferChecks.ensurePackPBOdisabled();
@@ -1078,12 +1071,19 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer);
 	}
-	public static void glGetHistogram(int target, boolean reset, int format, int type, ByteBuffer values) {
+	public static void glGetHistogram(int target, boolean reset, int format, int type, IntBuffer values) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkBuffer(values, 256);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetHistogram(target, reset, format, type, values, values.position(), function_pointer);
+		nglGetHistogram(target, reset, format, type, values, values.position() << 2, function_pointer);
+	}
+	public static void glGetHistogram(int target, boolean reset, int format, int type, ShortBuffer values) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkBuffer(values, 256);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetHistogram_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetHistogram(target, reset, format, type, values, values.position() << 1, function_pointer);
 	}
 	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) {
@@ -1138,18 +1138,18 @@ public final class ARBImaging {
 	}
 	private static native void nglGetColorTableParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static void glGetColorTable(int target, int format, int type, FloatBuffer data) {
-		BufferChecks.checkBuffer(data, 256);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetColorTable(target, format, type, data, data.position() << 2, function_pointer);
-	}
 	public static void glGetColorTable(int target, int format, int type, ByteBuffer data) {
 		BufferChecks.checkBuffer(data, 256);
 		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetColorTable(target, format, type, data, data.position(), function_pointer);
 	}
+	public static void glGetColorTable(int target, int format, int type, FloatBuffer data) {
+		BufferChecks.checkBuffer(data, 256);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glGetColorTable_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetColorTable(target, format, type, data, data.position() << 2, function_pointer);
+	}
 	private static native void nglGetColorTable(int target, int format, int type, Buffer data, int data_position, long function_pointer);
 
 	public static void glCopyColorTable(int target, int internalformat, int x, int y, int width) {
@@ -1182,13 +1182,6 @@ public final class ARBImaging {
 	}
 	private static native void nglColorTableParameteriv(int target, int pname, IntBuffer params, int params_position, long function_pointer);
 
-	public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(data, 256);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglColorSubTable(target, start, count, format, type, data, data.position() << 2, function_pointer);
-	}
 	public static void glColorSubTable(int target, int start, int count, int format, int type, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(data, 256);
@@ -1196,6 +1189,13 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglColorSubTable(target, start, count, format, type, data, data.position(), function_pointer);
 	}
+	public static void glColorSubTable(int target, int start, int count, int format, int type, FloatBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(data, 256);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorSubTable_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -1205,13 +1205,6 @@ public final class ARBImaging {
 	}
 	private static native void nglColorSubTableBO(int target, int start, int count, int format, int type, int data_buffer_offset, long function_pointer);
 
-	public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(data, 256);
-		long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglColorTable(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer);
-	}
 	public static void glColorTable(int target, int internalFormat, int width, int format, int type, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(data, 256);
@@ -1219,6 +1212,13 @@ public final class ARBImaging {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglColorTable(target, internalFormat, width, format, type, data, data.position(), function_pointer);
 	}
+	public static void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(data, 256);
+		long function_pointer = GLContext.getCapabilities().ARB_imaging_glColorTable_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOenabled();
diff --git a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java
index b586791a..cf19bf30 100644
--- a/src/java/org/lwjgl/opengl/ARBMatrixPalette.java
+++ b/src/java/org/lwjgl/opengl/ARBMatrixPalette.java
@@ -47,13 +47,6 @@ public final class ARBMatrixPalette {
 	}
 	private static native void nglMatrixIndexubvARB(int size, ByteBuffer pIndices, int pIndices_position, long function_pointer);
 
-	public static void glMatrixIndexPointerARB(int size, int stride, IntBuffer pPointer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexPointerARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_INT, stride, pPointer, pPointer.position() << 2, function_pointer);
-	}
 	public static void glMatrixIndexPointerARB(int size, int stride, ByteBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pPointer);
@@ -61,6 +54,13 @@ public final class ARBMatrixPalette {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_BYTE, stride, pPointer, pPointer.position(), function_pointer);
 	}
+	public static void glMatrixIndexPointerARB(int size, int stride, IntBuffer pPointer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().ARB_matrix_palette_glMatrixIndexPointerARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglMatrixIndexPointerARB(size, GL11.GL_UNSIGNED_INT, stride, pPointer, pPointer.position() << 2, function_pointer);
+	}
 	public static void glMatrixIndexPointerARB(int size, int stride, ShortBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pPointer);
diff --git a/src/java/org/lwjgl/opengl/ARBTextureCompression.java b/src/java/org/lwjgl/opengl/ARBTextureCompression.java
index 17597496..84b8d8d8 100644
--- a/src/java/org/lwjgl/opengl/ARBTextureCompression.java
+++ b/src/java/org/lwjgl/opengl/ARBTextureCompression.java
@@ -24,19 +24,12 @@ public final class ARBTextureCompression {
 
 	static native void initNativeStubs() throws LWJGLException;
 
-	public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) {
+	public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(pImg);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1, function_pointer);
-	}
-	public static void glGetCompressedTexImageARB(int target, int lod, IntBuffer pImg) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(pImg);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
+		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position(), function_pointer);
 	}
 	public static void glGetCompressedTexImageARB(int target, int lod, FloatBuffer pImg) {
 		GLBufferChecks.ensurePackPBOdisabled();
@@ -45,12 +38,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
 	}
-	public static void glGetCompressedTexImageARB(int target, int lod, ByteBuffer pImg) {
+	public static void glGetCompressedTexImageARB(int target, int lod, IntBuffer pImg) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(pImg);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position(), function_pointer);
+		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 2, function_pointer);
+	}
+	public static void glGetCompressedTexImageARB(int target, int lod, ShortBuffer pImg) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(pImg);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glGetCompressedTexImageARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetCompressedTexImageARB(target, lod, pImg, pImg.position() << 1, function_pointer);
 	}
 	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) {
@@ -61,19 +61,12 @@ public final class ARBTextureCompression {
 	}
 	private static native void nglGetCompressedTexImageARBBO(int target, int lod, int pImg_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer pData) {
+	public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 1, function_pointer);
-	}
-	public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer pData) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(pData);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
+		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, 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, FloatBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -82,12 +75,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
 	}
-	public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer pData) {
+	public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position(), function_pointer);
+		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 2, function_pointer);
+	}
+	public static void glCompressedTexSubImage3DARB(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer pData) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(pData);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage3DARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, pData, pData.position() << 1, function_pointer);
 	}
 	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) {
@@ -98,19 +98,12 @@ public final class ARBTextureCompression {
 	}
 	private static native void nglCompressedTexSubImage3DARBBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int pData_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer pData) {
+	public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 1, function_pointer);
-	}
-	public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer pData) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(pData);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
+		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, 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, FloatBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -119,12 +112,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
 	}
-	public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer pData) {
+	public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, IntBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position(), function_pointer);
+		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 2, function_pointer);
+	}
+	public static void glCompressedTexSubImage2DARB(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer pData) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(pData);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage2DARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, format, imageSize, pData, pData.position() << 1, function_pointer);
 	}
 	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) {
@@ -135,19 +135,12 @@ public final class ARBTextureCompression {
 	}
 	private static native void nglCompressedTexSubImage2DARBBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int pData_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer pData) {
+	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 1, function_pointer);
-	}
-	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer pData) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(pData);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
+		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position(), function_pointer);
 	}
 	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -156,12 +149,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
 	}
-	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer pData) {
+	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, IntBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position(), function_pointer);
+		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 2, function_pointer);
+	}
+	public static void glCompressedTexSubImage1DARB(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer pData) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(pData);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexSubImage1DARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexSubImage1DARB(target, level, xoffset, width, format, imageSize, pData, pData.position() << 1, function_pointer);
 	}
 	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) {
@@ -172,19 +172,12 @@ public final class ARBTextureCompression {
 	}
 	private static native void nglCompressedTexSubImage1DARBBO(int target, int level, int xoffset, int width, int format, int imageSize, int pData_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) {
+	public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1, function_pointer);
-	}
-	public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(pData);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
+		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, 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, FloatBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -193,12 +186,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
 	}
-	public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer pData) {
+	public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, IntBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position(), function_pointer);
+		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 2, function_pointer);
+	}
+	public static void glCompressedTexImage3DARB(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer pData) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(pData);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage3DARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData, pData.position() << 1, function_pointer);
 	}
 	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) {
@@ -209,19 +209,12 @@ public final class ARBTextureCompression {
 	}
 	private static native void nglCompressedTexImage3DARBBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int pData_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) {
+	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1, function_pointer);
-	}
-	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(pData);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
+		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position(), function_pointer);
 	}
 	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -230,12 +223,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
 	}
-	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer pData) {
+	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, IntBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position(), function_pointer);
+		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 2, function_pointer);
+	}
+	public static void glCompressedTexImage2DARB(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer pData) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(pData);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage2DARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData, pData.position() << 1, function_pointer);
 	}
 	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) {
@@ -246,19 +246,12 @@ public final class ARBTextureCompression {
 	}
 	private static native void nglCompressedTexImage2DARBBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, int pData_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) {
+	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1, function_pointer);
-	}
-	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(pData);
-		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
+		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position(), function_pointer);
 	}
 	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -267,12 +260,19 @@ public final class ARBTextureCompression {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
 	}
-	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer pData) {
+	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, IntBuffer pData) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(pData);
 		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position(), function_pointer);
+		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 2, function_pointer);
+	}
+	public static void glCompressedTexImage1DARB(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer pData) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(pData);
+		long function_pointer = GLContext.getCapabilities().ARB_texture_compression_glCompressedTexImage1DARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData, pData.position() << 1, function_pointer);
 	}
 	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) {
diff --git a/src/java/org/lwjgl/opengl/ARBVertexBlend.java b/src/java/org/lwjgl/opengl/ARBVertexBlend.java
index 40acffc8..ea58136e 100644
--- a/src/java/org/lwjgl/opengl/ARBVertexBlend.java
+++ b/src/java/org/lwjgl/opengl/ARBVertexBlend.java
@@ -62,13 +62,6 @@ public final class ARBVertexBlend {
 	}
 	private static native void nglVertexBlendARB(int count, long function_pointer);
 
-	public static void glWeightPointerARB(int size, boolean unsigned, int stride, IntBuffer pPointer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pPointer, pPointer.position() << 2, function_pointer);
-	}
 	public static void glWeightPointerARB(int size, int stride, FloatBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pPointer);
@@ -83,6 +76,13 @@ public final class ARBVertexBlend {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pPointer, pPointer.position(), function_pointer);
 	}
+	public static void glWeightPointerARB(int size, boolean unsigned, int stride, IntBuffer pPointer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().ARB_vertex_blend_glWeightPointerARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglWeightPointerARB(size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pPointer, pPointer.position() << 2, function_pointer);
+	}
 	public static void glWeightPointerARB(int size, boolean unsigned, int stride, ShortBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pPointer);
diff --git a/src/java/org/lwjgl/opengl/ARBVertexProgram.java b/src/java/org/lwjgl/opengl/ARBVertexProgram.java
index 438d92fb..6b12efd9 100644
--- a/src/java/org/lwjgl/opengl/ARBVertexProgram.java
+++ b/src/java/org/lwjgl/opengl/ARBVertexProgram.java
@@ -67,13 +67,6 @@ public final class ARBVertexProgram extends ARBProgram {
 	}
 	private static native void nglEnableVertexAttribArrayARB(int index, long function_pointer);
 
-	public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(buffer);
-		long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glVertexAttribPointerARB_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, normalized, stride, buffer, buffer.position() << 2, function_pointer);
-	}
 	public static void glVertexAttribPointerARB(int index, int size, boolean normalized, int stride, FloatBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
@@ -88,6 +81,13 @@ public final class ARBVertexProgram extends ARBProgram {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, normalized, stride, buffer, buffer.position(), function_pointer);
 	}
+	public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(buffer);
+		long function_pointer = GLContext.getCapabilities().ARB_vertex_program_glVertexAttribPointerARB_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglVertexAttribPointerARB(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, normalized, stride, buffer, buffer.position() << 2, function_pointer);
+	}
 	public static void glVertexAttribPointerARB(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
diff --git a/src/java/org/lwjgl/opengl/ATIElementArray.java b/src/java/org/lwjgl/opengl/ATIElementArray.java
index 9dbbbaf4..36b438aa 100644
--- a/src/java/org/lwjgl/opengl/ATIElementArray.java
+++ b/src/java/org/lwjgl/opengl/ATIElementArray.java
@@ -30,12 +30,12 @@ public final class ATIElementArray {
 	}
 	private static native void nglDrawElementArrayATI(int mode, int count, long function_pointer);
 
-	public static void glElementPointerATI(ShortBuffer pPointer) {
+	public static void glElementPointerATI(ByteBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pPointer);
 		long function_pointer = GLContext.getCapabilities().ATI_element_array_glElementPointerATI_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position() << 1, function_pointer);
+		nglElementPointerATI(GL11.GL_UNSIGNED_BYTE, pPointer, pPointer.position(), function_pointer);
 	}
 	public static void glElementPointerATI(IntBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
@@ -44,12 +44,12 @@ public final class ATIElementArray {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglElementPointerATI(GL11.GL_UNSIGNED_INT, pPointer, pPointer.position() << 2, function_pointer);
 	}
-	public static void glElementPointerATI(ByteBuffer pPointer) {
+	public static void glElementPointerATI(ShortBuffer pPointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pPointer);
 		long function_pointer = GLContext.getCapabilities().ATI_element_array_glElementPointerATI_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglElementPointerATI(GL11.GL_UNSIGNED_BYTE, pPointer, pPointer.position(), function_pointer);
+		nglElementPointerATI(GL11.GL_UNSIGNED_SHORT, pPointer, pPointer.position() << 1, function_pointer);
 	}
 	private static native void nglElementPointerATI(int type, Buffer pPointer, int pPointer_position, long function_pointer);
 	public static void glElementPointerATI(int type, int pPointer_buffer_offset) {
diff --git a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java
index 5bbde3f1..cf3e49de 100644
--- a/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java
+++ b/src/java/org/lwjgl/opengl/ATIVertexArrayObject.java
@@ -90,18 +90,6 @@ public final class ATIVertexArrayObject {
 	}
 	private static native void nglGetObjectBufferfvATI(int buffer, int pname, FloatBuffer params, int params_position, long function_pointer);
 
-	public static void glUpdateObjectBufferATI(int buffer, int offset, ShortBuffer pPointer, int preserve) {
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 1), pPointer, pPointer.position() << 1, preserve, function_pointer);
-	}
-	public static void glUpdateObjectBufferATI(int buffer, int offset, IntBuffer pPointer, int preserve) {
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer);
-	}
 	public static void glUpdateObjectBufferATI(int buffer, int offset, ByteBuffer pPointer, int preserve) {
 		BufferChecks.checkDirect(pPointer);
 		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer;
@@ -114,6 +102,18 @@ public final class ATIVertexArrayObject {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer);
 	}
+	public static void glUpdateObjectBufferATI(int buffer, int offset, IntBuffer pPointer, int preserve) {
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 2), pPointer, pPointer.position() << 2, preserve, function_pointer);
+	}
+	public static void glUpdateObjectBufferATI(int buffer, int offset, ShortBuffer pPointer, int preserve) {
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glUpdateObjectBufferATI_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglUpdateObjectBufferATI(buffer, offset, (pPointer.remaining() << 1), pPointer, pPointer.position() << 1, preserve, function_pointer);
+	}
 	private static native void nglUpdateObjectBufferATI(int buffer, int offset, int size, Buffer pPointer, int pPointer_position, int preserve, long function_pointer);
 
 	public static boolean glIsObjectBufferATI(int buffer) {
@@ -130,20 +130,6 @@ public final class ATIVertexArrayObject {
 		int __result = nglNewObjectBufferATI(size, null, 0, usage, function_pointer);
 		return __result;
 	}
-	public static int glNewObjectBufferATI(ShortBuffer pPointer, int usage) {
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		int __result = nglNewObjectBufferATI((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, usage, function_pointer);
-		return __result;
-	}
-	public static int glNewObjectBufferATI(IntBuffer pPointer, int usage) {
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer);
-		return __result;
-	}
 	public static int glNewObjectBufferATI(ByteBuffer pPointer, int usage) {
 		BufferChecks.checkDirect(pPointer);
 		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer;
@@ -158,5 +144,19 @@ public final class ATIVertexArrayObject {
 		int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer);
 		return __result;
 	}
+	public static int glNewObjectBufferATI(IntBuffer pPointer, int usage) {
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		int __result = nglNewObjectBufferATI((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, usage, function_pointer);
+		return __result;
+	}
+	public static int glNewObjectBufferATI(ShortBuffer pPointer, int usage) {
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().ATI_vertex_array_object_glNewObjectBufferATI_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		int __result = nglNewObjectBufferATI((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, usage, function_pointer);
+		return __result;
+	}
 	private static native int nglNewObjectBufferATI(int size, Buffer pPointer, int pPointer_position, int usage, long function_pointer);
 }
diff --git a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java
index 88c687d5..991c665e 100644
--- a/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java
+++ b/src/java/org/lwjgl/opengl/EXTDrawRangeElements.java
@@ -15,6 +15,13 @@ public final class EXTDrawRangeElements {
 
 	static native void initNativeStubs() throws LWJGLException;
 
+	public static void glDrawRangeElementsEXT(int mode, int start, int end, ByteBuffer pIndices) {
+		GLBufferChecks.ensureElementVBOdisabled();
+		BufferChecks.checkDirect(pIndices);
+		long function_pointer = GLContext.getCapabilities().EXT_draw_range_elements_glDrawRangeElementsEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_BYTE, pIndices, pIndices.position(), function_pointer);
+	}
 	public static void glDrawRangeElementsEXT(int mode, int start, int end, IntBuffer pIndices) {
 		GLBufferChecks.ensureElementVBOdisabled();
 		BufferChecks.checkDirect(pIndices);
@@ -29,13 +36,6 @@ public final class EXTDrawRangeElements {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_SHORT, pIndices, pIndices.position() << 1, function_pointer);
 	}
-	public static void glDrawRangeElementsEXT(int mode, int start, int end, ByteBuffer pIndices) {
-		GLBufferChecks.ensureElementVBOdisabled();
-		BufferChecks.checkDirect(pIndices);
-		long function_pointer = GLContext.getCapabilities().EXT_draw_range_elements_glDrawRangeElementsEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglDrawRangeElementsEXT(mode, start, end, (pIndices.remaining()), GL11.GL_UNSIGNED_BYTE, pIndices, pIndices.position(), 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) {
 		GLBufferChecks.ensureElementVBOenabled();
diff --git a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java b/src/java/org/lwjgl/opengl/EXTPalettedTexture.java
index 970e5ca8..46829c35 100644
--- a/src/java/org/lwjgl/opengl/EXTPalettedTexture.java
+++ b/src/java/org/lwjgl/opengl/EXTPalettedTexture.java
@@ -50,12 +50,6 @@ public final class EXTPalettedTexture {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetColorTableEXT(target, format, type, data, data.position(), function_pointer);
 	}
-	public static void glGetColorTableEXT(int target, int format, int type, ShortBuffer data) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetColorTableEXT(target, format, type, data, data.position() << 1, function_pointer);
-	}
 	public static void glGetColorTableEXT(int target, int format, int type, FloatBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableEXT_pointer;
@@ -68,6 +62,12 @@ public final class EXTPalettedTexture {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetColorTableEXT(target, format, type, data, data.position() << 2, function_pointer);
 	}
+	public static void glGetColorTableEXT(int target, int format, int type, ShortBuffer data) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glGetColorTableEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetColorTableEXT(target, format, type, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglGetColorTableEXT(int target, int format, int type, Buffer data, int data_position, long function_pointer);
 
 	public static void glColorSubTableEXT(int target, int start, int count, int format, int type, ByteBuffer data) {
@@ -76,12 +76,6 @@ public final class EXTPalettedTexture {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglColorSubTableEXT(target, start, count, format, type, data, data.position(), function_pointer);
 	}
-	public static void glColorSubTableEXT(int target, int start, int count, int format, int type, ShortBuffer data) {
-		BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1));
-		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorSubTableEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglColorSubTableEXT(target, start, count, format, type, data, data.position() << 1, function_pointer);
-	}
 	public static void glColorSubTableEXT(int target, int start, int count, int format, int type, FloatBuffer data) {
 		BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1));
 		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorSubTableEXT_pointer;
@@ -94,6 +88,12 @@ public final class EXTPalettedTexture {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglColorSubTableEXT(target, start, count, format, type, data, data.position() << 2, function_pointer);
 	}
+	public static void glColorSubTableEXT(int target, int start, int count, int format, int type, ShortBuffer data) {
+		BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, count, 1, 1));
+		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorSubTableEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglColorSubTableEXT(target, start, count, format, type, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglColorSubTableEXT(int target, int start, int count, int format, int type, Buffer data, int data_position, long function_pointer);
 
 	public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, ByteBuffer data) {
@@ -102,12 +102,6 @@ public final class EXTPalettedTexture {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglColorTableEXT(target, internalFormat, width, format, type, data, data.position(), function_pointer);
 	}
-	public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, ShortBuffer data) {
-		BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1));
-		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorTableEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglColorTableEXT(target, internalFormat, width, format, type, data, data.position() << 1, function_pointer);
-	}
 	public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, FloatBuffer data) {
 		BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1));
 		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorTableEXT_pointer;
@@ -120,5 +114,11 @@ public final class EXTPalettedTexture {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglColorTableEXT(target, internalFormat, width, format, type, data, data.position() << 2, function_pointer);
 	}
+	public static void glColorTableEXT(int target, int internalFormat, int width, int format, int type, ShortBuffer data) {
+		BufferChecks.checkBuffer(data, GLBufferChecks.calculateImageStorage(data, format, type, width, 1, 1));
+		long function_pointer = GLContext.getCapabilities().EXT_paletted_texture_glColorTableEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglColorTableEXT(target, internalFormat, width, format, type, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglColorTableEXT(int target, int internalFormat, int width, int format, int type, Buffer data, int data_position, long function_pointer);
 }
diff --git a/src/java/org/lwjgl/opengl/EXTVertexShader.java b/src/java/org/lwjgl/opengl/EXTVertexShader.java
index fc4be5ea..a0bd99dc 100644
--- a/src/java/org/lwjgl/opengl/EXTVertexShader.java
+++ b/src/java/org/lwjgl/opengl/EXTVertexShader.java
@@ -265,20 +265,6 @@ public final class EXTVertexShader {
 	}
 	private static native void nglEnableVariantClientStateEXT(int id, long function_pointer);
 
-	public static void glVariantPointerEXT(int id, boolean unsigned, int stride, IntBuffer pAddr) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(pAddr);
-		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pAddr, pAddr.position() << 2, function_pointer);
-	}
-	public static void glVariantPointerEXT(int id, boolean unsigned, int stride, ShortBuffer pAddr) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(pAddr);
-		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1, function_pointer);
-	}
 	public static void glVariantPointerEXT(int id, int stride, FloatBuffer pAddr) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pAddr);
@@ -293,6 +279,20 @@ public final class EXTVertexShader {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, stride, pAddr, pAddr.position(), function_pointer);
 	}
+	public static void glVariantPointerEXT(int id, boolean unsigned, int stride, IntBuffer pAddr) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(pAddr);
+		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, stride, pAddr, pAddr.position() << 2, function_pointer);
+	}
+	public static void glVariantPointerEXT(int id, boolean unsigned, int stride, ShortBuffer pAddr) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(pAddr);
+		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glVariantPointerEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglVariantPointerEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, stride, pAddr, pAddr.position() << 1, function_pointer);
+	}
 	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) {
 		GLBufferChecks.ensureArrayVBOenabled();
@@ -358,18 +358,6 @@ public final class EXTVertexShader {
 	}
 	private static native void nglVariantbvEXT(int id, ByteBuffer pAddr, int pAddr_position, long function_pointer);
 
-	public static void glSetLocalConstantEXT(int id, boolean unsigned, IntBuffer pAddr) {
-		BufferChecks.checkBuffer(pAddr, 4);
-		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2, function_pointer);
-	}
-	public static void glSetLocalConstantEXT(int id, boolean unsigned, ShortBuffer pAddr) {
-		BufferChecks.checkBuffer(pAddr, 4);
-		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer);
-	}
 	public static void glSetLocalConstantEXT(int id, FloatBuffer pAddr) {
 		BufferChecks.checkBuffer(pAddr, 4);
 		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer;
@@ -382,20 +370,20 @@ public final class EXTVertexShader {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, pAddr, pAddr.position(), function_pointer);
 	}
+	public static void glSetLocalConstantEXT(int id, boolean unsigned, IntBuffer pAddr) {
+		BufferChecks.checkBuffer(pAddr, 4);
+		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2, function_pointer);
+	}
+	public static void glSetLocalConstantEXT(int id, boolean unsigned, ShortBuffer pAddr) {
+		BufferChecks.checkBuffer(pAddr, 4);
+		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetLocalConstantEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSetLocalConstantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer);
+	}
 	private static native void nglSetLocalConstantEXT(int id, int type, Buffer pAddr, int pAddr_position, long function_pointer);
 
-	public static void glSetInvariantEXT(int id, boolean unsigned, IntBuffer pAddr) {
-		BufferChecks.checkBuffer(pAddr, 4);
-		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2, function_pointer);
-	}
-	public static void glSetInvariantEXT(int id, boolean unsigned, ShortBuffer pAddr) {
-		BufferChecks.checkBuffer(pAddr, 4);
-		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer);
-	}
 	public static void glSetInvariantEXT(int id, FloatBuffer pAddr) {
 		BufferChecks.checkBuffer(pAddr, 4);
 		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer;
@@ -408,6 +396,18 @@ public final class EXTVertexShader {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, pAddr, pAddr.position(), function_pointer);
 	}
+	public static void glSetInvariantEXT(int id, boolean unsigned, IntBuffer pAddr) {
+		BufferChecks.checkBuffer(pAddr, 4);
+		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, pAddr, pAddr.position() << 2, function_pointer);
+	}
+	public static void glSetInvariantEXT(int id, boolean unsigned, ShortBuffer pAddr) {
+		BufferChecks.checkBuffer(pAddr, 4);
+		long function_pointer = GLContext.getCapabilities().EXT_vertex_shader_glSetInvariantEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglSetInvariantEXT(id, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, pAddr, pAddr.position() << 1, function_pointer);
+	}
 	private static native void nglSetInvariantEXT(int id, int type, Buffer pAddr, int pAddr_position, long function_pointer);
 
 	public static int glGenSymbolsEXT(int dataType, int storageType, int range, int components) {
diff --git a/src/java/org/lwjgl/opengl/GL11.java b/src/java/org/lwjgl/opengl/GL11.java
index 11ba0d2c..bfb371e7 100644
--- a/src/java/org/lwjgl/opengl/GL11.java
+++ b/src/java/org/lwjgl/opengl/GL11.java
@@ -700,13 +700,6 @@ public final class GL11 {
 	}
 	private static native void nglTexParameterf(int target, int pname, float param, long function_pointer);
 
-	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, FloatBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
-		long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 2, function_pointer);
-	}
 	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ByteBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
@@ -714,12 +707,12 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position(), function_pointer);
 	}
-	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels) {
+	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, FloatBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
 		long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 1, function_pointer);
+		nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
 	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -728,6 +721,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
+	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
+		long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels, pixels.position() << 1, function_pointer);
+	}
 	private static native void nglTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, Buffer pixels, int pixels_position, long function_pointer);
 	public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -737,13 +737,6 @@ public final class GL11 {
 	}
 	private static native void nglTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int pixels_buffer_offset, long function_pointer);
 
-	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, FloatBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1));
-		long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 2, function_pointer);
-	}
 	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ByteBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1));
@@ -751,12 +744,12 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position(), function_pointer);
 	}
-	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ShortBuffer pixels) {
+	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, FloatBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1));
 		long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 1, function_pointer);
+		nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
 	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -765,6 +758,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
+	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, 1, 1));
+		long function_pointer = GLContext.getCapabilities().GL11_glTexSubImage1D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglTexSubImage1D(target, level, xoffset, width, format, type, pixels, pixels.position() << 1, function_pointer);
+	}
 	private static native void nglTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, Buffer pixels, int pixels_position, long function_pointer);
 	public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -774,14 +774,6 @@ public final class GL11 {
 	}
 	private static native void nglTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int type, int pixels_buffer_offset, long function_pointer);
 
-	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, FloatBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		if (pixels != null)
-			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border));
-		long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
-	}
 	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ByteBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		if (pixels != null)
@@ -790,13 +782,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() : 0, function_pointer);
 	}
-	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) {
+	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, FloatBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		if (pixels != null)
 			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border));
 		long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer);
+		nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
 	}
 	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -806,6 +798,14 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
 	}
+	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		if (pixels != null)
+			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage2DStorage(pixels, format, type, width, height, border));
+		long function_pointer = GLContext.getCapabilities().GL11_glTexImage2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglTexImage2D(target, level, internalformat, width, height, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer);
+	}
 	private static native void nglTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer);
 	public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -815,14 +815,6 @@ public final class GL11 {
 	}
 	private static native void nglTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int format, int type, int pixels_buffer_offset, long function_pointer);
 
-	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, FloatBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		if (pixels != null)
-			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border));
-		long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
-	}
 	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ByteBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		if (pixels != null)
@@ -831,13 +823,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() : 0, function_pointer);
 	}
-	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels) {
+	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, FloatBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		if (pixels != null)
 			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border));
 		long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer);
+		nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
 	}
 	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -847,6 +839,14 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
 	}
+	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		if (pixels != null)
+			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage1DStorage(pixels, format, type, width, border));
+		long function_pointer = GLContext.getCapabilities().GL11_glTexImage1D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglTexImage1D(target, level, internalformat, width, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer);
+	}
 	private static native void nglTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer);
 	public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int pixels_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -1049,13 +1049,6 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglReadPixels(x, y, width, height, format, type, pixels, pixels.position(), function_pointer);
 	}
-	public static void glReadPixels(int x, int y, int width, int height, int format, int type, ShortBuffer pixels) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
-		long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 1, function_pointer);
-	}
 	public static void glReadPixels(int x, int y, int width, int height, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
@@ -1063,6 +1056,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
+	public static void glReadPixels(int x, int y, int width, int height, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
+		long function_pointer = GLContext.getCapabilities().GL11_glReadPixels_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglReadPixels(x, y, width, height, format, type, pixels, pixels.position() << 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) {
 		GLBufferChecks.ensurePackPBOenabled();
@@ -1173,13 +1173,6 @@ public final class GL11 {
 	}
 	private static native void nglNormal3b(byte nx, byte ny, byte nz, long function_pointer);
 
-	public static void glNormalPointer(int stride, FloatBuffer pointer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(pointer);
-		long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglNormalPointer(GL11.GL_FLOAT, stride, pointer, pointer.position() << 2, function_pointer);
-	}
 	public static void glNormalPointer(int stride, ByteBuffer pointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pointer);
@@ -1187,6 +1180,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglNormalPointer(GL11.GL_BYTE, stride, pointer, pointer.position(), function_pointer);
 	}
+	public static void glNormalPointer(int stride, FloatBuffer pointer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(pointer);
+		long function_pointer = GLContext.getCapabilities().GL11_glNormalPointer_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglNormalPointer(GL11.GL_FLOAT, stride, pointer, pointer.position() << 2, function_pointer);
+	}
 	public static void glNormalPointer(int stride, IntBuffer pointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pointer);
@@ -1593,13 +1593,6 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetTexImage(target, level, format, type, pixels, pixels.position(), function_pointer);
 	}
-	public static void glGetTexImage(int target, int level, int format, int type, ShortBuffer pixels) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1));
-		long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetTexImage(target, level, format, type, pixels, pixels.position() << 1, function_pointer);
-	}
 	public static void glGetTexImage(int target, int level, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1));
@@ -1607,6 +1600,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetTexImage(target, level, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
+	public static void glGetTexImage(int target, int level, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, 1, 1, 1));
+		long function_pointer = GLContext.getCapabilities().GL11_glGetTexImage_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetTexImage(target, level, format, type, pixels, pixels.position() << 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) {
 		GLBufferChecks.ensurePackPBOenabled();
@@ -1662,13 +1662,6 @@ public final class GL11 {
 	}
 	private static native void nglInitNames(long function_pointer);
 
-	public static void glInterleavedArrays(int format, int stride, FloatBuffer pointer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(pointer);
-		long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglInterleavedArrays(format, stride, pointer, pointer.position() << 2, function_pointer);
-	}
 	public static void glInterleavedArrays(int format, int stride, ByteBuffer pointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pointer);
@@ -1676,12 +1669,12 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglInterleavedArrays(format, stride, pointer, pointer.position(), function_pointer);
 	}
-	public static void glInterleavedArrays(int format, int stride, ShortBuffer pointer) {
+	public static void glInterleavedArrays(int format, int stride, FloatBuffer pointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(pointer);
 		long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglInterleavedArrays(format, stride, pointer, pointer.position() << 1, function_pointer);
+		nglInterleavedArrays(format, stride, pointer, pointer.position() << 2, function_pointer);
 	}
 	public static void glInterleavedArrays(int format, int stride, IntBuffer pointer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
@@ -1690,6 +1683,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglInterleavedArrays(format, stride, pointer, pointer.position() << 2, function_pointer);
 	}
+	public static void glInterleavedArrays(int format, int stride, ShortBuffer pointer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(pointer);
+		long function_pointer = GLContext.getCapabilities().GL11_glInterleavedArrays_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglInterleavedArrays(format, stride, pointer, pointer.position() << 1, function_pointer);
+	}
 	private static native void nglInterleavedArrays(int format, int stride, Buffer pointer, int pointer_position, long function_pointer);
 	public static void glInterleavedArrays(int format, int stride, int pointer_buffer_offset) {
 		GLBufferChecks.ensureArrayVBOenabled();
@@ -1976,12 +1976,12 @@ public final class GL11 {
 	}
 	private static native void nglDrawBuffer(int mode, long function_pointer);
 
-	public static void glDrawElements(int mode, ShortBuffer indices) {
+	public static void glDrawElements(int mode, ByteBuffer indices) {
 		GLBufferChecks.ensureElementVBOdisabled();
 		BufferChecks.checkDirect(indices);
 		long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer);
+		nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_BYTE, indices, indices.position(), function_pointer);
 	}
 	public static void glDrawElements(int mode, IntBuffer indices) {
 		GLBufferChecks.ensureElementVBOdisabled();
@@ -1990,12 +1990,12 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_INT, indices, indices.position() << 2, function_pointer);
 	}
-	public static void glDrawElements(int mode, ByteBuffer indices) {
+	public static void glDrawElements(int mode, ShortBuffer indices) {
 		GLBufferChecks.ensureElementVBOdisabled();
 		BufferChecks.checkDirect(indices);
 		long function_pointer = GLContext.getCapabilities().GL11_glDrawElements_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglDrawElements(mode, (indices.remaining()), GL11.GL_UNSIGNED_BYTE, indices, indices.position(), function_pointer);
+		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) {
@@ -2013,13 +2013,6 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglDrawPixels(width, height, format, type, pixels, pixels.position(), function_pointer);
 	}
-	public static void glDrawPixels(int width, int height, int format, int type, ShortBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
-		long function_pointer = GLContext.getCapabilities().GL11_glDrawPixels_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglDrawPixels(width, height, format, type, pixels, pixels.position() << 1, function_pointer);
-	}
 	public static void glDrawPixels(int width, int height, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
@@ -2027,6 +2020,13 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglDrawPixels(width, height, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
+	public static void glDrawPixels(int width, int height, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, 1));
+		long function_pointer = GLContext.getCapabilities().GL11_glDrawPixels_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglDrawPixels(width, height, format, type, pixels, pixels.position() << 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) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -2352,11 +2352,11 @@ public final class GL11 {
 	}
 	private static native void nglCallList(int list, long function_pointer);
 
-	public static void glCallLists(ShortBuffer lists) {
+	public static void glCallLists(ByteBuffer lists) {
 		BufferChecks.checkDirect(lists);
 		long function_pointer = GLContext.getCapabilities().GL11_glCallLists_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_SHORT, lists, lists.position() << 1, function_pointer);
+		nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_BYTE, lists, lists.position(), function_pointer);
 	}
 	public static void glCallLists(IntBuffer lists) {
 		BufferChecks.checkDirect(lists);
@@ -2364,11 +2364,11 @@ public final class GL11 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_INT, lists, lists.position() << 2, function_pointer);
 	}
-	public static void glCallLists(ByteBuffer lists) {
+	public static void glCallLists(ShortBuffer lists) {
 		BufferChecks.checkDirect(lists);
 		long function_pointer = GLContext.getCapabilities().GL11_glCallLists_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_BYTE, lists, lists.position(), function_pointer);
+		nglCallLists((lists.remaining()), GL11.GL_UNSIGNED_SHORT, lists, lists.position() << 1, function_pointer);
 	}
 	private static native void nglCallLists(int n, int type, Buffer lists, int lists_position, long function_pointer);
 
diff --git a/src/java/org/lwjgl/opengl/GL12.java b/src/java/org/lwjgl/opengl/GL12.java
index a39f93a8..03f63414 100644
--- a/src/java/org/lwjgl/opengl/GL12.java
+++ b/src/java/org/lwjgl/opengl/GL12.java
@@ -57,13 +57,6 @@ public final class GL12 {
 	}
 	private static native void nglCopyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height, long function_pointer);
 
-	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, FloatBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth));
-		long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 2, function_pointer);
-	}
 	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ByteBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth));
@@ -71,12 +64,12 @@ public final class GL12 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position(), function_pointer);
 	}
-	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels) {
+	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, FloatBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth));
 		long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 1, function_pointer);
+		nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
 	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -85,6 +78,13 @@ public final class GL12 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 2, function_pointer);
 	}
+	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateImageStorage(pixels, format, type, width, height, depth));
+		long function_pointer = GLContext.getCapabilities().GL12_glTexSubImage3D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, pixels.position() << 1, function_pointer);
+	}
 	private static native void nglTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, Buffer pixels, int pixels_position, long function_pointer);
 	public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int pixels_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -94,14 +94,6 @@ public final class GL12 {
 	}
 	private static native void nglTexSubImage3DBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int pixels_buffer_offset, long function_pointer);
 
-	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, FloatBuffer pixels) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		if (pixels != null)
-			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border));
-		long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
-	}
 	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ByteBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		if (pixels != null)
@@ -110,13 +102,13 @@ public final class GL12 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() : 0, function_pointer);
 	}
-	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels) {
+	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, FloatBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		if (pixels != null)
 			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border));
 		long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer);
+		nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
 	}
 	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, IntBuffer pixels) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -126,6 +118,14 @@ public final class GL12 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 2 : 0, function_pointer);
 	}
+	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		if (pixels != null)
+			BufferChecks.checkBuffer(pixels, GLBufferChecks.calculateTexImage3DStorage(pixels, format, type, width, height, depth, border));
+		long function_pointer = GLContext.getCapabilities().GL12_glTexImage3D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels, pixels != null ? pixels.position() << 1 : 0, function_pointer);
+	}
 	private static native void nglTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, Buffer pixels, int pixels_position, long function_pointer);
 	public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int pixels_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -135,12 +135,12 @@ public final class GL12 {
 	}
 	private static native void nglTexImage3DBO(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int pixels_buffer_offset, long function_pointer);
 
-	public static void glDrawRangeElements(int mode, int start, int end, ShortBuffer indices) {
+	public static void glDrawRangeElements(int mode, int start, int end, ByteBuffer indices) {
 		GLBufferChecks.ensureElementVBOdisabled();
 		BufferChecks.checkDirect(indices);
 		long function_pointer = GLContext.getCapabilities().GL12_glDrawRangeElements_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_SHORT, indices, indices.position() << 1, function_pointer);
+		nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_BYTE, indices, indices.position(), function_pointer);
 	}
 	public static void glDrawRangeElements(int mode, int start, int end, IntBuffer indices) {
 		GLBufferChecks.ensureElementVBOdisabled();
@@ -149,12 +149,12 @@ public final class GL12 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_INT, indices, indices.position() << 2, function_pointer);
 	}
-	public static void glDrawRangeElements(int mode, int start, int end, ByteBuffer indices) {
+	public static void glDrawRangeElements(int mode, int start, int end, ShortBuffer indices) {
 		GLBufferChecks.ensureElementVBOdisabled();
 		BufferChecks.checkDirect(indices);
 		long function_pointer = GLContext.getCapabilities().GL12_glDrawRangeElements_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglDrawRangeElements(mode, start, end, (indices.remaining()), GL11.GL_UNSIGNED_BYTE, indices, indices.position(), function_pointer);
+		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) {
diff --git a/src/java/org/lwjgl/opengl/GL13.java b/src/java/org/lwjgl/opengl/GL13.java
index 18bf6810..bbbe84df 100644
--- a/src/java/org/lwjgl/opengl/GL13.java
+++ b/src/java/org/lwjgl/opengl/GL13.java
@@ -167,13 +167,6 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetCompressedTexImage(target, lod, img, img.position(), function_pointer);
 	}
-	public static void glGetCompressedTexImage(int target, int lod, ShortBuffer img) {
-		GLBufferChecks.ensurePackPBOdisabled();
-		BufferChecks.checkDirect(img);
-		long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetCompressedTexImage(target, lod, img, img.position() << 1, function_pointer);
-	}
 	public static void glGetCompressedTexImage(int target, int lod, IntBuffer img) {
 		GLBufferChecks.ensurePackPBOdisabled();
 		BufferChecks.checkDirect(img);
@@ -181,6 +174,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetCompressedTexImage(target, lod, img, img.position() << 2, function_pointer);
 	}
+	public static void glGetCompressedTexImage(int target, int lod, ShortBuffer img) {
+		GLBufferChecks.ensurePackPBOdisabled();
+		BufferChecks.checkDirect(img);
+		long function_pointer = GLContext.getCapabilities().GL13_glGetCompressedTexImage_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		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) {
 		GLBufferChecks.ensurePackPBOenabled();
@@ -190,13 +190,6 @@ public final class GL13 {
 	}
 	private static native void nglGetCompressedTexImageBO(int target, int lod, int img_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer);
-	}
 	public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
@@ -204,12 +197,12 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position(), function_pointer);
 	}
-	public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) {
+	public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -218,6 +211,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 2, function_pointer);
 	}
+	public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage3D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, Buffer data, int data_position, long function_pointer);
 	public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -227,13 +227,6 @@ public final class GL13 {
 	}
 	private static native void nglCompressedTexSubImage3DBO(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer);
-	}
 	public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
@@ -241,12 +234,12 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position(), function_pointer);
 	}
-	public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) {
+	public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -255,6 +248,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 2, function_pointer);
 	}
+	public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, Buffer data, int data_position, long function_pointer);
 	public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -264,13 +264,6 @@ public final class GL13 {
 	}
 	private static native void nglCompressedTexSubImage2DBO(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer);
-	}
 	public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
@@ -278,12 +271,12 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position(), function_pointer);
 	}
-	public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) {
+	public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, FloatBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -292,6 +285,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 2, function_pointer);
 	}
+	public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexSubImage1D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, Buffer data, int data_position, long function_pointer);
 	public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -301,13 +301,6 @@ public final class GL13 {
 	}
 	private static native void nglCompressedTexSubImage1DBO(int target, int level, int xoffset, int width, int format, int imageSize, int data_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer);
-	}
 	public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
@@ -315,12 +308,12 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position(), function_pointer);
 	}
-	public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) {
+	public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, FloatBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -329,6 +322,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 2, function_pointer);
 	}
+	public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage3D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, Buffer data, int data_position, long function_pointer);
 	public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -338,13 +338,6 @@ public final class GL13 {
 	}
 	private static native void nglCompressedTexImage3DBO(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer);
-	}
 	public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
@@ -352,12 +345,12 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position(), function_pointer);
 	}
-	public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) {
+	public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, FloatBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -366,6 +359,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 2, function_pointer);
 	}
+	public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage2D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, Buffer data, int data_position, long function_pointer);
 	public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
@@ -375,13 +375,6 @@ public final class GL13 {
 	}
 	private static native void nglCompressedTexImage2DBO(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data_buffer_offset, long function_pointer);
 
-	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) {
-		GLBufferChecks.ensureUnpackPBOdisabled();
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer);
-	}
 	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ByteBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
@@ -389,12 +382,12 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position(), function_pointer);
 	}
-	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) {
+	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, FloatBuffer data) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, function_pointer);
+		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) {
 		GLBufferChecks.ensureUnpackPBOdisabled();
@@ -403,6 +396,13 @@ public final class GL13 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 2, function_pointer);
 	}
+	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data) {
+		GLBufferChecks.ensureUnpackPBOdisabled();
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL13_glCompressedTexImage1D_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglCompressedTexImage1D(target, level, internalformat, width, border, imageSize, data, data.position() << 1, function_pointer);
+	}
 	private static native void nglCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, Buffer data, int data_position, long function_pointer);
 	public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int data_buffer_offset) {
 		GLBufferChecks.ensureUnpackPBOenabled();
diff --git a/src/java/org/lwjgl/opengl/GL15.java b/src/java/org/lwjgl/opengl/GL15.java
index 2a2c6a5d..9e080119 100644
--- a/src/java/org/lwjgl/opengl/GL15.java
+++ b/src/java/org/lwjgl/opengl/GL15.java
@@ -158,23 +158,17 @@ public final class GL15 {
 	}
 	private static native java.nio.ByteBuffer nglMapBuffer(int target, int access, int result_size, java.nio.ByteBuffer old_buffer, long function_pointer);
 
-	public static void glGetBufferSubData(int target, int offset, FloatBuffer data) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
-	}
 	public static void glGetBufferSubData(int target, int offset, ByteBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer);
 	}
-	public static void glGetBufferSubData(int target, int offset, ShortBuffer data) {
+	public static void glGetBufferSubData(int target, int offset, FloatBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglGetBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
+		nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
 	public static void glGetBufferSubData(int target, int offset, IntBuffer data) {
 		BufferChecks.checkDirect(data);
@@ -182,25 +176,25 @@ public final class GL15 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglGetBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
+	public static void glGetBufferSubData(int target, int offset, ShortBuffer data) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL15_glGetBufferSubData_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglGetBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
+	}
 	private static native void nglGetBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer);
 
-	public static void glBufferSubData(int target, int offset, FloatBuffer data) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
-	}
 	public static void glBufferSubData(int target, int offset, ByteBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferSubData(target, offset, (data.remaining()), data, data.position(), function_pointer);
 	}
-	public static void glBufferSubData(int target, int offset, ShortBuffer data) {
+	public static void glBufferSubData(int target, int offset, FloatBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
+		nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
 	public static void glBufferSubData(int target, int offset, IntBuffer data) {
 		BufferChecks.checkDirect(data);
@@ -208,6 +202,12 @@ public final class GL15 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferSubData(target, offset, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
+	public static void glBufferSubData(int target, int offset, ShortBuffer data) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL15_glBufferSubData_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBufferSubData(target, offset, (data.remaining() << 1), data, data.position() << 1, function_pointer);
+	}
 	private static native void nglBufferSubData(int target, int offset, int size, Buffer data, int data_position, long function_pointer);
 
 	public static void glBufferData(int target, int size, int usage) {
@@ -215,23 +215,17 @@ public final class GL15 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferData(target, size, null, 0, usage, function_pointer);
 	}
-	public static void glBufferData(int target, FloatBuffer data, int usage) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferData(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
-	}
 	public static void glBufferData(int target, ByteBuffer data, int usage) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferData(target, (data.remaining()), data, data.position(), usage, function_pointer);
 	}
-	public static void glBufferData(int target, ShortBuffer data, int usage) {
+	public static void glBufferData(int target, FloatBuffer data, int usage) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBufferData(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer);
+		nglBufferData(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
 	}
 	public static void glBufferData(int target, IntBuffer data, int usage) {
 		BufferChecks.checkDirect(data);
@@ -239,6 +233,12 @@ public final class GL15 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglBufferData(target, (data.remaining() << 2), data, data.position() << 2, usage, function_pointer);
 	}
+	public static void glBufferData(int target, ShortBuffer data, int usage) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().GL15_glBufferData_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglBufferData(target, (data.remaining() << 1), data, data.position() << 1, usage, function_pointer);
+	}
 	private static native void nglBufferData(int target, int size, Buffer data, int data_position, int usage, long function_pointer);
 
 	public static boolean glIsBuffer(int buffer) {
diff --git a/src/java/org/lwjgl/opengl/GL20.java b/src/java/org/lwjgl/opengl/GL20.java
index f371f59a..5377db5d 100644
--- a/src/java/org/lwjgl/opengl/GL20.java
+++ b/src/java/org/lwjgl/opengl/GL20.java
@@ -203,13 +203,6 @@ public final class GL20 {
 	}
 	private static native void nglEnableVertexAttribArray(int index, long function_pointer);
 
-	public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(buffer);
-		long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_SHORT : GL11.GL_SHORT, normalized, stride, buffer, buffer.position() << 1, function_pointer);
-	}
 	public static void glVertexAttribPointer(int index, int size, boolean normalized, int stride, FloatBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
@@ -217,6 +210,13 @@ public final class GL20 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVertexAttribPointer(index, size, GL11.GL_FLOAT, normalized, stride, buffer, buffer.position() << 2, function_pointer);
 	}
+	public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(buffer);
+		long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, normalized, stride, buffer, buffer.position(), function_pointer);
+	}
 	public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, IntBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
@@ -224,12 +224,12 @@ public final class GL20 {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_INT : GL11.GL_INT, normalized, stride, buffer, buffer.position() << 2, function_pointer);
 	}
-	public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, ByteBuffer buffer) {
+	public static void glVertexAttribPointer(int index, int size, boolean unsigned, boolean normalized, int stride, ShortBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
 		long function_pointer = GLContext.getCapabilities().GL20_glVertexAttribPointer_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVertexAttribPointer(index, size, unsigned ? GL11.GL_UNSIGNED_BYTE : GL11.GL_BYTE, normalized, stride, buffer, buffer.position(), function_pointer);
+		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) {
diff --git a/src/java/org/lwjgl/opengl/NVPixelDataRange.java b/src/java/org/lwjgl/opengl/NVPixelDataRange.java
index ce6597c7..b99b44e1 100644
--- a/src/java/org/lwjgl/opengl/NVPixelDataRange.java
+++ b/src/java/org/lwjgl/opengl/NVPixelDataRange.java
@@ -26,12 +26,6 @@ public final class NVPixelDataRange {
 	}
 	private static native void nglFlushPixelDataRangeNV(int target, long function_pointer);
 
-	public static void glPixelDataRangeNV(int target, ShortBuffer data) {
-		BufferChecks.checkDirect(data);
-		long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglPixelDataRangeNV(target, (data.remaining() << 1), data, data.position() << 1, function_pointer);
-	}
 	public static void glPixelDataRangeNV(int target, ByteBuffer data) {
 		BufferChecks.checkDirect(data);
 		long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer;
@@ -50,5 +44,11 @@ public final class NVPixelDataRange {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglPixelDataRangeNV(target, (data.remaining() << 2), data, data.position() << 2, function_pointer);
 	}
+	public static void glPixelDataRangeNV(int target, ShortBuffer data) {
+		BufferChecks.checkDirect(data);
+		long function_pointer = GLContext.getCapabilities().NV_pixel_data_range_glPixelDataRangeNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglPixelDataRangeNV(target, (data.remaining() << 1), data, data.position() << 1, function_pointer);
+	}
 	private static native void nglPixelDataRangeNV(int target, int length, Buffer data, int data_position, long function_pointer);
 }
diff --git a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java
index b9b90d85..270d925a 100644
--- a/src/java/org/lwjgl/opengl/NVVertexArrayRange.java
+++ b/src/java/org/lwjgl/opengl/NVVertexArrayRange.java
@@ -41,12 +41,6 @@ public final class NVVertexArrayRange {
 	}
 	private static native void nglFlushVertexArrayRangeNV(long function_pointer);
 
-	public static void glVertexArrayRangeNV(ShortBuffer pPointer) {
-		BufferChecks.checkDirect(pPointer);
-		long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glVertexArrayRangeNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVertexArrayRangeNV((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, function_pointer);
-	}
 	public static void glVertexArrayRangeNV(ByteBuffer pPointer) {
 		BufferChecks.checkDirect(pPointer);
 		long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glVertexArrayRangeNV_pointer;
@@ -65,5 +59,11 @@ public final class NVVertexArrayRange {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVertexArrayRangeNV((pPointer.remaining() << 2), pPointer, pPointer.position() << 2, function_pointer);
 	}
+	public static void glVertexArrayRangeNV(ShortBuffer pPointer) {
+		BufferChecks.checkDirect(pPointer);
+		long function_pointer = GLContext.getCapabilities().NV_vertex_array_range_glVertexArrayRangeNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglVertexArrayRangeNV((pPointer.remaining() << 1), pPointer, pPointer.position() << 1, function_pointer);
+	}
 	private static native void nglVertexArrayRangeNV(int size, Buffer pPointer, int pPointer_position, long function_pointer);
 }
diff --git a/src/java/org/lwjgl/opengl/NVVertexProgram.java b/src/java/org/lwjgl/opengl/NVVertexProgram.java
index 75ef4e73..e6ce513f 100644
--- a/src/java/org/lwjgl/opengl/NVVertexProgram.java
+++ b/src/java/org/lwjgl/opengl/NVVertexProgram.java
@@ -218,12 +218,12 @@ public final class NVVertexProgram extends NVProgram {
 	}
 	private static native void nglVertexAttrib1sNV(int index, short x, long function_pointer);
 
-	public static void glVertexAttribPointerNV(int index, int size, int type, int stride, ShortBuffer buffer) {
+	public static void glVertexAttribPointerNV(int index, int size, int type, int stride, FloatBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
 		long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribPointerNV_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 1, function_pointer);
+		nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 2, function_pointer);
 	}
 	public static void glVertexAttribPointerNV(int index, int size, int type, int stride, ByteBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
@@ -232,13 +232,6 @@ public final class NVVertexProgram extends NVProgram {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position(), function_pointer);
 	}
-	public static void glVertexAttribPointerNV(int index, int size, int type, int stride, FloatBuffer buffer) {
-		GLBufferChecks.ensureArrayVBOdisabled();
-		BufferChecks.checkDirect(buffer);
-		long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribPointerNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 2, function_pointer);
-	}
 	public static void glVertexAttribPointerNV(int index, int size, int type, int stride, IntBuffer buffer) {
 		GLBufferChecks.ensureArrayVBOdisabled();
 		BufferChecks.checkDirect(buffer);
@@ -246,6 +239,13 @@ public final class NVVertexProgram extends NVProgram {
 		BufferChecks.checkFunctionAddress(function_pointer);
 		nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 2, function_pointer);
 	}
+	public static void glVertexAttribPointerNV(int index, int size, int type, int stride, ShortBuffer buffer) {
+		GLBufferChecks.ensureArrayVBOdisabled();
+		BufferChecks.checkDirect(buffer);
+		long function_pointer = GLContext.getCapabilities().NV_vertex_program_glVertexAttribPointerNV_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		nglVertexAttribPointerNV(index, size, type, stride, buffer, buffer.position() << 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) {
 		GLBufferChecks.ensureArrayVBOenabled();