Autogen changes from previous commit

This commit is contained in:
Elias Naur 2006-11-19 22:06:46 +00:00
parent 0bed1b2f98
commit 5d6ae4138a
3 changed files with 290 additions and 290 deletions

View File

@ -160,7 +160,7 @@ public class ContextCapabilities {
public final boolean GL_NV_texture_shader;
public final boolean GL_NV_texture_shader2;
public final boolean GL_NV_texture_shader3;
public final boolean GL_NV_transform_feeback;
public final boolean GL_NV_transform_feedback;
public final boolean GL_NV_vertex_array_range;
public final boolean GL_NV_vertex_array_range2;
public final boolean GL_NV_vertex_program;
@ -1073,17 +1073,17 @@ public class ContextCapabilities {
long NV_register_combiners_glGetFinalCombinerInputParameterivNV_pointer;
long NV_register_combiners2_glCombinerStageParameterfvNV_pointer;
long NV_register_combiners2_glGetCombinerStageParameterfvNV_pointer;
long NV_transform_feeback_glBindBufferRangeNV_pointer;
long NV_transform_feeback_glBindBufferOffsetNV_pointer;
long NV_transform_feeback_glBindBufferBaseNV_pointer;
long NV_transform_feeback_glTransformFeedbackAttribsNV_pointer;
long NV_transform_feeback_glTransformFeedbackVaryingsNV_pointer;
long NV_transform_feeback_glBeginTransformFeedbackNV_pointer;
long NV_transform_feeback_glEndTransformFeedbackNV_pointer;
long NV_transform_feeback_glGetVaryingLocationNV_pointer;
long NV_transform_feeback_glGetActiveVaryingNV_pointer;
long NV_transform_feeback_glActiveVaryingNV_pointer;
long NV_transform_feeback_glGetTransformFeedbackVaryingNV_pointer;
long NV_transform_feedback_glBindBufferRangeNV_pointer;
long NV_transform_feedback_glBindBufferOffsetNV_pointer;
long NV_transform_feedback_glBindBufferBaseNV_pointer;
long NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
long NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
long NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
long NV_transform_feedback_glEndTransformFeedbackNV_pointer;
long NV_transform_feedback_glGetVaryingLocationNV_pointer;
long NV_transform_feedback_glGetActiveVaryingNV_pointer;
long NV_transform_feedback_glActiveVaryingNV_pointer;
long NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
long NV_vertex_array_range_glVertexArrayRangeNV_pointer;
long NV_vertex_array_range_glFlushVertexArrayRangeNV_pointer;
long NV_vertex_array_range_glAllocateMemoryNV_pointer;
@ -2344,19 +2344,19 @@ public class ContextCapabilities {
(NV_register_combiners2_glGetCombinerStageParameterfvNV_pointer = GLContext.getFunctionAddress("glGetCombinerStageParameterfvNV")) != 0;
}
private boolean NV_transform_feeback_initNativeFunctionAddresses() {
private boolean NV_transform_feedback_initNativeFunctionAddresses() {
return
(NV_transform_feeback_glBindBufferRangeNV_pointer = GLContext.getFunctionAddress("glBindBufferRangeNV")) != 0 &&
(NV_transform_feeback_glBindBufferOffsetNV_pointer = GLContext.getFunctionAddress("glBindBufferOffsetNV")) != 0 &&
(NV_transform_feeback_glBindBufferBaseNV_pointer = GLContext.getFunctionAddress("glBindBufferBaseNV")) != 0 &&
(NV_transform_feeback_glTransformFeedbackAttribsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackAttribsNV")) != 0 &&
(NV_transform_feeback_glTransformFeedbackVaryingsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackVaryingsNV")) != 0 &&
(NV_transform_feeback_glBeginTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glBeginTransformFeedbackNV")) != 0 &&
(NV_transform_feeback_glEndTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glEndTransformFeedbackNV")) != 0 &&
(NV_transform_feeback_glGetVaryingLocationNV_pointer = GLContext.getFunctionAddress("glGetVaryingLocationNV")) != 0 &&
(NV_transform_feeback_glGetActiveVaryingNV_pointer = GLContext.getFunctionAddress("glGetActiveVaryingNV")) != 0 &&
(NV_transform_feeback_glActiveVaryingNV_pointer = GLContext.getFunctionAddress("glActiveVaryingNV")) != 0 &&
(NV_transform_feeback_glGetTransformFeedbackVaryingNV_pointer = GLContext.getFunctionAddress("glGetTransformFeedbackVaryingNV")) != 0;
(NV_transform_feedback_glBindBufferRangeNV_pointer = GLContext.getFunctionAddress("glBindBufferRangeNV")) != 0 &&
(NV_transform_feedback_glBindBufferOffsetNV_pointer = GLContext.getFunctionAddress("glBindBufferOffsetNV")) != 0 &&
(NV_transform_feedback_glBindBufferBaseNV_pointer = GLContext.getFunctionAddress("glBindBufferBaseNV")) != 0 &&
(NV_transform_feedback_glTransformFeedbackAttribsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackAttribsNV")) != 0 &&
(NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer = GLContext.getFunctionAddress("glTransformFeedbackVaryingsNV")) != 0 &&
(NV_transform_feedback_glBeginTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glBeginTransformFeedbackNV")) != 0 &&
(NV_transform_feedback_glEndTransformFeedbackNV_pointer = GLContext.getFunctionAddress("glEndTransformFeedbackNV")) != 0 &&
(NV_transform_feedback_glGetVaryingLocationNV_pointer = GLContext.getFunctionAddress("glGetVaryingLocationNV")) != 0 &&
(NV_transform_feedback_glGetActiveVaryingNV_pointer = GLContext.getFunctionAddress("glGetActiveVaryingNV")) != 0 &&
(NV_transform_feedback_glActiveVaryingNV_pointer = GLContext.getFunctionAddress("glActiveVaryingNV")) != 0 &&
(NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer = GLContext.getFunctionAddress("glGetTransformFeedbackVaryingNV")) != 0;
}
private boolean NV_vertex_array_range_initNativeFunctionAddresses() {
@ -2586,8 +2586,8 @@ public class ContextCapabilities {
supported_extensions.remove("GL_NV_register_combiners");
if (supported_extensions.contains("GL_NV_register_combiners2") && !NV_register_combiners2_initNativeFunctionAddresses())
supported_extensions.remove("GL_NV_register_combiners2");
if (supported_extensions.contains("GL_NV_transform_feeback") && !NV_transform_feeback_initNativeFunctionAddresses())
supported_extensions.remove("GL_NV_transform_feeback");
if (supported_extensions.contains("GL_NV_transform_feedback") && !NV_transform_feedback_initNativeFunctionAddresses())
supported_extensions.remove("GL_NV_transform_feedback");
if (supported_extensions.contains("GL_NV_vertex_array_range") && !NV_vertex_array_range_initNativeFunctionAddresses())
supported_extensions.remove("GL_NV_vertex_array_range");
if (supported_extensions.contains("GL_NV_vertex_program") && !NV_vertex_program_initNativeFunctionAddresses())
@ -2756,7 +2756,7 @@ public class ContextCapabilities {
this.GL_NV_texture_shader = supported_extensions.contains("GL_NV_texture_shader");
this.GL_NV_texture_shader2 = supported_extensions.contains("GL_NV_texture_shader2");
this.GL_NV_texture_shader3 = supported_extensions.contains("GL_NV_texture_shader3");
this.GL_NV_transform_feeback = supported_extensions.contains("GL_NV_transform_feeback");
this.GL_NV_transform_feedback = supported_extensions.contains("GL_NV_transform_feedback");
this.GL_NV_vertex_array_range = supported_extensions.contains("GL_NV_vertex_array_range");
this.GL_NV_vertex_array_range2 = supported_extensions.contains("GL_NV_vertex_array_range2");
this.GL_NV_vertex_program = supported_extensions.contains("GL_NV_vertex_program")

View File

@ -6,7 +6,7 @@ import org.lwjgl.LWJGLException;
import org.lwjgl.BufferChecks;
import java.nio.*;
public final class NVTransformFeeback {
public final class NVTransformFeedback {
/**
* Accepted by the <target> parameters of BindBuffer, BufferData,
* BufferSubData, MapBuffer, UnmapBuffer, GetBufferSubData,
@ -75,13 +75,13 @@ public final class NVTransformFeeback {
public static final int GL_PRIMITIVE_ID_NV = 0x8c7c;
public static final int GL_GENERIC_ATTRIB_NV = 0x8c7d;
private NVTransformFeeback() {
private NVTransformFeedback() {
}
public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glBindBufferRangeNV_pointer;
long function_pointer = caps.NV_transform_feedback_glBindBufferRangeNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBindBufferRangeNV(target, index, buffer, offset, size, function_pointer);
}
@ -89,7 +89,7 @@ public final class NVTransformFeeback {
public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glBindBufferOffsetNV_pointer;
long function_pointer = caps.NV_transform_feedback_glBindBufferOffsetNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBindBufferOffsetNV(target, index, buffer, offset, function_pointer);
}
@ -97,7 +97,7 @@ public final class NVTransformFeeback {
public static void glBindBufferBaseNV(int target, int index, int buffer) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glBindBufferBaseNV_pointer;
long function_pointer = caps.NV_transform_feedback_glBindBufferBaseNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBindBufferBaseNV(target, index, buffer, function_pointer);
}
@ -105,7 +105,7 @@ public final class NVTransformFeeback {
public static void glTransformFeedbackAttribsNV(IntBuffer attribs, int bufferMode) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glTransformFeedbackAttribsNV_pointer;
long function_pointer = caps.NV_transform_feedback_glTransformFeedbackAttribsNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(attribs);
nglTransformFeedbackAttribsNV((attribs.remaining()), attribs, attribs.position(), bufferMode, function_pointer);
@ -114,7 +114,7 @@ public final class NVTransformFeeback {
public static void glTransformFeedbackVaryingsNV(int program, IntBuffer locations, int bufferMode) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glTransformFeedbackVaryingsNV_pointer;
long function_pointer = caps.NV_transform_feedback_glTransformFeedbackVaryingsNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(locations);
nglTransformFeedbackVaryingsNV(program, (locations.remaining()), locations, locations.position(), bufferMode, function_pointer);
@ -123,7 +123,7 @@ public final class NVTransformFeeback {
public static void glBeginTransformFeedbackNV(int primitiveMode) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glBeginTransformFeedbackNV_pointer;
long function_pointer = caps.NV_transform_feedback_glBeginTransformFeedbackNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglBeginTransformFeedbackNV(primitiveMode, function_pointer);
}
@ -131,7 +131,7 @@ public final class NVTransformFeeback {
public static void glEndTransformFeedbackNV() {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glEndTransformFeedbackNV_pointer;
long function_pointer = caps.NV_transform_feedback_glEndTransformFeedbackNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
nglEndTransformFeedbackNV(function_pointer);
}
@ -139,7 +139,7 @@ public final class NVTransformFeeback {
public static int glGetVaryingLocationNV(int program, ByteBuffer name) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glGetVaryingLocationNV_pointer;
long function_pointer = caps.NV_transform_feedback_glGetVaryingLocationNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(name);
BufferChecks.checkNullTerminated(name);
@ -150,7 +150,7 @@ public final class NVTransformFeeback {
public static void glGetActiveVaryingNV(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glGetActiveVaryingNV_pointer;
long function_pointer = caps.NV_transform_feedback_glGetActiveVaryingNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(length, 1);
BufferChecks.checkBuffer(size, 1);
@ -162,7 +162,7 @@ public final class NVTransformFeeback {
public static void glActiveVaryingNV(int program, ByteBuffer name) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glActiveVaryingNV_pointer;
long function_pointer = caps.NV_transform_feedback_glActiveVaryingNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkDirect(name);
BufferChecks.checkNullTerminated(name);
@ -172,7 +172,7 @@ public final class NVTransformFeeback {
public static void glGetTransformFeedbackVaryingNV(int program, int index, IntBuffer location) {
ContextCapabilities caps = GLContext.getCapabilities();
long function_pointer = caps.NV_transform_feeback_glGetTransformFeedbackVaryingNV_pointer;
long function_pointer = caps.NV_transform_feedback_glGetTransformFeedbackVaryingNV_pointer;
BufferChecks.checkFunctionAddress(function_pointer);
BufferChecks.checkBuffer(location, 1);
nglGetTransformFeedbackVaryingNV(program, index, location, location.position(), function_pointer);

View File

@ -15,51 +15,51 @@ typedef void (APIENTRY *glGetActiveVaryingNVPROC) (GLuint program, GLuint index,
typedef void (APIENTRY *glActiveVaryingNVPROC) (GLuint program, const GLchar * name);
typedef void (APIENTRY *glGetTransformFeedbackVaryingNVPROC) (GLuint program, GLuint index, GLint * location);
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
glBindBufferRangeNVPROC glBindBufferRangeNV = (glBindBufferRangeNVPROC)((intptr_t)function_pointer);
glBindBufferRangeNV(target, index, buffer, offset, size);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
glBindBufferOffsetNVPROC glBindBufferOffsetNV = (glBindBufferOffsetNVPROC)((intptr_t)function_pointer);
glBindBufferOffsetNV(target, index, buffer, offset);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
glBindBufferBaseNVPROC glBindBufferBaseNV = (glBindBufferBaseNVPROC)((intptr_t)function_pointer);
glBindBufferBaseNV(target, index, buffer);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglTransformFeedbackAttribsNV(JNIEnv *env, jclass clazz, jint count, jobject attribs, jint attribs_position, jint bufferMode, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackAttribsNV(JNIEnv *env, jclass clazz, jint count, jobject attribs, jint attribs_position, jint bufferMode, jlong function_pointer) {
const GLint *attribs_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, attribs)) + attribs_position;
glTransformFeedbackAttribsNVPROC glTransformFeedbackAttribsNV = (glTransformFeedbackAttribsNVPROC)((intptr_t)function_pointer);
glTransformFeedbackAttribsNV(count, attribs_address, bufferMode);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglTransformFeedbackVaryingsNV(JNIEnv *env, jclass clazz, jint program, jint count, jobject locations, jint locations_position, jint bufferMode, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglTransformFeedbackVaryingsNV(JNIEnv *env, jclass clazz, jint program, jint count, jobject locations, jint locations_position, jint bufferMode, jlong function_pointer) {
const GLint *locations_address = ((const GLint *)(*env)->GetDirectBufferAddress(env, locations)) + locations_position;
glTransformFeedbackVaryingsNVPROC glTransformFeedbackVaryingsNV = (glTransformFeedbackVaryingsNVPROC)((intptr_t)function_pointer);
glTransformFeedbackVaryingsNV(program, count, locations_address, bufferMode);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglBeginTransformFeedbackNV(JNIEnv *env, jclass clazz, jint primitiveMode, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglBeginTransformFeedbackNV(JNIEnv *env, jclass clazz, jint primitiveMode, jlong function_pointer) {
glBeginTransformFeedbackNVPROC glBeginTransformFeedbackNV = (glBeginTransformFeedbackNVPROC)((intptr_t)function_pointer);
glBeginTransformFeedbackNV(primitiveMode);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglEndTransformFeedbackNV(JNIEnv *env, jclass clazz, jlong function_pointer) {
glEndTransformFeedbackNVPROC glEndTransformFeedbackNV = (glEndTransformFeedbackNVPROC)((intptr_t)function_pointer);
glEndTransformFeedbackNV();
}
JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglGetVaryingLocationNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
JNIEXPORT jint JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetVaryingLocationNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
glGetVaryingLocationNVPROC glGetVaryingLocationNV = (glGetVaryingLocationNVPROC)((intptr_t)function_pointer);
GLint __result = glGetVaryingLocationNV(program, name_address);
return __result;
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglGetActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jint bufSize, jobject length, jint length_position, jobject size, jint size_position, jobject type, jint type_position, jobject name, jint name_position, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jint bufSize, jobject length, jint length_position, jobject size, jint size_position, jobject type, jint type_position, jobject name, jint name_position, jlong function_pointer) {
GLsizei *length_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, length)) + length_position;
GLsizei *size_address = ((GLsizei *)(*env)->GetDirectBufferAddress(env, size)) + size_position;
GLenum *type_address = ((GLenum *)(*env)->GetDirectBufferAddress(env, type)) + type_position;
@ -68,13 +68,13 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglGetActiveVary
glGetActiveVaryingNV(program, index, bufSize, length_address, size_address, type_address, name_address);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglActiveVaryingNV(JNIEnv *env, jclass clazz, jint program, jobject name, jint name_position, jlong function_pointer) {
const GLchar *name_address = ((const GLchar *)(*env)->GetDirectBufferAddress(env, name)) + name_position;
glActiveVaryingNVPROC glActiveVaryingNV = (glActiveVaryingNVPROC)((intptr_t)function_pointer);
glActiveVaryingNV(program, name_address);
}
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeeback_nglGetTransformFeedbackVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jobject location, jint location_position, jlong function_pointer) {
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVTransformFeedback_nglGetTransformFeedbackVaryingNV(JNIEnv *env, jclass clazz, jint program, jint index, jobject location, jint location_position, jlong function_pointer) {
GLint *location_address = ((GLint *)(*env)->GetDirectBufferAddress(env, location)) + location_position;
glGetTransformFeedbackVaryingNVPROC glGetTransformFeedbackVaryingNV = (glGetTransformFeedbackVaryingNVPROC)((intptr_t)function_pointer);
glGetTransformFeedbackVaryingNV(program, index, location_address);