diff --git a/src/java/org/lwjgl/opengl/Pbuffer.java b/src/java/org/lwjgl/opengl/Pbuffer.java index f7afc016..6df0fcc9 100644 --- a/src/java/org/lwjgl/opengl/Pbuffer.java +++ b/src/java/org/lwjgl/opengl/Pbuffer.java @@ -248,8 +248,11 @@ public final class Pbuffer { */ public synchronized void destroy() { makeCurrent(); + int error = GL11.glGetError(); VBOTracker.remove(this); nDestroy(handle); + if (error != GL11.GL_NO_ERROR) + throw new OpenGLException(error); } /** diff --git a/src/java/org/lwjgl/opengl/Util.java b/src/java/org/lwjgl/opengl/Util.java index f8ed3fad..bba57a46 100644 --- a/src/java/org/lwjgl/opengl/Util.java +++ b/src/java/org/lwjgl/opengl/Util.java @@ -60,6 +60,13 @@ abstract class Util { return buffer.position(); } + static void checkGLError() { + int err = GL11.glGetError(); + if (err != GL11.GL_NO_ERROR) { + throw new OpenGLException(err); + } + } + static int getGLInteger(int gl_enum) { GL11.glGetInteger(gl_enum, int_buffer); return int_buffer.get(0); diff --git a/src/java/org/lwjgl/opengl/Window.java b/src/java/org/lwjgl/opengl/Window.java index 86d13c13..c08cda24 100644 --- a/src/java/org/lwjgl/opengl/Window.java +++ b/src/java/org/lwjgl/opengl/Window.java @@ -209,6 +209,7 @@ public final class Window { */ public static void paint() { assert isCreated() : "Cannot paint uncreated window"; + Util.checkGLError(); swapBuffers(); } diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp index 72a81df0..a8f8fde0 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp @@ -39,7 +39,7 @@ * @version $Revision$ */ -#include "checkGLerror.h" + #include "extgl.h" typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); @@ -122,7 +122,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTable { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glColorTable(target, internalFormat, width, format, type, address); - CHECK_GL_ERROR + } /* @@ -135,7 +135,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorSubTable { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glColorSubTable(target, start, count, format, type, address); - CHECK_GL_ERROR + } /* @@ -148,7 +148,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTable { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetColorTable(target, format, type, address); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameteriv { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetColorTableParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetColorTableParameterfv { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetColorTableParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -187,7 +187,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameteriv { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glColorTableParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -200,7 +200,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglColorTableParameterfv { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glColorTableParameterfv(target, pname, address); - CHECK_GL_ERROR + } @@ -213,7 +213,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorSubTable (JNIEnv *env, jclass clazz, jint target, jint start, jint x, jint y, jint width) { glCopyColorSubTable(target, start, x, y, width); - CHECK_GL_ERROR + } @@ -226,7 +226,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyColorTable (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { glCopyColorTable(target, internalformat, x, y, width); - CHECK_GL_ERROR + } @@ -239,7 +239,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); - CHECK_GL_ERROR + } /* @@ -249,7 +249,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendEquation static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -261,7 +261,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glHistogram (JNIEnv *env, jclass clazz, jint target, jint width, jint internalformat, jboolean sink) { glHistogram(target, width, internalformat, sink); - CHECK_GL_ERROR + } /* @@ -273,7 +273,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetHistogram (JNIEnv *env, jclass clazz, jint target) { glResetHistogram(target); - CHECK_GL_ERROR + } /* @@ -286,7 +286,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogram { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetHistogram(target, reset, format, type, address); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameterfv { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetHistogramParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -312,7 +312,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetHistogramParameteriv { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetHistogramParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -324,7 +324,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glMinmax (JNIEnv *env, jclass clazz, jint target, jint internalformat, jboolean sink) { glMinmax(target, internalformat, sink); - CHECK_GL_ERROR + } /* @@ -336,7 +336,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glResetMinmax (JNIEnv *env, jclass clazz, jint target) { glResetMinmax(target); - CHECK_GL_ERROR + } /* @@ -349,7 +349,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmax { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetMinmax(target, reset, format, type, address); - CHECK_GL_ERROR + } /* @@ -362,7 +362,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameterfv { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -375,7 +375,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetMinmaxParameteriv { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -388,7 +388,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter1D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glConvolutionFilter1D(target, internalformat, width, format, type, address); - CHECK_GL_ERROR + } /* @@ -401,7 +401,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionFilter2D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glConvolutionFilter2D(target, internalformat, width, height, format, type, address); - CHECK_GL_ERROR + } /* @@ -413,7 +413,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameterf (JNIEnv *env, jclass clazz, jint target, jint pname, jfloat params) { glConvolutionParameterf(target, pname, params); - CHECK_GL_ERROR + } /* @@ -426,7 +426,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameterfv { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glConvolutionParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -438,7 +438,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glConvolutionParameteri (JNIEnv *env, jclass clazz, jint target, jint pname, jint params) { glConvolutionParameteri(target, pname, params); - CHECK_GL_ERROR + } /* @@ -451,7 +451,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglConvolutionParameteriv { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glConvolutionParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -463,7 +463,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter1D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width) { glCopyConvolutionFilter1D(target, internalformat, x, y, width); - CHECK_GL_ERROR + } /* @@ -475,7 +475,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_glCopyConvolutionFilter2D (JNIEnv *env, jclass clazz, jint target, jint internalformat, jint x, jint y, jint width, jint height) { glCopyConvolutionFilter2D(target, internalformat, x, y, width, height); - CHECK_GL_ERROR + } /* @@ -488,7 +488,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionFilter { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetConvolutionFilter(target, format, type, address); - CHECK_GL_ERROR + } /* @@ -501,7 +501,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameterf { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -514,7 +514,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetConvolutionParameteri { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -528,7 +528,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglSeparableFilter2D const void *address = (const void *)(row_offset + (const GLbyte *)env->GetDirectBufferAddress(row)); const void *address2 = (const void *)(column_offset + (const GLbyte *)env->GetDirectBufferAddress(column)); glSeparableFilter2D(target, internalformat, width, height, format, type, address, address2); - CHECK_GL_ERROR + } /* @@ -543,7 +543,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBImaging_nglGetSeparableFilter void *address2 = (void *)(column_offset + (GLbyte *)env->GetDirectBufferAddress(column)); void *address3 = (void *)(span_offset + (GLbyte *)env->GetDirectBufferAddress(span)); glGetSeparableFilter(target, format, type, address, address2, address3); - CHECK_GL_ERROR + } void extgl_InitARBImaging(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp index 661a793c..abed3fa4 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCurrentPaletteMatrixARBPROC) (GLint index); typedef void (APIENTRY * glMatrixIndexubvARBPROC) (GLint size, GLubyte *indices); @@ -57,7 +57,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_glCurrentPaletteMatri (JNIEnv * env, jclass clazz, jint index) { glCurrentPaletteMatrixARB(index); - CHECK_GL_ERROR + } /* @@ -69,7 +69,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointer { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glMatrixIndexPointerARB(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexPointer (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glMatrixIndexPointerARB(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexubvARB { GLubyte *pIndices_ptr = (GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset; glMatrixIndexubvARB(size, pIndices_ptr); - CHECK_GL_ERROR + } /* @@ -104,7 +104,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexuivARB { GLuint *piIndices_ptr = (GLuint *)env->GetDirectBufferAddress(piIndices) + piIndices_offset; glMatrixIndexuivARB(size, piIndices_ptr); - CHECK_GL_ERROR + } /* @@ -116,7 +116,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMatrixPalette_nglMatrixIndexusvARB { GLushort *psIndices_ptr = (GLushort *)env->GetDirectBufferAddress(psIndices) + psIndices_offset; glMatrixIndexusvARB(size, psIndices_ptr); - CHECK_GL_ERROR + } void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp index d5882e34..1a8d508b 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert); @@ -49,7 +49,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultisample_glSampleCoverageARB (JNIEnv * env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverageARB(value, invert); - CHECK_GL_ERROR + } void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp index ecad6efb..b3986037 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glActiveTextureARBPROC) (GLenum texture ); typedef void (APIENTRY * glClientActiveTextureARBPROC) (GLenum texture ); @@ -75,7 +75,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glClientActiveTextureA (JNIEnv * env, jclass clazz, jint texture) { glClientActiveTextureARB(texture); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glActiveTextureARB (JNIEnv * env, jclass clazz, jint texture) { glActiveTextureARB(texture); - CHECK_GL_ERROR + } /* @@ -97,7 +97,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1fARB (JNIEnv * env, jclass clazz, jint target, jfloat s) { glMultiTexCoord1fARB(target, s); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1iARB (JNIEnv * env, jclass clazz, jint target, jint s) { glMultiTexCoord1iARB(target, s); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord1sARB (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1sARB(target, s); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t) { glMultiTexCoord2fARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t) { glMultiTexCoord2iARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord2sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2sARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -163,7 +163,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { glMultiTexCoord3fARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r) { glMultiTexCoord3iARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord3sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3sARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4fARB (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r, jfloat q) { glMultiTexCoord4fARB(target, s, t, r, q); - CHECK_GL_ERROR + } /* @@ -207,7 +207,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4iARB (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r, jint q) { glMultiTexCoord4iARB(target, s, t, r, q); - CHECK_GL_ERROR + } /* @@ -218,7 +218,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBMultitexture_glMultiTexCoord4sARB (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { glMultiTexCoord4sARB(target, s, t, r, q); - CHECK_GL_ERROR + } void extgl_InitARBMultitexture(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp index 9db2660d..9ccfea98 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glGenQueriesARBPROC) (GLsizei n, GLuint *ids); typedef void (APIENTRY * glDeleteQueriesARBPROC) (GLsizei n, const GLuint *ids); @@ -64,7 +64,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGenQueriesARB { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueriesARB(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -76,7 +76,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglDeleteQueriesARB { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueriesARB(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glIsQueryARB (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQueryARB(id); - CHECK_GL_ERROR + return result; } @@ -99,7 +99,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glBeginQueryARB (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQueryARB(target, id); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_glEndQueryARB (JNIEnv * env, jclass clazz, jint target) { glEndQueryARB(target); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryivARB { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryivARB(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectivA { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectivARB(id, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -146,7 +146,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBOcclusionQuery_nglGetQueryObjectuiv { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuivARB(id, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp index b390f7db..3a30cf13 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPointParameterfARBPROC) (GLenum pname, GLfloat param); typedef void (APIENTRY * glPointParameterfvARBPROC) (GLenum pname, GLfloat *params); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_glPointParameterfAR (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfARB(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBPointParameters_nglPointParameterfv { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvARB(pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp index 5cef0bb6..dba03e42 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glProgramStringARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); typedef void (APIENTRY * glBindProgramARBPROC) (GLenum target, GLuint program); @@ -75,7 +75,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramStringARB { GLvoid *string_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(string) + stringOffset); glProgramStringARB(target, format, length, string_ptr); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_glBindProgramARB (JNIEnv * env, jclass clazz, jint target, jint program) { glBindProgramARB(target, program); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglDeleteProgramsARB { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glDeleteProgramsARB(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGenProgramsARB { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glGenProgramsARB(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_glProgramEnvParameter4fARB (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramEnvParameter4fARB(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -133,7 +133,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramEnvParameter4fvAR { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramEnvParameter4fvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_glProgramLocalParameter4fAR (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramLocalParameter4fARB(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -156,7 +156,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglProgramLocalParameter4fv { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramLocalParameter4fvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -168,7 +168,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramEnvParameterfv { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramEnvParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -180,7 +180,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramLocalParameter { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramLocalParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -192,7 +192,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramivARB { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramivARB(target, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -204,7 +204,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBProgram_nglGetProgramStringARB { GLvoid *paramString_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset); glGetProgramStringARB(target, parameterName, paramString_ptr); - CHECK_GL_ERROR + } /* @@ -215,7 +215,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_ARBProgram_glIsProgramARB (JNIEnv * env, jclass clazz, jint program) { GLboolean result = glIsProgramARB(program); - CHECK_GL_ERROR + return result; } diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp index 397ad830..e42ebad9 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned char GLcharARB; typedef unsigned int GLhandleARB; @@ -134,7 +134,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glDeleteObjectARB (JNIEnv * env, jclass clazz, jint obj) { glDeleteObjectARB(obj); - CHECK_GL_ERROR + } /* @@ -145,7 +145,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glGetHandleARB (JNIEnv * env, jclass clazz, jint pname) { GLhandleARB result = glGetHandleARB(pname); - CHECK_GL_ERROR + return result; } @@ -157,7 +157,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glDetachObjectARB (JNIEnv * env, jclass clazz, jint containerObj, jint attachedObj) { glDetachObjectARB(containerObj, attachedObj); - CHECK_GL_ERROR + } /* @@ -168,7 +168,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCreateShaderObjectA (JNIEnv * env, jclass clazz, jint shaderType) { GLhandleARB result = glCreateShaderObjectARB(shaderType); - CHECK_GL_ERROR + return result; } @@ -213,7 +213,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglShaderSourceARB (JNIEnv * env, jclass clazz, jint shaderObj) { glShaderSourceARB(shaderObj, sourceCount, (const GLcharARB **)sources, (const GLint *)sourcesLengths); - CHECK_GL_ERROR + } /* @@ -224,7 +224,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCompileShaderARB (JNIEnv * env, jclass clazz, jint shaderObj) { glCompileShaderARB(shaderObj); - CHECK_GL_ERROR + } /* @@ -235,7 +235,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glCreateProgramObject (JNIEnv * env, jclass clazz) { GLuint result = glCreateProgramObjectARB(); - CHECK_GL_ERROR + return result; } @@ -247,7 +247,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glAttachObjectARB (JNIEnv * env, jclass clazz, jint containerObj, jint obj) { glAttachObjectARB(containerObj, obj); - CHECK_GL_ERROR + } /* @@ -258,7 +258,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glLinkProgramARB (JNIEnv * env, jclass clazz, jint programObj) { glLinkProgramARB(programObj); - CHECK_GL_ERROR + } /* @@ -269,7 +269,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUseProgramObjectARB (JNIEnv * env, jclass clazz, jint programObj) { glUseProgramObjectARB(programObj); - CHECK_GL_ERROR + } /* @@ -280,7 +280,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glValidateProgramARB (JNIEnv * env, jclass clazz, jint programObj) { glValidateProgramARB(programObj); - CHECK_GL_ERROR + } /* @@ -291,7 +291,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform1fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0) { glUniform1fARB(location, v0); - CHECK_GL_ERROR + } /* @@ -302,7 +302,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform2fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1) { glUniform2fARB(location, v0, v1); - CHECK_GL_ERROR + } /* @@ -313,7 +313,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform3fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2) { glUniform3fARB(location, v0, v1, v2); - CHECK_GL_ERROR + } /* @@ -324,7 +324,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform4fARB (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2, jfloat v3) { glUniform4fARB(location, v0, v1, v2, v3); - CHECK_GL_ERROR + } /* @@ -335,7 +335,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform1iARB (JNIEnv * env, jclass clazz, jint location, jint v0) { glUniform1iARB(location, v0); - CHECK_GL_ERROR + } /* @@ -346,7 +346,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform2iARB (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1) { glUniform2iARB(location, v0, v1); - CHECK_GL_ERROR + } /* @@ -357,7 +357,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform3iARB (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2) { glUniform3iARB(location, v0, v1, v2); - CHECK_GL_ERROR + } /* @@ -368,7 +368,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_glUniform4iARB (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2, jint v3) { glUniform4iARB(location, v0, v1, v2, v3); - CHECK_GL_ERROR + } /* @@ -380,7 +380,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform1fvARB { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform1fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -392,7 +392,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform2fvARB { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform2fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -404,7 +404,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform3fvARB { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform3fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -416,7 +416,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform4fvARB { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform4fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -428,7 +428,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform1ivARB { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform1ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -440,7 +440,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform2ivARB { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform2ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -452,7 +452,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform3ivARB { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform3ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -464,7 +464,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniform4ivARB { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform4ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -476,7 +476,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix2fvAR { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix2fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -488,7 +488,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix3fvAR { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix3fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -500,7 +500,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglUniformMatrix4fvAR { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix4fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -512,7 +512,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetObjectParameter { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetObjectParameterfvARB(obj, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -524,7 +524,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetObjectParameter { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetObjectParameterivARB(obj, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -544,7 +544,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetInfoLogARB glGetInfoLogARB(obj, maxLength, length_ptr, infoLog_ptr); } - CHECK_GL_ERROR + } /* @@ -564,7 +564,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetAttachedObjects glGetAttachedObjectsARB(containerObj, maxCount, count_ptr, obj_ptr); } - CHECK_GL_ERROR + } /* @@ -576,7 +576,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformLocation { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLuint result = glGetUniformLocationARB(programObj, name_ptr); - CHECK_GL_ERROR + return result; } @@ -599,7 +599,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetActiveUniformAR glGetActiveUniformARB(programObj, index, maxLength, length_ptr, size_ptr, type_ptr, name_ptr); } - CHECK_GL_ERROR + } /* @@ -611,7 +611,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformfvARB { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetUniformfvARB(programObj, location, params_ptr); - CHECK_GL_ERROR + } /* @@ -623,7 +623,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetUniformivARB { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetUniformivARB(programObj, location, params_ptr); - CHECK_GL_ERROR + } /* @@ -642,7 +642,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBShaderObjects_nglGetShaderSourceARB glGetShaderSourceARB(obj, maxLength, length_ptr, source_ptr); } - CHECK_GL_ERROR + } void extgl_InitARBShaderObjects(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp index 254db36e..1ce49cfd 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCompressedTexImage1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data ); typedef void (APIENTRY * glCompressedTexImage2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data ); @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTex { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexImage1DARB(target, level, internalformat, width, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTex { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexImage2DARB(target, level, internalformat, width, height, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTex { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexImage3DARB(target, level, internalformat, width, height, depth, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTex { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexSubImage1DARB(target, level, xoffset, width, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTex { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexSubImage2DARB(target, level, xoffset, yoffset, width, height, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglCompressedTex { GLvoid *pData_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pData) + pData_offset); glCompressedTexSubImage3DARB(target, level, xoffset, yoffset, zoffset, width, height, depth, border, imageSize, pData_ptr); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTextureCompression_nglGetCompressed { GLvoid *pImg_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pImg) + pImg_offset); glGetCompressedTexImageARB(target, lod, pImg_ptr); - CHECK_GL_ERROR + } void extgl_InitARBTextureCompression(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp index 7bcefd79..fea3b479 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glLoadTransposeMatrixfARBPROC) (const GLfloat m[16] ); typedef void (APIENTRY * glMultTransposeMatrixfARBPROC) (const GLfloat m[16] ); @@ -52,7 +52,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTransposeMatrix_nglLoadTransposeMat { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; glLoadTransposeMatrixfARB(pfMtx_ptr); - CHECK_GL_ERROR + } /* @@ -64,7 +64,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBTransposeMatrix_nglMultTransposeMat { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; glMultTransposeMatrixfARB(pfMtx_ptr); - CHECK_GL_ERROR + } void extgl_InitARBTransposeMatrix(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp index 5be41369..4ca369a8 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glWeightbvARBPROC) (GLint size, GLbyte *weights); typedef void (APIENTRY * glWeightsvARBPROC) (GLint size, GLshort *weights); @@ -66,7 +66,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightbvARB { GLbyte *pWeights_ptr = (GLbyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; glWeightbvARB(size, pWeights_ptr); - CHECK_GL_ERROR + } /* @@ -78,7 +78,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightfvARB { GLfloat *pfWeights_ptr = (GLfloat *)env->GetDirectBufferAddress(pfWeights) + pfWeights_offset; glWeightfvARB(size, pfWeights_ptr); - CHECK_GL_ERROR + } /* @@ -90,7 +90,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightivARB { GLint *piWeights_ptr = (GLint *)env->GetDirectBufferAddress(piWeights) + piWeights_offset; glWeightivARB(size, piWeights_ptr); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightsvARB { GLshort *psWeights_ptr = (GLshort *)env->GetDirectBufferAddress(psWeights) + psWeights_offset; glWeightsvARB(size, psWeights_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightubvARB { GLubyte *pWeights_ptr = (GLubyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; glWeightubvARB(size, pWeights_ptr); - CHECK_GL_ERROR + } /* @@ -126,7 +126,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightuivARB { GLuint *piWeights_ptr = (GLuint *)env->GetDirectBufferAddress(piWeights) + piWeights_offset; glWeightuivARB(size, piWeights_ptr); - CHECK_GL_ERROR + } /* @@ -138,7 +138,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightusvARB { GLushort *psWeights_ptr = (GLushort *)env->GetDirectBufferAddress(psWeights) + psWeights_offset; glWeightusvARB(size, psWeights_ptr); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARB { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glWeightPointerARB(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_nglWeightPointerARBVBO (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glWeightPointerARB(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -172,7 +172,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBlend_glVertexBlendARB (JNIEnv * env, jclass clazz, jint count) { glVertexBlendARB(count); - CHECK_GL_ERROR + } void extgl_InitARBVertexBlend(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp index 99022806..29b32727 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef int GLintptrARB; typedef unsigned int GLsizeiptrARB; @@ -72,7 +72,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglBindBufferARB (JNIEnv * env, jclass clazz, jint target, jint buffer) { glBindBufferARB(target, buffer); - CHECK_GL_ERROR + } /* @@ -84,7 +84,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglDeleteBuffers { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glDeleteBuffersARB(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglGenBuffersARB { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glGenBuffersARB(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -107,7 +107,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_glIsBufferAR (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsBufferARB(buffer); - CHECK_GL_ERROR + return result; } @@ -120,7 +120,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglBufferDataARB { GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset); glBufferDataARB(target, size, data_ptr, usage); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglBufferSubData { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glBufferSubDataARB(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglGetBufferSubD { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glGetBufferSubDataARB(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_glMapBufferAR (JNIEnv * env, jclass clazz, jint target, jint access, jint size, jobject oldBuffer) { void *buffer_address = glMapBufferARB((GLenum)target, (GLenum)access); - CHECK_GL_ERROR + void *old_buffer_address = safeGetBufferAddress(env, oldBuffer, 0); if (old_buffer_address == buffer_address) return oldBuffer; @@ -171,7 +171,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_glUnmapBuffe (JNIEnv * env, jclass clazz, jint target) { GLboolean result = glUnmapBufferARB(target); - CHECK_GL_ERROR + return result; } @@ -184,7 +184,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_nglGetBufferPara { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + params_offset; glGetBufferParameterivARB(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_ARBVertexBufferObject_glGetBufferPo { void *pointer; glGetBufferPointervARB((GLenum)target, (GLenum)pname, &pointer); - CHECK_GL_ERROR + return safeNewBuffer(env, pointer, size); } diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp index 6c85ac57..3656eab3 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glVertexAttrib1sARBPROC) (GLuint index, GLshort x); typedef void (APIENTRY * glVertexAttrib1fARBPROC) (GLuint index, GLfloat x); @@ -100,7 +100,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib1sARB (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1sARB(index, x); - CHECK_GL_ERROR + } /* @@ -111,7 +111,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib1fARB (JNIEnv * env, jclass clazz, jint index, jfloat x) { glVertexAttrib1fARB(index, x); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib2sARB (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2sARB(index, x, y); - CHECK_GL_ERROR + } /* @@ -133,7 +133,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib2fARB (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y) { glVertexAttrib2fARB(index, x, y); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib3sARB (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3sARB(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib3fARB (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z) { glVertexAttrib3fARB(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -166,7 +166,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib4sARB (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4sARB(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -177,7 +177,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib4fARB (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexAttrib4fARB(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -188,7 +188,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glVertexAttrib4NubARB (JNIEnv * env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w) { glVertexAttrib4NubARB(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -200,7 +200,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPointe { GLvoid *buffer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(buffer) + bufferOffset); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_ptr); - CHECK_GL_ERROR + } /* @@ -211,7 +211,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglVertexAttribPointe (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint bufferOffset) { glVertexAttribPointerARB(index, size, type, normalized, stride, (GLvoid *)bufferOffset); - CHECK_GL_ERROR + } /* @@ -222,7 +222,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glEnableVertexAttribA (JNIEnv * env, jclass clazz, jint index) { glEnableVertexAttribArrayARB(index); - CHECK_GL_ERROR + } /* @@ -233,7 +233,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glDisableVertexAttrib (JNIEnv * env, jclass clazz, jint index) { glDisableVertexAttribArrayARB(index); - CHECK_GL_ERROR + } /* @@ -245,7 +245,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribfvA { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribfvARB(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -257,7 +257,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_nglGetVertexAttribivA { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribivARB(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -269,7 +269,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_ARBVertexProgram_glGetVertexAttribP { void *address; glGetVertexAttribPointervARB((GLuint)index, (GLuint)pname, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp index 61c565c1..a2a3a9e5 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned char GLcharARB; typedef unsigned int GLhandleARB; @@ -57,7 +57,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglBindAttribLocationA { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; glBindAttribLocationARB(programObj, index, name_ptr); - CHECK_GL_ERROR + } /* @@ -79,7 +79,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetActiveAttribARB glGetActiveAttribARB(programObj, index, maxLength, length_ptr, size_ptr, type_ptr, name_ptr); } - CHECK_GL_ERROR + } /* @@ -91,7 +91,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ARBVertexShader_nglGetAttribLocationAR { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLuint result = glGetAttribLocationARB(programObj, name_ptr); - CHECK_GL_ERROR + return result; } diff --git a/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp b/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp index a42bf38b..b481026e 100644 --- a/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp +++ b/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glWindowPos2fARBPROC) (GLfloat x, GLfloat y); typedef void (APIENTRY * glWindowPos2iARBPROC) (GLint x, GLint y); @@ -59,7 +59,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos2fARB (JNIEnv * env, jclass clazz, jfloat x, jfloat y) { glWindowPos2fARB(x, y); - CHECK_GL_ERROR + } /* @@ -70,7 +70,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos2iARB (JNIEnv * env, jclass clazz, jint x, jint y) { glWindowPos2iARB(x, y); - CHECK_GL_ERROR + } /* @@ -81,7 +81,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos2sARB (JNIEnv * env, jclass clazz, jshort x, jshort y) { glWindowPos2sARB(x, y); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos3fARB (JNIEnv * env, jclass clazz, jfloat x, jfloat y, jfloat z) { glWindowPos3fARB(x, y, z); - CHECK_GL_ERROR + } /* @@ -103,7 +103,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos3iARB (JNIEnv * env, jclass clazz, jint x, jint y, jint z) { glWindowPos3iARB(x, y, z); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ static void JNICALL Java_org_lwjgl_opengl_ARBWindowPos_glWindowPos3sARB (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z) { glWindowPos3sARB(x, y, z); - CHECK_GL_ERROR + } void extgl_InitARBWindowPos(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp index 6b549a8e..c884d95e 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIDrawBuffers.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glDrawBuffersATIPROC) (GLsizei n, const GLenum *bufs); @@ -50,7 +50,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIDrawBuffers_nglDrawBuffersATI { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffersOffset; glDrawBuffersATI(size, buffers_ptr); - CHECK_GL_ERROR + } void extgl_InitATIDrawBuffers(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp index c647bd51..b8171259 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIElementArray.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glElementPointerATIPROC) (GLenum type, const GLvoid *pointer); typedef void (APIENTRY * glDrawElementArrayATIPROC) (GLenum mode, GLsizei count); @@ -54,7 +54,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATI { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glElementPointerATI(type, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -65,7 +65,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_nglElementPointerATIVB (JNIEnv * env, jclass clazz, jint type, jint buffer_offset) { glElementPointerATI(type, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -76,7 +76,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawElementArrayATI (JNIEnv * env, jclass clazz, jint mode, jint count) { glDrawElementArrayATI(mode, count); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIElementArray_glDrawRangeElementArra (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count) { glDrawRangeElementArrayATI(mode, start, end, count); - CHECK_GL_ERROR + } void extgl_InitATIElementArray(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp index 33ec212f..e0d1f109 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIEnvmapBumpmap.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glTexBumpParameterivATIPROC) (GLenum pname, GLint *param); typedef void (APIENTRY * glTexBumpParameterfvATIPROC) (GLenum pname, GLfloat *param); @@ -56,7 +56,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameterfv { GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; glTexBumpParameterfvATI(pname, pfParam_ptr); - CHECK_GL_ERROR + } /* @@ -68,7 +68,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglTexBumpParameteriv { GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; glTexBumpParameterivATI(pname, piParam_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParamete { GLfloat *pfParam_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParam) + pfParam_offset; glGetTexBumpParameterfvATI(pname, pfParam_ptr); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIEnvmapBumpmap_nglGetTexBumpParamete { GLint *piParam_ptr = (GLint *)env->GetDirectBufferAddress(piParam) + piParam_offset; glGetTexBumpParameterivATI(pname, piParam_ptr); - CHECK_GL_ERROR + } void extgl_InitATIEnvmapBumpmap(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp index de20ae9b..bd2ca01f 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIFragmentShader.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef GLuint (APIENTRY * glGenFragmentShadersATIPROC) (GLuint range); typedef void (APIENTRY * glBindFragmentShaderATIPROC) (GLuint id); @@ -75,7 +75,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glGenFragmentShaders (JNIEnv * env, jclass clazz, jint range) { GLuint result = glGenFragmentShadersATI(range); - CHECK_GL_ERROR + return result; } @@ -87,7 +87,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBindFragmentShader (JNIEnv * env, jclass clazz, jint id) { glBindFragmentShaderATI(id); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glDeleteFragmentShad (JNIEnv * env, jclass clazz, jint id) { glDeleteFragmentShaderATI(id); - CHECK_GL_ERROR + } /* @@ -109,7 +109,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glBeginFragmentShade (JNIEnv * env, jclass clazz) { glBeginFragmentShaderATI(); - CHECK_GL_ERROR + } /* @@ -120,7 +120,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glEndFragmentShaderA (JNIEnv * env, jclass clazz) { glEndFragmentShaderATI(); - CHECK_GL_ERROR + } /* @@ -131,7 +131,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glPassTexCoordATI (JNIEnv * env, jclass clazz, jint dst, jint coord, jint swizzle) { glPassTexCoordATI(dst, coord, swizzle); - CHECK_GL_ERROR + } /* @@ -142,7 +142,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glSampleMapATI (JNIEnv * env, jclass clazz, jint dst, jint interp, jint swizzle) { glSampleMapATI(dst, interp, swizzle); - CHECK_GL_ERROR + } /* @@ -153,7 +153,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp1AT (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { glColorFragmentOp1ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod); - CHECK_GL_ERROR + } /* @@ -164,7 +164,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp2AT (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { glColorFragmentOp2ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); - CHECK_GL_ERROR + } /* @@ -175,7 +175,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glColorFragmentOp3AT (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMask, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { glColorFragmentOp3ATI(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); - CHECK_GL_ERROR + } /* @@ -186,7 +186,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp1AT (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod) { glAlphaFragmentOp1ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod); - CHECK_GL_ERROR + } /* @@ -197,7 +197,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp2AT (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod) { glAlphaFragmentOp2ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod); - CHECK_GL_ERROR + } /* @@ -208,7 +208,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_glAlphaFragmentOp3AT (JNIEnv * env, jclass clazz, jint op, jint dst, jint dstMod, jint arg1, jint arg1Rep, jint arg1Mod, jint arg2, jint arg2Rep, jint arg2Mod, jint arg3, jint arg3Rep, jint arg3Mod) { glAlphaFragmentOp3ATI(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod); - CHECK_GL_ERROR + } /* @@ -220,7 +220,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIFragmentShader_nglSetFragmentShader { GLfloat *pfValue_ptr = (GLfloat *)env->GetDirectBufferAddress(pfValue) + pfValue_offset; glSetFragmentShaderConstantATI(dst, pfValue_ptr); - CHECK_GL_ERROR + } void extgl_InitATIFragmentShader(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp index 302dd644..57afe3fb 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIMapObjectBuffer.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void * (APIENTRY * glMapObjectBufferATIPROC) (GLuint buffer); typedef void (APIENTRY * glUnmapObjectBufferATIPROC) (GLuint buffer); @@ -51,7 +51,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glMapObjectBuffe (JNIEnv * env, jclass clazz, jint buffer, jint size, jobject oldBuffer) { void *buffer_address = glMapObjectBufferATI((GLenum)buffer); - CHECK_GL_ERROR + if (oldBuffer != NULL) { void *old_buffer_address = env->GetDirectBufferAddress(oldBuffer); if (old_buffer_address == buffer_address) @@ -69,7 +69,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIMapObjectBuffer_glUnmapObjectBuffer (JNIEnv * env, jclass clazz, jint buffer) { glUnmapObjectBufferATI(buffer); - CHECK_GL_ERROR + } void extgl_InitATIMapObjectBuffer(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp index ccc9a856..240e7cf5 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIPnTriangles.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPNTrianglesiATIPROC) (GLenum pname, GLint param); typedef void (APIENTRY * glPNTrianglesfATIPROC) (GLenum pname, GLfloat param); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesfATI (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPNTrianglesfATI(pname, param); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIPnTriangles_glPNTrianglesiATI (JNIEnv * env, jclass clazz, jint pname, jint param) { glPNTrianglesiATI(pname, param); - CHECK_GL_ERROR + } void extgl_InitATIPNTriangles(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp b/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp index da1664b9..e325632b 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATISeparateStencil.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glStencilOpSeparateATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); typedef void (APIENTRY * glStencilFuncSeparateATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilOpSeparate (JNIEnv * env, jclass clazz, jint face, jint sfail, jint dpfail, jint dppass) { glStencilOpSeparateATI(face, sfail, dpfail, dppass); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATISeparateStencil_glStencilFuncSepara (JNIEnv * env, jclass clazz, jint frontfunc, jint backfunc, jint ref, jint mask) { glStencilFuncSeparateATI(frontfunc, backfunc, ref, mask); - CHECK_GL_ERROR + } void extgl_InitATISeparateStencil(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp index 077e99af..f737af53 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIVertexArrayObject.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef GLuint (APIENTRY * glNewObjectBufferATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); typedef GLboolean (APIENTRY * glIsObjectBufferATIPROC) (GLuint buffer); @@ -72,7 +72,7 @@ static jint JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglNewObjectBuffe { GLvoid *pPointer_ptr = safeGetBufferAddress(env, pPointer, pPointer_offset); GLuint result = glNewObjectBufferATI(size, pPointer_ptr, usage); - CHECK_GL_ERROR + return result; } @@ -84,7 +84,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glIsObjectBuf (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsObjectBufferATI(buffer); - CHECK_GL_ERROR + return result; } @@ -97,7 +97,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglUpdateObjectBu { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glUpdateObjectBufferATI(buffer, offset, size, pPointer_ptr, preserve); - CHECK_GL_ERROR + } /* @@ -109,7 +109,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBuffe { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetObjectBufferfvATI(buffer, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetObjectBuffe { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetObjectBufferivATI(buffer, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glFreeObjectBuffe (JNIEnv * env, jclass clazz, jint buffer) { glFreeObjectBufferATI(buffer); - CHECK_GL_ERROR + } /* @@ -143,7 +143,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glArrayObjectATI (JNIEnv * env, jclass clazz, jint array, jint size, jint type, jint stride, jint buffer, jint offset) { glArrayObjectATI(array, size, type, stride, buffer, offset); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObject { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetArrayObjectfvATI(array, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -167,7 +167,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetArrayObject { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetArrayObjectivATI(array, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -178,7 +178,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_glVariantArrayObj (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer, jint offset) { glVariantArrayObjectATI(id, type, stride, buffer, offset); - CHECK_GL_ERROR + } /* @@ -190,7 +190,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArra { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset_offset; glGetVariantArrayObjectfvATI(id, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -202,7 +202,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexArrayObject_nglGetVariantArra { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetVariantArrayObjectivATI(id, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitATIVertexArrayObject(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp index 97e166eb..b0cdd475 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIVertexAttribArrayObject.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glVertexAttribArrayObjectATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); typedef void (APIENTRY * glGetVertexAttribArrayObjectfvATIPROC) (GLuint index, GLenum pname, GLfloat *params); @@ -53,7 +53,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_glVertexAtt (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jboolean normalized, jint stride, jint buffer, jint offset) { glVertexAttribArrayObjectATI(index, size, type, normalized, stride, buffer, offset); - CHECK_GL_ERROR + } /* @@ -65,7 +65,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVerte { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribArrayObjectfvATI(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -77,7 +77,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexAttribArrayObject_nglGetVerte { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribArrayObjectivATI(index, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitATIVertexAttribArrayObject(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp b/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp index 8ff92504..f649d811 100644 --- a/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp +++ b/src/native/common/ati/org_lwjgl_opengl_ATIVertexStreams.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glClientActiveVertexStreamATIPROC) (GLenum stream); typedef void (APIENTRY * glVertexBlendEnviATIPROC) (GLenum pname, GLint param); @@ -85,7 +85,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x) { glVertexStream1fATI(stream, x); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1iATI (JNIEnv * env, jclass clazz, jint stream, jint x) { glVertexStream1iATI(stream, x); - CHECK_GL_ERROR + } /* @@ -107,7 +107,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream1sATI (JNIEnv * env, jclass clazz, jint stream, jshort x) { glVertexStream1sATI(stream, x); - CHECK_GL_ERROR + } /* @@ -118,7 +118,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y) { glVertexStream2fATI(stream, x, y); - CHECK_GL_ERROR + } /* @@ -129,7 +129,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y) { glVertexStream2iATI(stream, x, y); - CHECK_GL_ERROR + } /* @@ -140,7 +140,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream2sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y) { glVertexStream2sATI(stream, x, y); - CHECK_GL_ERROR + } /* @@ -151,7 +151,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { glVertexStream3fATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -162,7 +162,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { glVertexStream3iATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -173,7 +173,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream3sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { glVertexStream3sATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -184,7 +184,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexStream4fATI(stream, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -195,7 +195,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z, jint w) { glVertexStream4iATI(stream, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -206,7 +206,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexStream4sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z, jshort w) { glVertexStream4sATI(stream, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -217,7 +217,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3bATI (JNIEnv * env, jclass clazz, jint stream, jbyte x, jbyte y, jbyte z) { glNormalStream3bATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -228,7 +228,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3fATI (JNIEnv * env, jclass clazz, jint stream, jfloat x, jfloat y, jfloat z) { glNormalStream3fATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -239,7 +239,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3iATI (JNIEnv * env, jclass clazz, jint stream, jint x, jint y, jint z) { glNormalStream3iATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -250,7 +250,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glNormalStream3sATI (JNIEnv * env, jclass clazz, jint stream, jshort x, jshort y, jshort z) { glNormalStream3sATI(stream, x, y, z); - CHECK_GL_ERROR + } /* @@ -261,7 +261,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glClientActiveVertexS (JNIEnv * env, jclass clazz, jint stream) { glClientActiveVertexStreamATI(stream); - CHECK_GL_ERROR + } /* @@ -272,7 +272,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnvfATI (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glVertexBlendEnvfATI(pname, param); - CHECK_GL_ERROR + } /* @@ -283,7 +283,7 @@ static void JNICALL Java_org_lwjgl_opengl_ATIVertexStreams_glVertexBlendEnviATI (JNIEnv * env, jclass clazz, jint pname, jint param) { glVertexBlendEnviATI(pname, param); - CHECK_GL_ERROR + } void extgl_InitATIVertexStreams(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/checkGLerror.h b/src/native/common/checkGLerror.h deleted file mode 100644 index 167cda76..00000000 --- a/src/native/common/checkGLerror.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - checkGLerror.h - - Author: C. Prince - Created: 8 November 2001 - - Error checking for OpenGL bindings -*/ - -#ifndef _CHECKGLERROR_H_INCLUDED_ -#define _CHECKGLERROR_H_INCLUDED_ - -#include -#include "extgl.h" -#include "common_tools.h" - -#define CHECK_GL_ERROR \ - { \ - if (ISDEBUGENABLED()) { \ - int err = glGetError(); \ - if (err != GL_NO_ERROR) { \ - jclass cls = env->FindClass("org/lwjgl/opengl/OpenGLException"); \ - jmethodID ctor = env->GetMethodID(cls, "", "(I)V"); \ - jthrowable exception = (jthrowable)env->NewObject(cls, ctor, err); \ - env->Throw(exception); \ - env->DeleteLocalRef(cls); \ - } \ - } \ - } - -#endif /* _CHECKGLERROR_H_INCLUDED_ */ diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp index 45bae677..2f3b1a0c 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTBlendFuncSeparate.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glBlendFuncSeparateEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); @@ -49,7 +49,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTBlendFuncSeparate_glBlendFuncSepara (JNIEnv * env, jclass clazz, jint sfactorRGB, jint dfactorRGB, jint sfactorAlpha, jint dfactorAlpha) { glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); - CHECK_GL_ERROR + } void extgl_InitEXTBlendFuncSeparate(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp index 69f0f166..d0ff4907 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTCompiledVertexArray.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glLockArraysEXTPROC) (GLint first, GLsizei count); typedef void (APIENTRY * glUnlockArraysEXTPROC) (); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glLockArraysEXT (JNIEnv * env, jclass clazz, jint first, jint count) { glLockArraysEXT(first, count); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTCompiledVertexArray_glUnlockArraysE (JNIEnv * env, jclass clazz) { glUnlockArraysEXT(); - CHECK_GL_ERROR + } void extgl_InitEXTCompiledVertexArray(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp index f523b895..066733d6 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTDrawRangeElements.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glDrawRangeElementsEXTPROC) ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); @@ -50,7 +50,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeEleme { GLvoid *pIndices_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset); glDrawRangeElementsEXT(mode, start, end, count, type, pIndices_ptr); - CHECK_GL_ERROR + } /* @@ -61,7 +61,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTDrawRangeElements_nglDrawRangeEleme (JNIEnv * env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { glDrawRangeElementsEXT(mode, start, end, count, type, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTDrawRangeElements(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp index 6c8232fb..695f13d2 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTFogCoord.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glFogCoordfEXTPROC) (GLfloat coord); typedef void (APIENTRY * glFogCoordPointerEXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_glFogCoordfEXT (JNIEnv * env, jclass clazz, jfloat coord) { glFogCoordfEXT(coord); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXT { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glFogCoordPointerEXT(type, stride, data_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTFogCoord_nglFogCoordPointerEXTVBO (JNIEnv * env, jclass clazz, jint type, jint stride, jint buffer_offset) { glFogCoordPointerEXT(type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTFogCoord(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp index ecd332ea..c2282eae 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTMultiDrawArrays.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glMultiDrawArraysEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTMultiDrawArrays_nglMultiDrawArraysE GLint *piFirst_ptr = (GLint *)env->GetDirectBufferAddress(piFirst) + piFirst_offset; GLint *piCount_ptr = (GLint *)env->GetDirectBufferAddress(piCount) + piCount_offset; glMultiDrawArraysEXT(mode, piFirst_ptr, piCount_ptr, primcount); - CHECK_GL_ERROR + } void extgl_InitEXTMultiDrawArrays(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp index 2a86ed76..36b397a2 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTPointParameters.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPointParameterfEXTPROC) (GLenum pname, GLfloat param); typedef void (APIENTRY * glPointParameterfvEXTPROC) (GLenum pname, const GLfloat *params); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_glPointParameterfEX (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfEXT(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTPointParameters_nglPointParameterfv { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvEXT(pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitEXTPointParameters(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp index 918f3852..98d77495 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTSecondaryColor.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glSecondaryColor3bEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); typedef void (APIENTRY * glSecondaryColor3fEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); @@ -55,7 +55,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3bEX (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { glSecondaryColor3bEXT(red, green, blue); - CHECK_GL_ERROR + } /* @@ -66,7 +66,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3fEX (JNIEnv * env, jclass clazz, jfloat red, jfloat green, jfloat blue) { glSecondaryColor3fEXT(red, green, blue); - CHECK_GL_ERROR + } /* @@ -77,7 +77,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_glSecondaryColor3ubE (JNIEnv * env, jclass clazz, jbyte red, jbyte green, jbyte blue) { glSecondaryColor3ubEXT(red, green, blue); - CHECK_GL_ERROR + } /* @@ -89,7 +89,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPoi { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glSecondaryColorPointerEXT(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -100,7 +100,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTSecondaryColor_nglSecondaryColorPoi (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glSecondaryColorPointerEXT(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTSecondaryColor(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp index 4dfbdef3..143223fd 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTStencilTwoSide.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glActiveStencilFaceEXTPROC) (GLenum face); @@ -49,7 +49,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTStencilTwoSide_glActiveStencilFaceE (JNIEnv * env, jclass clazz, jint face) { glActiveStencilFaceEXT(face); - CHECK_GL_ERROR + } void extgl_InitEXTStencilTwoSide(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp index 2bcbf5bd..7629504a 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTVertexShader.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glBeginVertexShaderEXTPROC) (); typedef void (APIENTRY * glEndVertexShaderEXTPROC) (); @@ -129,7 +129,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBeginVertexShaderEXT (JNIEnv * env, jclass clazz) { glBeginVertexShaderEXT(); - CHECK_GL_ERROR + } /* @@ -140,7 +140,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEndVertexShaderEXT (JNIEnv * env, jclass clazz) { glEndVertexShaderEXT(); - CHECK_GL_ERROR + } /* @@ -151,7 +151,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindVertexShaderEXT (JNIEnv * env, jclass clazz, jint id) { glBindVertexShaderEXT(id); - CHECK_GL_ERROR + } /* @@ -162,7 +162,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenVertexShadersEXT (JNIEnv * env, jclass clazz, jint range) { GLuint result = glGenVertexShadersEXT(range); - CHECK_GL_ERROR + return result; } @@ -174,7 +174,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDeleteVertexShaderEX (JNIEnv * env, jclass clazz, jint id) { glDeleteVertexShaderEXT(id); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp1EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1) { glShaderOp1EXT(op, res, arg1); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp2EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2) { glShaderOp2EXT(op, res, arg1, arg2); - CHECK_GL_ERROR + } /* @@ -207,7 +207,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glShaderOp3EXT (JNIEnv * env, jclass clazz, jint op, jint res, jint arg1, jint arg2, jint arg3) { glShaderOp3EXT(op, res, arg1, arg2, arg3); - CHECK_GL_ERROR + } /* @@ -218,7 +218,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glSwizzleEXT (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { glSwizzleEXT(res, in, outX, outY, outZ, outW); - CHECK_GL_ERROR + } /* @@ -229,7 +229,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glWriteMaskEXT (JNIEnv * env, jclass clazz, jint res, jint in, jint outX, jint outY, jint outZ, jint outW) { glWriteMaskEXT(res, in, outX, outY, outZ, outW); - CHECK_GL_ERROR + } /* @@ -240,7 +240,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glInsertComponentEXT (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { glInsertComponentEXT(res, src, num); - CHECK_GL_ERROR + } /* @@ -251,7 +251,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glExtractComponentEXT (JNIEnv * env, jclass clazz, jint res, jint src, jint num) { glExtractComponentEXT(res, src, num); - CHECK_GL_ERROR + } /* @@ -262,7 +262,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGenSymbolsEXT (JNIEnv * env, jclass clazz, jint dataType, jint storageType, jint range, jint components) { GLuint result = glGenSymbolsEXT(dataType, storageType, range, components); - CHECK_GL_ERROR + return result; } @@ -275,7 +275,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetInvariantEXT { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glSetInvariantEXT(id, type, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -287,7 +287,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglSetLocalConstantEXT { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glSetLocalConstantEXT(id, type, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantbvEXT { GLbyte *pAddr_ptr = (GLbyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; glVariantbvEXT(id, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -311,7 +311,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantsvEXT { GLshort *psAddr_ptr = (GLshort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; glVariantsvEXT(id, psAddr_ptr); - CHECK_GL_ERROR + } /* @@ -323,7 +323,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantfvEXT { GLfloat *pfAddr_ptr = (GLfloat *)env->GetDirectBufferAddress(pfAddr) + pfAddr_offset; glVariantfvEXT(id, pfAddr_ptr); - CHECK_GL_ERROR + } /* @@ -335,7 +335,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantivEXT { GLint *piAddr_ptr = (GLint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; glVariantivEXT(id, piAddr_ptr); - CHECK_GL_ERROR + } /* @@ -347,7 +347,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantubvEXT { GLubyte *pAddr_ptr = (GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset; glVariantubvEXT(id, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -359,7 +359,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantusvEXT { GLushort *psAddr_ptr = (GLushort *)env->GetDirectBufferAddress(psAddr) + psAddr_offset; glVariantusvEXT(id, psAddr_ptr); - CHECK_GL_ERROR + } /* @@ -371,7 +371,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantuivEXT { GLuint *piAddr_ptr = (GLuint *)env->GetDirectBufferAddress(piAddr) + piAddr_offset; glVariantuivEXT(id, piAddr_ptr); - CHECK_GL_ERROR + } /* @@ -383,7 +383,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXT { GLvoid *pAddr_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pAddr) + pAddr_offset); glVariantPointerEXT(id, type, stride, pAddr_ptr); - CHECK_GL_ERROR + } /* @@ -394,7 +394,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglVariantPointerEXTVB (JNIEnv * env, jclass clazz, jint id, jint type, jint stride, jint buffer_offset) { glVariantPointerEXT(id, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } /* @@ -405,7 +405,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glEnableVariantClientS (JNIEnv * env, jclass clazz, jint id) { glEnableVariantClientStateEXT(id); - CHECK_GL_ERROR + } /* @@ -416,7 +416,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glDisableVariantClient (JNIEnv * env, jclass clazz, jint id) { glDisableVariantClientStateEXT(id); - CHECK_GL_ERROR + } /* @@ -427,7 +427,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindLightParameterEX (JNIEnv * env, jclass clazz, jint light, jint value) { GLuint result = glBindLightParameterEXT(light, value); - CHECK_GL_ERROR + return result; } @@ -439,7 +439,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindMaterialParamete (JNIEnv * env, jclass clazz, jint face, jint value) { GLuint result = glBindMaterialParameterEXT(face, value); - CHECK_GL_ERROR + return result; } @@ -451,7 +451,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTexGenParameterE (JNIEnv * env, jclass clazz, jint unit, jint coord, jint value) { GLuint result = glBindTexGenParameterEXT(unit, coord, value); - CHECK_GL_ERROR + return result; } @@ -463,7 +463,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindTextureUnitParam (JNIEnv * env, jclass clazz, jint unit, jint value) { GLuint result = glBindTextureUnitParameterEXT(unit, value); - CHECK_GL_ERROR + return result; } @@ -475,7 +475,7 @@ static jint JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glBindParameterEXT (JNIEnv * env, jclass clazz, jint value) { GLuint result = glBindParameterEXT(value); - CHECK_GL_ERROR + return result; } @@ -487,7 +487,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glIsVariantEnabled (JNIEnv * env, jclass clazz, jint id, jint cap) { GLboolean result = glIsVariantEnabledEXT(id, cap); - CHECK_GL_ERROR + return result; } @@ -500,7 +500,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantBooleanvE { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetVariantBooleanvEXT(id, value, pbData_ptr); - CHECK_GL_ERROR + } /* @@ -512,7 +512,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantIntegervE { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetVariantIntegervEXT(id, value, piData_ptr); - CHECK_GL_ERROR + } /* @@ -524,7 +524,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetVariantFloatvEXT { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetVariantFloatvEXT(id, value, pfData_ptr); - CHECK_GL_ERROR + } /* @@ -536,7 +536,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_EXTVertexShader_glGetVariantPointer { void *address; glGetVariantPointervEXT((GLuint)id, (GLuint)value, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } @@ -549,7 +549,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantBoolean { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetInvariantBooleanvEXT(id, value, pbData_ptr); - CHECK_GL_ERROR + } /* @@ -561,7 +561,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantInteger { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetInvariantIntegervEXT(id, value, piData_ptr); - CHECK_GL_ERROR + } /* @@ -573,7 +573,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetInvariantFloatvE { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetInvariantFloatvEXT(id, value, pfData_ptr); - CHECK_GL_ERROR + } /* @@ -585,7 +585,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantBoo { GLubyte *pbData_ptr = (GLubyte *)env->GetDirectBufferAddress(pbData) + pbData_offset; glGetLocalConstantBooleanvEXT(id, value, pbData_ptr); - CHECK_GL_ERROR + } /* @@ -597,7 +597,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantInt { GLint *piData_ptr = (GLint *)env->GetDirectBufferAddress(piData) + piData_offset; glGetLocalConstantIntegervEXT(id, value, piData_ptr); - CHECK_GL_ERROR + } /* @@ -609,7 +609,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexShader_nglGetLocalConstantFlo { GLfloat *pfData_ptr = (GLfloat *)env->GetDirectBufferAddress(pfData) + pfData_offset; glGetLocalConstantFloatvEXT(id, value, pfData_ptr); - CHECK_GL_ERROR + } void extgl_InitEXTVertexShader(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp b/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp index 82ae9be6..fe1c41ff 100644 --- a/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp +++ b/src/native/common/ext/org_lwjgl_opengl_EXTVertexWeighting.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glVertexWeightfEXTPROC) (GLfloat weight); typedef void (APIENTRY * glVertexWeightPointerEXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_glVertexWeightfEXT (JNIEnv * env, jclass clazz, jfloat weight) { glVertexWeightfEXT(weight); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPoin { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glVertexWeightPointerEXT(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ static void JNICALL Java_org_lwjgl_opengl_EXTVertexWeighting_nglVertexWeightPoin (JNIEnv * env, jclass clazz, jint size, jint type, jint stride, jint buffer_offset) { glVertexWeightPointerEXT(size, type, stride, (GLvoid *)buffer_offset); - CHECK_GL_ERROR + } void extgl_InitEXTVertexWeighting(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp b/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp index bfbc2cf3..99a719bf 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVEvaluators.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glMapControlPointsNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); typedef void (APIENTRY * glMapParameterivNVPROC) (GLenum target, GLenum pname, const GLint *params); @@ -66,7 +66,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapControlPointsNV { GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); glGetMapControlPointsNV(target, index, type, ustride, vstride, packed, pPoints_ptr); - CHECK_GL_ERROR + } /* @@ -78,7 +78,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapControlPointsNV { GLvoid *pPoints_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPoints) + pPoints_offset); glMapControlPointsNV(target, index, type, ustride, vstride, uorder, vorder, packed, pPoints_ptr); - CHECK_GL_ERROR + } /* @@ -90,7 +90,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterfvNV { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glMapParameterfvNV(target, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglMapParameterivNV { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glMapParameterivNV(target, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterfvNV { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetMapParameterfvNV(target, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -126,7 +126,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapParameterivNV { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetMapParameterivNV(target, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -138,7 +138,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameterf { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetMapAttribParameterfvNV(target, index, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_nglGetMapAttribParameteri { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetMapAttribParameterivNV(target, index, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVEvaluators_glEvalMapsNV (JNIEnv * env, jclass clazz, jint target, jint mode) { glEvalMapsNV(target, mode); - CHECK_GL_ERROR + } void extgl_InitNVEvaluators(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp b/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp index fd24c1fe..1e751d21 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVFence.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glGenFencesNVPROC) (GLsizei n, GLuint *fences); typedef void (APIENTRY * glDeleteFencesNVPROC) (GLsizei n, const GLuint *fences); @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFence_nglGenFencesNV { GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; glGenFencesNV(n, piFences_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFence_nglDeleteFencesNV { GLuint *piFences_ptr = (GLuint *)env->GetDirectBufferAddress(piFences) + piFences_offset; glDeleteFencesNV(n, piFences_ptr); - CHECK_GL_ERROR + } /* @@ -85,7 +85,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFence_glSetFenceNV (JNIEnv * env, jclass clazz, jint fence, jint condition) { glSetFenceNV(fence, condition); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glTestFenceNV (JNIEnv * env, jclass clazz, jint fence) { GLboolean result = glTestFenceNV(fence); - CHECK_GL_ERROR + return result; } @@ -108,7 +108,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFence_glFinishFenceNV (JNIEnv * env, jclass clazz, jint fence) { glFinishFenceNV(fence); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_NVFence_glIsFenceNV (JNIEnv * env, jclass clazz, jint fence) { GLboolean result = glIsFenceNV(fence); - CHECK_GL_ERROR + return result; } @@ -132,7 +132,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFence_nglGetFenceivNV { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetFenceivNV(fence, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVFence(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp b/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp index 744481c1..017baf18 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVFragmentProgram.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glProgramNamedParameter4fNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); typedef void (APIENTRY * glProgramLocalParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); @@ -56,7 +56,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglProgramNamedParam { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; glProgramNamedParameter4fNV(id, length, name_ptr, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -69,7 +69,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramNamedPa GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramNamedParameterfvNV(id, length, name_ptr, params_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_glProgramLocalParame (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramLocalParameter4fARB(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVFragmentProgram_nglGetProgramLocalPa { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + params_offset; glGetProgramLocalParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } void extgl_InitNVFragmentProgram(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp b/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp index ae5abacc..eeef2ca4 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVHalfFloat.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned short GLhalf; @@ -97,7 +97,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex2hNV (JNIEnv * env, jclass clazz, jshort x, jshort y) { glVertex2hNV(x, y); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex3hNV (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z) { glVertex3hNV(x, y, z); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertex4hNV (JNIEnv * env, jclass clazz, jshort x, jshort y, jshort z, jshort w) { glVertex4hNV(x, y, z, w); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glNormal3hNV (JNIEnv * env, jclass clazz, jshort nx, jshort ny, jshort nz) { glNormal3hNV(nx, ny, nz); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor3hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { glColor3hNV(red, green, blue); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glColor4hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue, jshort alpha) { glColor4hNV(red, green, blue, alpha); - CHECK_GL_ERROR + } /* @@ -163,7 +163,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord1hNV (JNIEnv * env, jclass clazz, jshort s) { glTexCoord1hNV(s); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord2hNV (JNIEnv * env, jclass clazz, jshort s, jshort t) { glTexCoord2hNV(s, t); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord3hNV (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r) { glTexCoord3hNV(s, t, r); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glTexCoord4hNV (JNIEnv * env, jclass clazz, jshort s, jshort t, jshort r, jshort q) { glTexCoord4hNV(s, t, r, q); - CHECK_GL_ERROR + } /* @@ -207,7 +207,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord1hNV (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1hNV(target, s); - CHECK_GL_ERROR + } /* @@ -218,7 +218,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord2hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2hNV(target, s, t); - CHECK_GL_ERROR + } /* @@ -229,7 +229,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord3hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3hNV(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -240,7 +240,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glMultiTexCoord4hNV (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r, jshort q) { glMultiTexCoord4hNV(target, s, t, r, q); - CHECK_GL_ERROR + } /* @@ -251,7 +251,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glFogCoordhNV (JNIEnv * env, jclass clazz, jshort fog) { glFogCoordhNV(fog); - CHECK_GL_ERROR + } /* @@ -262,7 +262,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glSecondaryColor3hNV (JNIEnv * env, jclass clazz, jshort red, jshort green, jshort blue) { glSecondaryColor3hNV(red, green, blue); - CHECK_GL_ERROR + } /* @@ -273,7 +273,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib1hNV (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1hNV(index, x); - CHECK_GL_ERROR + } /* @@ -284,7 +284,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib2hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2hNV(index, x, y); - CHECK_GL_ERROR + } /* @@ -295,7 +295,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib3hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3hNV(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -306,7 +306,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_glVertexAttrib4hNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4hNV(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -318,7 +318,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs1hvNV { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs1hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } /* @@ -330,7 +330,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs2hvNV { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs2hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } /* @@ -342,7 +342,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs3hvNV { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs3hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } /* @@ -354,7 +354,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVHalfFloat_nglVertexAttribs4hvNV { GLushort *attribs_ptr = (GLushort *)env->GetDirectBufferAddress(attribs) + attribsOffset; glVertexAttribs4hvNV(index, n, attribs_ptr); - CHECK_GL_ERROR + } void extgl_InitNVHalfFloat(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp b/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp index 63bd03e4..385004b8 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVOcclusionQuery.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glGenOcclusionQueriesNVPROC) (GLsizei n, GLuint *ids); typedef void (APIENTRY * glDeleteOcclusionQueriesNVPROC) (GLsizei n, const GLuint *ids); @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGenOcclusionQuerie { GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; glGenOcclusionQueriesNV(n, piIDs_ptr); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglDeleteOcclusionQue { GLuint *piIDs_ptr = (GLuint *)env->GetDirectBufferAddress(piIDs) + piIDs_offset; glDeleteOcclusionQueriesNV(n, piIDs_ptr); - CHECK_GL_ERROR + } /* @@ -85,7 +85,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glIsOcclusionQuer (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsOcclusionQueryNV(id); - CHECK_GL_ERROR + return result; } @@ -97,7 +97,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glBeginOcclusionQuery (JNIEnv * env, jclass clazz, jint id) { glBeginOcclusionQueryNV(id); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_glEndOcclusionQueryNV (JNIEnv * env, jclass clazz) { glEndOcclusionQueryNV(); - CHECK_GL_ERROR + } /* @@ -120,7 +120,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryi { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetOcclusionQueryivNV(id, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVOcclusionQuery_nglGetOcclusionQueryu { GLuint *piParams_ptr = (GLuint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetOcclusionQueryuivNV(id, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVOcclusionQuery(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp b/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp index b267ebd5..c41a5804 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVPixelDataRange.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPixelDataRangeNVPROC) (GLenum target, GLsizei length, GLvoid *pointer); typedef void (APIENTRY * glFlushPixelDataRangeNVPROC) (GLenum target); @@ -52,7 +52,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_nglPixelDataRangeNV { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + dataOffset); glPixelDataRangeNV(target, length, data_ptr); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVPixelDataRange_glFlushPixelDataRange (JNIEnv * env, jclass clazz, jint target) { glFlushPixelDataRangeNV(target); - CHECK_GL_ERROR + } void extgl_InitNVPixelDataRange(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp b/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp index 0a7c3bdd..464b6c80 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVPointSprite.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPointParameteriNVPROC) (GLenum pname, GLint param); typedef void (APIENTRY * glPointParameterivNVPROC) (GLenum pname, const GLint *params); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVPointSprite_glPointParameteriNV (JNIEnv * env, jclass clazz, jint pname, jint param) { glPointParameteriNV(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVPointSprite_nglPointParameterivNV { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glPointParameterivNV(pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVPointSprite(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp b/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp index 43142e8c..ba342c9f 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVPrimitiveRestart.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glPrimitiveRestartNVPROC) (GLvoid); typedef void (APIENTRY * glPrimitiveRestartIndexNVPROC) (GLuint index); @@ -51,7 +51,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartN (JNIEnv * env, jclass clazz) { glPrimitiveRestartNV(); - CHECK_GL_ERROR + } /* @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVPrimitiveRestart_glPrimitiveRestartI (JNIEnv * env, jclass clazz, jint index) { glPrimitiveRestartIndexNV(index); - CHECK_GL_ERROR + } void extgl_InitNVPrimitiveRestart(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp b/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp index ece631e4..75d89958 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVProgram.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glLoadProgramNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); typedef void (APIENTRY * glBindProgramNVPROC) (GLenum target, GLuint id); @@ -66,7 +66,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglLoadProgramNV { const GLubyte *string_ptr = (const GLubyte *)env->GetDirectBufferAddress(string) + stringOffset; glLoadProgramNV(target, programID, length, string_ptr); - CHECK_GL_ERROR + } /* @@ -77,7 +77,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_glBindProgramNV (JNIEnv * env, jclass clazz, jint target, jint programID) { glBindProgramNV(target, programID); - CHECK_GL_ERROR + } /* @@ -89,7 +89,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglDeleteProgramsNV { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glDeleteProgramsNV(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -101,7 +101,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGenProgramsNV { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glGenProgramsNV(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -113,7 +113,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGetProgramivNV { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramivNV(programID, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -125,7 +125,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglGetProgramStringNV { GLubyte *paramString_ptr = (GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset; glGetProgramStringNV(programID, parameterName, paramString_ptr); - CHECK_GL_ERROR + } /* @@ -136,7 +136,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_NVProgram_glIsProgramNV (JNIEnv * env, jclass clazz, jint programID) { GLboolean result = glIsProgramNV(programID); - CHECK_GL_ERROR + return result; } @@ -150,7 +150,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_NVProgram_nglAreProgramsResidentNV GLuint *programIDs_ptr = (GLuint *)env->GetDirectBufferAddress(programIDs) + programIDsOffset; GLubyte *programResidences_ptr = (GLubyte *)env->GetDirectBufferAddress(programResidences) + programResidencesOffset; GLboolean result = glAreProgramsResidentNV(n, programIDs_ptr, programResidences_ptr); - CHECK_GL_ERROR + return result; } @@ -163,7 +163,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVProgram_nglRequestResidentProgramsNV { GLuint *programIDs_ptr = (GLuint *)env->GetDirectBufferAddress(programIDs) + programIDsOffset; glRequestResidentProgramsNV(n, programIDs_ptr); - CHECK_GL_ERROR + } void extgl_InitNVProgram(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp index 3a9b97f0..0f91fa4e 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCombinerParameterfvNVPROC) (GLenum pname, const GLfloat *params); typedef void (APIENTRY * glCombinerParameterfNVPROC) (GLenum pname, GLfloat param); @@ -73,7 +73,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParamete (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glCombinerParameterfNV(pname, param); - CHECK_GL_ERROR + } /* @@ -85,7 +85,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParamet { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glCombinerParameterfvNV(pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerParamete (JNIEnv * env, jclass clazz, jint pname, jint param) { glCombinerParameteriNV(pname, param); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglCombinerParamet { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glCombinerParameterivNV(pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerInputNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint variable, jint input, jint mapping, jint componentUsage) { glCombinerInputNV(stage, portion, variable, input, mapping, componentUsage); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glCombinerOutputNV (JNIEnv * env, jclass clazz, jint stage, jint portion, jint abOutput, jint cdOutput, jint sumOutput, jint scale, jint bias, jboolean abDotProduct, jboolean cdDotProduct, jboolean muxSum) { glCombinerOutputNV(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_glFinalCombinerInp (JNIEnv * env, jclass clazz, jint variable, jint input, jint mapping, jint componentUsage) { glFinalCombinerInputNV(variable, input, mapping, componentUsage); - CHECK_GL_ERROR + } /* @@ -153,7 +153,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerInpu { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetCombinerInputParameterfvNV(stage, portion, variable, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -165,7 +165,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerInpu { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetCombinerInputParameterivNV(stage, portion, variable, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -177,7 +177,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerOutp { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetCombinerOutputParameterfvNV(stage, portion, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -189,7 +189,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetCombinerOutp { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + pfParams_offset; glGetCombinerOutputParameterivNV(stage, portion, pname, piParams_ptr); - CHECK_GL_ERROR + } /* @@ -201,7 +201,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombine { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetFinalCombinerInputParameterfvNV(variable, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -213,7 +213,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners_nglGetFinalCombine { GLint *piParams_ptr = (GLint *)env->GetDirectBufferAddress(piParams) + piParams_offset; glGetFinalCombinerInputParameterivNV(variable, pname, piParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVRegisterCombiners(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp index e520b562..51dd1f59 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVRegisterCombiners2.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); typedef void (APIENTRY * glGetCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, GLfloat *params); @@ -52,7 +52,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners2_nglCombinerStageP { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glCombinerStageParameterfvNV(stage, pname, pfParams_ptr); - CHECK_GL_ERROR + } /* @@ -64,7 +64,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVRegisterCombiners2_nglGetCombinerSta { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glGetCombinerStageParameterfvNV(stage, pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitNVRegisterCombiners2(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp b/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp index 02977bae..215161b5 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVVertexArrayRange.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glFlushVertexArrayRangeNVPROC) (void); typedef void (APIENTRY * glVertexArrayRangeNVPROC) (GLsizei size, const GLvoid *pointer); @@ -72,7 +72,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_nglVertexArrayRange { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glVertexArrayRangeNV(size, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -83,7 +83,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexArrayRange_glFlushVertexArrayR (JNIEnv * env, jclass clazz) { glFlushVertexArrayRangeNV(); - CHECK_GL_ERROR + } #ifdef _X11 diff --git a/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp b/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp index 1dc95bba..7ddc86ac 100644 --- a/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp +++ b/src/native/common/nv/org_lwjgl_opengl_NVVertexProgram.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef void (APIENTRY * glExecuteProgramNVPROC) (GLenum target, GLuint id, const GLfloat *params); typedef void (APIENTRY * glGetProgramParameterfvNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); @@ -104,7 +104,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglExecuteProgramNV { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glExecuteProgramNV(target, id, params_ptr); - CHECK_GL_ERROR + } /* @@ -116,7 +116,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetProgramParameter { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramParameterfvNV(target, index, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -128,7 +128,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetTrackMatrixivNV { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetTrackMatrixivNV(target, address, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -140,7 +140,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribfvNV { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribfvNV(index, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglGetVertexAttribivNV { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribivNV(index, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -164,7 +164,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glGetVertexAttribPo { void *address; glGetVertexAttribPointervNV((GLuint)index, (GLuint)parameterName, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } @@ -176,7 +176,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glProgramParameter4fNV (JNIEnv * env, jclass clazz, jint target, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glProgramParameter4fNV(target, index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -188,7 +188,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglProgramParameters4f { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramParameters4fvNV(target, index, count, params_ptr); - CHECK_GL_ERROR + } /* @@ -199,7 +199,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glTrackMatrixNV (JNIEnv * env, jclass clazz, jint target, jint address, jint matrix, jint transform) { glTrackMatrixNV(target, address, matrix, transform); - CHECK_GL_ERROR + } /* @@ -211,7 +211,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointer { GLvoid *buffer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(buffer) + bufferOffset); glVertexAttribPointerNV(index, size, type, stride, buffer_ptr); - CHECK_GL_ERROR + } /* @@ -222,7 +222,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribPointer (JNIEnv * env, jclass clazz, jint index, jint size, jint type, jint stride, jint bufferOffset) { glVertexAttribPointerNV(index, size, type, stride, (GLvoid *)bufferOffset); - CHECK_GL_ERROR + } /* @@ -233,7 +233,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib1sNV (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1sNV(index, x); - CHECK_GL_ERROR + } /* @@ -244,7 +244,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib1fNV (JNIEnv * env, jclass clazz, jint index, jfloat x) { glVertexAttrib1fNV(index, x); - CHECK_GL_ERROR + } /* @@ -255,7 +255,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib2sNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2sNV(index, x, y); - CHECK_GL_ERROR + } /* @@ -266,7 +266,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib2fNV (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y) { glVertexAttrib2fNV(index, x, y); - CHECK_GL_ERROR + } /* @@ -277,7 +277,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib3sNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3sNV(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -288,7 +288,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib3fNV (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z) { glVertexAttrib3fNV(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4sNV (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z, jshort w) { glVertexAttrib4sNV(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -310,7 +310,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4fNV (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z, jfloat w) { glVertexAttrib4fNV(index, x, y, z, w); - CHECK_GL_ERROR + } /* @@ -321,7 +321,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_glVertexAttrib4ubNV (JNIEnv * env, jclass clazz, jint index, jbyte x, jbyte y, jbyte z, jbyte w) { glVertexAttrib4ubNV(index, x, y, z, w); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1svNV @@ -329,7 +329,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1svNV { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs1svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1fvNV @@ -337,7 +337,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs1fvNV { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs1fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2svNV @@ -345,7 +345,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2svNV { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs2svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2fvNV @@ -353,7 +353,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs2fvNV { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs2fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3svNV @@ -361,7 +361,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3svNV { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs3svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3fvNV @@ -369,7 +369,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs3fvNV { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs3fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4svNV @@ -377,7 +377,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4svNV { GLshort *v_ptr = (GLshort *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs4svNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4fvNV @@ -385,7 +385,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4fvNV { GLfloat *v_ptr = (GLfloat *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs4fvNV(index, n, v_ptr); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4ubvNV @@ -393,7 +393,7 @@ static void JNICALL Java_org_lwjgl_opengl_NVVertexProgram_nglVertexAttribs4ubvNV { GLubyte *v_ptr = (GLubyte *)env->GetDirectBufferAddress(v) + v_offset; glVertexAttribs4ubvNV(index, n, v_ptr); - CHECK_GL_ERROR + } void extgl_InitNVVertexProgram(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/org_lwjgl_opengl_GL11.cpp b/src/native/common/org_lwjgl_opengl_GL11.cpp index 110bc180..5a6dfcda 100644 --- a/src/native/common/org_lwjgl_opengl_GL11.cpp +++ b/src/native/common/org_lwjgl_opengl_GL11.cpp @@ -39,8 +39,8 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" +#include "common_tools.h" typedef void (APIENTRY * glAccumPROC) (GLenum op, GLfloat value); typedef void (APIENTRY * glAlphaFuncPROC) (GLenum func, GLclampf ref); @@ -454,7 +454,7 @@ static glViewportPROC glViewport; static void JNICALL Java_org_lwjgl_opengl_GL11_glAccum(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glAccum((GLint) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -464,7 +464,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glAccum(JNIEnv * env, jclass claz static void JNICALL Java_org_lwjgl_opengl_GL11_glAlphaFunc(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glAlphaFunc((GLint) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -474,7 +474,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glAlphaFunc(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glClearColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glClearColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -484,7 +484,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glClearColor(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glClearAccum(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glClearAccum((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -494,7 +494,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glClearAccum(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glClear(JNIEnv * env, jclass clazz, jint p0) { glClear((GLint) p0); - CHECK_GL_ERROR + } /* @@ -505,7 +505,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglCallLists(JNIEnv * env, jclass { GLbyte *lists = (GLbyte *)env->GetDirectBufferAddress(lists_buffer); glCallLists((GLint) p0, (GLint) p1, (const void *)(lists + lists_offset)); - CHECK_GL_ERROR + } /* @@ -515,7 +515,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglCallLists(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glCallList(JNIEnv * env, jclass clazz, jint p0) { glCallList((GLint) p0); - CHECK_GL_ERROR + } /* @@ -525,7 +525,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glCallList(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glBlendFunc(JNIEnv * env, jclass clazz, jint p0, jint p1) { glBlendFunc((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -536,7 +536,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmap(JNIEnv * env, jclass cl { const GLubyte *image = (const GLubyte *)env->GetDirectBufferAddress(image_buffer); glBitmap((GLint) p0, (GLint) p1, (GLfloat) p2, (GLfloat) p3, (GLfloat) p4, (GLfloat) p5, image + image_offset); - CHECK_GL_ERROR + } /* @@ -546,7 +546,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglBitmap(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glBindTexture(JNIEnv * env, jclass clazz, jint p0, jint p1) { glBindTexture((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -565,7 +565,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glBegin(JNIEnv * env, jclass claz static void JNICALL Java_org_lwjgl_opengl_GL11_glEnd(JNIEnv * env, jclass clazz) { glEnd(); - CHECK_GL_ERROR + } /* @@ -584,7 +584,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glArrayElement(JNIEnv * env, jcla static void JNICALL Java_org_lwjgl_opengl_GL11_glClearDepth(JNIEnv * env, jclass clazz, jdouble p0) { glClearDepth((GLdouble) p0); - CHECK_GL_ERROR + } /* @@ -594,7 +594,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glClearDepth(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glDeleteLists(JNIEnv * env, jclass clazz, jint p0, jint p1) { glDeleteLists((GLuint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -605,7 +605,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglDeleteTextures(JNIEnv * env, j { const GLuint *address = (const GLuint *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glDeleteTextures((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -615,7 +615,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglDeleteTextures(JNIEnv * env, j static void JNICALL Java_org_lwjgl_opengl_GL11_glCullFace(JNIEnv * env, jclass clazz, jint p0) { glCullFace((GLint) p0); - CHECK_GL_ERROR + } /* @@ -625,7 +625,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glCullFace(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexSubImage2D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jint p7) { glCopyTexSubImage2D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, (GLint) p7); - CHECK_GL_ERROR + } /* @@ -635,7 +635,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexSubImage2D(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexSubImage1D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5) { glCopyTexSubImage1D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5); - CHECK_GL_ERROR + } /* @@ -645,7 +645,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexSubImage1D(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexImage2D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6, jint p7) { glCopyTexImage2D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, (GLint) p7); - CHECK_GL_ERROR + } /* @@ -655,7 +655,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexImage2D(JNIEnv * env, jc static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexImage1D(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4, jint p5, jint p6) { glCopyTexImage1D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6); - CHECK_GL_ERROR + } /* @@ -665,7 +665,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyTexImage1D(JNIEnv * env, jc static void JNICALL Java_org_lwjgl_opengl_GL11_glCopyPixels(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4) { glCopyPixels((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4); - CHECK_GL_ERROR + } /* @@ -676,7 +676,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointer(JNIEnv * env, jcl { const GLbyte *address = (const GLbyte *)env->GetDirectBufferAddress(buffer); glColorPointer((GLint) p0, (GLint) p1, (GLint) p2, (const void *) (address + buffer_offset)); - CHECK_GL_ERROR + } /* @@ -686,7 +686,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointer(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointerVBO(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint buffer_offset) { glColorPointer((GLint) p0, (GLint) p1, (GLint) p2, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -696,7 +696,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglColorPointerVBO(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_glColorMaterial(JNIEnv * env, jclass clazz, jint p0, jint p1) { glColorMaterial((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -706,7 +706,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glColorMaterial(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_glColorMask(JNIEnv * env, jclass clazz, jboolean p0, jboolean p1, jboolean p2, jboolean p3) { glColorMask((GLboolean) p0, (GLboolean) p1, (GLboolean) p2, (GLboolean) p3); - CHECK_GL_ERROR + } /* @@ -771,7 +771,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglClipPlane(JNIEnv * env, jclass { const GLdouble *address = offset + (const GLdouble *)env->GetDirectBufferAddress(buffer); glClipPlane((GLint) p0, address + offset); - CHECK_GL_ERROR + } /* @@ -781,7 +781,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglClipPlane(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glClearStencil(JNIEnv * env, jclass clazz, jint p0) { glClearStencil((GLint) p0); - CHECK_GL_ERROR + } /* @@ -791,7 +791,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glClearStencil(JNIEnv * env, jcla static void JNICALL Java_org_lwjgl_opengl_GL11_glClearIndex(JNIEnv * env, jclass clazz, jfloat p0) { glClearIndex((GLfloat) p0); - CHECK_GL_ERROR + } /* @@ -801,7 +801,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glClearIndex(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalPoint1(JNIEnv * env, jclass clazz, jint p0) { glEvalPoint1((GLint) p0); - CHECK_GL_ERROR + } /* @@ -811,7 +811,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalPoint1(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalPoint2(JNIEnv * env, jclass clazz, jint p0, jint p1) { glEvalPoint2((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -821,7 +821,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalPoint2(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalMesh1(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glEvalMesh1((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -831,7 +831,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalMesh1(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalMesh2(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3, jint p4) { glEvalMesh2((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4); - CHECK_GL_ERROR + } /* @@ -841,7 +841,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalMesh2(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalCoord1f(JNIEnv * env, jclass clazz, jfloat p0) { glEvalCoord1f((GLfloat) p0); - CHECK_GL_ERROR + } /* @@ -851,7 +851,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalCoord1f(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalCoord2f(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1) { glEvalCoord2f((GLfloat) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -861,7 +861,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEvalCoord2f(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glEnableClientState(JNIEnv * env, jclass clazz, jint p0) { glEnableClientState((GLint) p0); - CHECK_GL_ERROR + } /* @@ -871,7 +871,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEnableClientState(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_glDisableClientState(JNIEnv * env, jclass clazz, jint p0) { glDisableClientState((GLint) p0); - CHECK_GL_ERROR + } /* @@ -881,7 +881,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glDisableClientState(JNIEnv * env static void JNICALL Java_org_lwjgl_opengl_GL11_glEnable(JNIEnv * env, jclass clazz, jint p0) { glEnable((GLint) p0); - CHECK_GL_ERROR + } /* @@ -891,7 +891,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glEnable(JNIEnv * env, jclass cla static void JNICALL Java_org_lwjgl_opengl_GL11_glDisable(JNIEnv * env, jclass clazz, jint p0) { glDisable((GLint) p0); - CHECK_GL_ERROR + } /* @@ -902,7 +902,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointer(JNIEnv * env, { const GLbyte *address = offset + (const GLbyte *)env->GetDirectBufferAddress(buffer); glEdgeFlagPointer((GLint) p0, (const void *)address); - CHECK_GL_ERROR + } /* @@ -912,7 +912,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointer(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_nglEdgeFlagPointerVBO(JNIEnv * env, jclass clazz, jint p0, jint buffer_offset) { glEdgeFlagPointer((GLint) p0, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -932,7 +932,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawPixels(JNIEnv * env, jclas { const GLbyte *address = (const GLbyte *)env->GetDirectBufferAddress(buffer); glDrawPixels((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (const void *)(address + offset)); - CHECK_GL_ERROR + } /* @@ -943,7 +943,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElements(JNIEnv * env, jcl { const GLbyte *address = (const GLbyte *)env->GetDirectBufferAddress(buffer); glDrawElements((GLint) p0, (GLint) p1, (GLint) p2, (const void *)(address + offset)); - CHECK_GL_ERROR + } /* @@ -953,7 +953,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElements(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElementsVBO(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint buffer_offset) { glDrawElements((GLint) p0, (GLint) p1, (GLint) p2, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -963,7 +963,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglDrawElementsVBO(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_glDrawBuffer(JNIEnv * env, jclass clazz, jint p0) { glDrawBuffer((GLint) p0); - CHECK_GL_ERROR + } /* @@ -973,7 +973,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glDrawBuffer(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glDrawArrays(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glDrawArrays((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -983,7 +983,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glDrawArrays(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glDepthRange(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1) { glDepthRange((GLdouble) p0, (GLdouble) p1); - CHECK_GL_ERROR + } /* @@ -993,7 +993,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glDepthRange(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glDepthMask(JNIEnv * env, jclass clazz, jboolean p0) { glDepthMask((GLboolean) p0); - CHECK_GL_ERROR + } /* @@ -1003,7 +1003,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glDepthMask(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glDepthFunc(JNIEnv * env, jclass clazz, jint p0) { glDepthFunc((GLint) p0); - CHECK_GL_ERROR + } /* @@ -1014,7 +1014,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglFeedbackBuffer(JNIEnv * env, j { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glFeedbackBuffer((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1025,7 +1025,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapfv(JNIEnv * env, jc { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetPixelMapfv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1036,7 +1036,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapuiv(JNIEnv * env, j { GLuint *address = offset + (GLuint *)env->GetDirectBufferAddress(buffer); glGetPixelMapuiv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1047,7 +1047,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPixelMapusv(JNIEnv * env, j { GLushort *address = (GLushort *)env->GetDirectBufferAddress(buffer); glGetPixelMapusv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1058,7 +1058,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetMaterialfv(JNIEnv * env, jc { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetMaterialfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1069,7 +1069,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetMaterialiv(JNIEnv * env, jc { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetMaterialiv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1080,7 +1080,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetMapfv(JNIEnv * env, jclass { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetMapfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1091,7 +1091,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetMapiv(JNIEnv * env, jclass { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetMapiv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1102,7 +1102,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetLightfv(JNIEnv * env, jclas { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetLightfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1113,7 +1113,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetLightiv(JNIEnv * env, jclas { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetLightiv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1123,7 +1123,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetLightiv(JNIEnv * env, jclas static jint JNICALL Java_org_lwjgl_opengl_GL11_glGetError(JNIEnv * env, jclass clazz) { jint ret = (jint) glGetError(); - CHECK_GL_ERROR + return ret; } @@ -1135,7 +1135,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetClipPlane(JNIEnv * env, jcl { GLdouble *address = offset + (GLdouble *)env->GetDirectBufferAddress(buffer); glGetClipPlane((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1146,7 +1146,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetBooleanv(JNIEnv * env, jcla { GLubyte *address = offset + (GLubyte *)env->GetDirectBufferAddress(buffer); glGetBooleanv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1157,7 +1157,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetDoublev(JNIEnv * env, jclas { GLdouble *address = offset + (GLdouble *)env->GetDirectBufferAddress(buffer); glGetDoublev((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1168,7 +1168,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetFloatv(JNIEnv * env, jclass { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetFloatv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1179,7 +1179,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetIntegerv(JNIEnv * env, jcla { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetIntegerv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1190,7 +1190,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGenTextures(JNIEnv * env, jcla { GLuint *address = offset + (GLuint *)env->GetDirectBufferAddress(buffer); glGenTextures((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1200,7 +1200,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGenTextures(JNIEnv * env, jcla static jint JNICALL Java_org_lwjgl_opengl_GL11_glGenLists(JNIEnv * env, jclass clazz, jint p0) { jint ret = (jint) glGenLists((GLint) p0); - CHECK_GL_ERROR + return ret; } @@ -1211,7 +1211,7 @@ static jint JNICALL Java_org_lwjgl_opengl_GL11_glGenLists(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glFrustum(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jdouble p4, jdouble p5) { glFrustum((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3, (GLdouble) p4, (GLdouble) p5); - CHECK_GL_ERROR + } /* @@ -1221,7 +1221,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glFrustum(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glFrontFace(JNIEnv * env, jclass clazz, jint p0) { glFrontFace((GLint) p0); - CHECK_GL_ERROR + } /* @@ -1231,7 +1231,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glFrontFace(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glFogf(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glFogf((GLint) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -1241,7 +1241,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glFogf(JNIEnv * env, jclass clazz static void JNICALL Java_org_lwjgl_opengl_GL11_glFogi(JNIEnv * env, jclass clazz, jint p0, jint p1) { glFogi((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1252,7 +1252,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglFogfv(JNIEnv * env, jclass cla { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glFogfv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1263,7 +1263,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglFogiv(JNIEnv * env, jclass cla { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glFogiv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1273,7 +1273,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglFogiv(JNIEnv * env, jclass cla static void JNICALL Java_org_lwjgl_opengl_GL11_glFlush(JNIEnv * env, jclass clazz) { glFlush(); - CHECK_GL_ERROR + } /* @@ -1283,7 +1283,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glFlush(JNIEnv * env, jclass claz static void JNICALL Java_org_lwjgl_opengl_GL11_glFinish(JNIEnv * env, jclass clazz) { glFinish(); - CHECK_GL_ERROR + } /* @@ -1294,7 +1294,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_GL11_glGetPointerv(JNIEnv * env, jc { void *pointer; glGetPointerv((GLint) p0, &pointer); - CHECK_GL_ERROR + return safeNewBuffer(env, pointer, size); } @@ -1305,7 +1305,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_GL11_glGetPointerv(JNIEnv * env, jc static jboolean JNICALL Java_org_lwjgl_opengl_GL11_glIsEnabled(JNIEnv * env, jclass clazz, jint p0) { jboolean ret = (jboolean) glIsEnabled((GLint) p0); - CHECK_GL_ERROR + return ret; } @@ -1317,7 +1317,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArrays(JNIEnv * env { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glInterleavedArrays((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1327,7 +1327,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArrays(JNIEnv * env static void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArraysVBO(JNIEnv * env, jclass clazz, jint p0, jint p1, jint buffer_offset) { glInterleavedArrays((GLint) p0, (GLint) p1, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -1337,7 +1337,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglInterleavedArraysVBO(JNIEnv * static void JNICALL Java_org_lwjgl_opengl_GL11_glInitNames(JNIEnv * env, jclass clazz) { glInitNames(); - CHECK_GL_ERROR + } @@ -1348,7 +1348,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glInitNames(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glHint(JNIEnv * env, jclass clazz, jint p0, jint p1) { glHint((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1359,7 +1359,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexParameterfv(JNIEnv * env { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetTexParameterfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1370,7 +1370,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexParameteriv(JNIEnv * env { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetTexParameteriv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1381,7 +1381,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexLevelParameterfv(JNIEnv { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetTexLevelParameterfv((GLint) p0, (GLint) p1, (GLint) p2, address); - CHECK_GL_ERROR + } /* @@ -1392,7 +1392,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexLevelParameteriv(JNIEnv { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetTexLevelParameteriv((GLint) p0, (GLint) p1, (GLint) p2, address); - CHECK_GL_ERROR + } /* @@ -1403,7 +1403,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexImage(JNIEnv * env, jcla { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetTexImage((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, address); - CHECK_GL_ERROR + } @@ -1411,14 +1411,14 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexGenfv(JNIEnv * env, jcla { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetTexGenfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexGeniv(JNIEnv * env, jclass clazz, jint p0, jint p1, jobject buffer, jint offset) { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetTexGeniv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1429,7 +1429,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexEnvfv(JNIEnv * env, jcla { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetTexEnvfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1440,7 +1440,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetTexEnviv(JNIEnv * env, jcla { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetTexEnviv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1461,7 +1461,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStipple(JNIEnv * env { GLubyte *address = offset + (GLubyte *)env->GetDirectBufferAddress(buffer); glGetPolygonStipple(address); - CHECK_GL_ERROR + } /* @@ -1471,7 +1471,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStipple(JNIEnv * env static jboolean JNICALL Java_org_lwjgl_opengl_GL11_glIsList(JNIEnv * env, jclass clazz, jint p0) { jboolean ret = (jboolean) glIsList((GLint) p0); - CHECK_GL_ERROR + return ret; } @@ -1482,7 +1482,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_GL11_glIsList(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glMaterialf(JNIEnv * env, jclass clazz, jint p0, jint p1, jfloat p2) { glMaterialf((GLint) p0, (GLint) p1, (GLfloat) p2); - CHECK_GL_ERROR + } /* @@ -1492,7 +1492,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glMaterialf(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glMateriali(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glMateriali((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -1503,7 +1503,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMaterialfv(JNIEnv * env, jclas { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glMaterialfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1514,7 +1514,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMaterialiv(JNIEnv * env, jclas { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glMaterialiv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } @@ -1526,7 +1526,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMaterialiv(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glMapGrid1f(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2) { glMapGrid1f((GLint) p0, (GLfloat) p1, (GLfloat) p2); - CHECK_GL_ERROR + } @@ -1537,7 +1537,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glMapGrid1f(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glMapGrid2f(JNIEnv * env, jclass clazz, jint p0, jfloat p1, jfloat p2, jint p3, jfloat p4, jfloat p5) { glMapGrid2f((GLint) p0, (GLfloat) p1, (GLfloat) p2, (GLint) p3, (GLfloat) p4, (GLfloat) p5); - CHECK_GL_ERROR + } @@ -1549,7 +1549,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMap2f(JNIEnv * env, jclass cla { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glMap2f((GLint) p0, (GLfloat) p1, (GLfloat) p2, (GLint) p3, (GLint) p4, (GLfloat) p5, (GLfloat) p6, (GLint) p7, (GLint) p8, address); - CHECK_GL_ERROR + } @@ -1561,7 +1561,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMap1f(JNIEnv * env, jclass cla { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glMap1f((GLint) p0, (GLfloat) p1, (GLfloat) p2, (GLint) p3, (GLint) p4, address); - CHECK_GL_ERROR + } /* @@ -1571,7 +1571,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMap1f(JNIEnv * env, jclass cla static void JNICALL Java_org_lwjgl_opengl_GL11_glLogicOp(JNIEnv * env, jclass clazz, jint p0) { glLogicOp((GLint) p0); - CHECK_GL_ERROR + } /* @@ -1581,7 +1581,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glLogicOp(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glLoadName(JNIEnv * env, jclass clazz, jint p0) { glLoadName((GLint) p0); - CHECK_GL_ERROR + } @@ -1593,7 +1593,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLoadMatrixf(JNIEnv * env, jcla { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glLoadMatrixf(address); - CHECK_GL_ERROR + } /* @@ -1603,7 +1603,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLoadMatrixf(JNIEnv * env, jcla static void JNICALL Java_org_lwjgl_opengl_GL11_glLoadIdentity(JNIEnv * env, jclass clazz) { glLoadIdentity(); - CHECK_GL_ERROR + } /* @@ -1613,7 +1613,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glLoadIdentity(JNIEnv * env, jcla static void JNICALL Java_org_lwjgl_opengl_GL11_glListBase(JNIEnv * env, jclass clazz, jint p0) { glListBase((GLint) p0); - CHECK_GL_ERROR + } /* @@ -1623,7 +1623,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glListBase(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glLineWidth(JNIEnv * env, jclass clazz, jfloat p0) { glLineWidth((GLfloat) p0); - CHECK_GL_ERROR + } /* @@ -1633,7 +1633,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glLineWidth(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glLineStipple(JNIEnv * env, jclass clazz, jint p0, jshort p1) { glLineStipple((GLint) p0, (GLshort) p1); - CHECK_GL_ERROR + } /* @@ -1643,7 +1643,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glLineStipple(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glLightModelf(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glLightModelf((GLint) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -1653,7 +1653,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glLightModelf(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glLightModeli(JNIEnv * env, jclass clazz, jint p0, jint p1) { glLightModeli((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1664,7 +1664,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLightModelfv(JNIEnv * env, jcl { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glLightModelfv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1675,7 +1675,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLightModeliv(JNIEnv * env, jcl { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glLightModeliv((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1685,7 +1685,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLightModeliv(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_glLightf(JNIEnv * env, jclass clazz, jint p0, jint p1, jfloat p2) { glLightf((GLint) p0, (GLint) p1, (GLfloat) p2); - CHECK_GL_ERROR + } /* @@ -1695,7 +1695,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glLightf(JNIEnv * env, jclass cla static void JNICALL Java_org_lwjgl_opengl_GL11_glLighti(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glLighti((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -1706,7 +1706,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLightfv(JNIEnv * env, jclass c { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glLightfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1717,7 +1717,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLightiv(JNIEnv * env, jclass c { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glLightiv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1727,7 +1727,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglLightiv(JNIEnv * env, jclass c static jboolean JNICALL Java_org_lwjgl_opengl_GL11_glIsTexture(JNIEnv * env, jclass clazz, jint p0) { jboolean ret = (jboolean) glIsTexture((GLint) p0); - CHECK_GL_ERROR + return ret; } @@ -1738,7 +1738,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_GL11_glIsTexture(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_glMatrixMode(JNIEnv * env, jclass clazz, jint p0) { glMatrixMode((GLint) p0); - CHECK_GL_ERROR + } /* @@ -1749,7 +1749,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStipple(JNIEnv * env, j { const GLubyte *address = offset + (const GLubyte *)env->GetDirectBufferAddress(buffer); glPolygonStipple(address); - CHECK_GL_ERROR + } /* @@ -1759,7 +1759,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPolygonStipple(JNIEnv * env, j static void JNICALL Java_org_lwjgl_opengl_GL11_glPolygonOffset(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1) { glPolygonOffset((GLfloat) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -1769,7 +1769,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPolygonOffset(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_glPolygonMode(JNIEnv * env, jclass clazz, jint p0, jint p1) { glPolygonMode((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1779,7 +1779,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPolygonMode(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glPointSize(JNIEnv * env, jclass clazz, jfloat p0) { glPointSize((GLfloat) p0); - CHECK_GL_ERROR + } /* @@ -1789,7 +1789,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPointSize(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelZoom(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1) { glPixelZoom((GLfloat) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -1799,7 +1799,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelZoom(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelTransferf(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glPixelTransferf((GLint) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -1809,7 +1809,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelTransferf(JNIEnv * env, jc static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelTransferi(JNIEnv * env, jclass clazz, jint p0, jint p1) { glPixelTransferi((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1819,7 +1819,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelTransferi(JNIEnv * env, jc static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelStoref(JNIEnv * env, jclass clazz, jint p0, jfloat p1) { glPixelStoref((GLint) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -1829,7 +1829,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelStoref(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glPixelStorei(JNIEnv * env, jclass clazz, jint p0, jint p1) { glPixelStorei((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1840,7 +1840,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapfv(JNIEnv * env, jclas { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glPixelMapfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1851,7 +1851,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapuiv(JNIEnv * env, jcla { const GLuint *address = (const GLuint *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glPixelMapuiv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1862,7 +1862,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusv(JNIEnv * env, jcla { const GLushort *address = (const GLushort *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glPixelMapusv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1872,7 +1872,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPixelMapusv(JNIEnv * env, jcla static void JNICALL Java_org_lwjgl_opengl_GL11_glPassThrough(JNIEnv * env, jclass clazz, jfloat p0) { glPassThrough((GLfloat) p0); - CHECK_GL_ERROR + } /* @@ -1882,7 +1882,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPassThrough(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glOrtho(JNIEnv * env, jclass clazz, jdouble p0, jdouble p1, jdouble p2, jdouble p3, jdouble p4, jdouble p5) { glOrtho((GLdouble) p0, (GLdouble) p1, (GLdouble) p2, (GLdouble) p3, (GLdouble) p4, (GLdouble) p5); - CHECK_GL_ERROR + } /* @@ -1893,7 +1893,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointer(JNIEnv * env, jc { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glNormalPointer((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -1903,7 +1903,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointer(JNIEnv * env, jc static void JNICALL Java_org_lwjgl_opengl_GL11_nglNormalPointerVBO(JNIEnv * env, jclass clazz, jint p0, jint p1, jint buffer_offset) { glNormalPointer((GLint) p0, (GLint) p1, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -1941,7 +1941,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glNormal3i(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glNewList(JNIEnv * env, jclass clazz, jint p0, jint p1) { glNewList((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } /* @@ -1951,7 +1951,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glNewList(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glEndList(JNIEnv * env, jclass clazz) { glEndList(); - CHECK_GL_ERROR + } @@ -1963,7 +1963,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMultMatrixf(JNIEnv * env, jcla { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glMultMatrixf(address); - CHECK_GL_ERROR + } /* @@ -1973,7 +1973,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglMultMatrixf(JNIEnv * env, jcla static void JNICALL Java_org_lwjgl_opengl_GL11_glShadeModel(JNIEnv * env, jclass clazz, jint p0) { glShadeModel((GLint) p0); - CHECK_GL_ERROR + } /* @@ -1984,7 +1984,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglSelectBuffer(JNIEnv * env, jcl { GLuint *address = offset + (GLuint *)env->GetDirectBufferAddress(buffer); glSelectBuffer((GLint) p0, address); - CHECK_GL_ERROR + } /* @@ -1994,7 +1994,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglSelectBuffer(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_glScissor(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) { glScissor((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3); - CHECK_GL_ERROR + } /* @@ -2004,7 +2004,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glScissor(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glScalef(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2) { glScalef((GLfloat) p0, (GLfloat) p1, (GLfloat) p2); - CHECK_GL_ERROR + } @@ -2015,7 +2015,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glScalef(JNIEnv * env, jclass cla static void JNICALL Java_org_lwjgl_opengl_GL11_glRotatef(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glRotatef((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -2025,7 +2025,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRotatef(JNIEnv * env, jclass cl static jint JNICALL Java_org_lwjgl_opengl_GL11_glRenderMode(JNIEnv * env, jclass clazz, jint p0) { jint ret = (jint) glRenderMode((GLint) p0); - CHECK_GL_ERROR + return ret; } @@ -2037,7 +2037,7 @@ static jint JNICALL Java_org_lwjgl_opengl_GL11_glRenderMode(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glRectf(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glRectf((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -2047,7 +2047,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRectf(JNIEnv * env, jclass claz static void JNICALL Java_org_lwjgl_opengl_GL11_glRecti(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) { glRecti((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3); - CHECK_GL_ERROR + } @@ -2059,7 +2059,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixels(JNIEnv * env, jclas { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glReadPixels((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, address); - CHECK_GL_ERROR + } /* @@ -2069,7 +2069,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglReadPixels(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glReadBuffer(JNIEnv * env, jclass clazz, jint p0) { glReadBuffer((GLint) p0); - CHECK_GL_ERROR + } @@ -2081,7 +2081,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glReadBuffer(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos2f(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1) { glRasterPos2f((GLfloat) p0, (GLfloat) p1); - CHECK_GL_ERROR + } /* @@ -2091,7 +2091,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos2f(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos2i(JNIEnv * env, jclass clazz, jint p0, jint p1) { glRasterPos2i((GLint) p0, (GLint) p1); - CHECK_GL_ERROR + } @@ -2102,7 +2102,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos2i(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos3f(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2) { glRasterPos3f((GLfloat) p0, (GLfloat) p1, (GLfloat) p2); - CHECK_GL_ERROR + } /* @@ -2112,7 +2112,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos3f(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos3i(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glRasterPos3i((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } @@ -2124,7 +2124,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos3i(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos4f(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glRasterPos4f((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -2134,7 +2134,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos4f(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos4i(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) { glRasterPos4i((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3); - CHECK_GL_ERROR + } @@ -2145,7 +2145,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glRasterPos4i(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glPushName(JNIEnv * env, jclass clazz, jint p0) { glPushName((GLint) p0); - CHECK_GL_ERROR + } /* @@ -2155,7 +2155,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPushName(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glPopName(JNIEnv * env, jclass clazz) { glPopName(); - CHECK_GL_ERROR + } /* @@ -2165,7 +2165,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPopName(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glPushMatrix(JNIEnv * env, jclass clazz) { glPushMatrix(); - CHECK_GL_ERROR + } /* @@ -2175,7 +2175,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPushMatrix(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glPopMatrix(JNIEnv * env, jclass clazz) { glPopMatrix(); - CHECK_GL_ERROR + } /* @@ -2185,7 +2185,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPopMatrix(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_nglPushClientAttrib(JNIEnv * env, jclass clazz, jint p0) { glPushClientAttrib((GLint) p0); - CHECK_GL_ERROR + } /* @@ -2195,7 +2195,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPushClientAttrib(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_nglPopClientAttrib(JNIEnv * env, jclass clazz) { glPopClientAttrib(); - CHECK_GL_ERROR + } /* @@ -2205,7 +2205,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglPopClientAttrib(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_glPushAttrib(JNIEnv * env, jclass clazz, jint p0) { glPushAttrib((GLint) p0); - CHECK_GL_ERROR + } /* @@ -2215,7 +2215,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPushAttrib(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glPopAttrib(JNIEnv * env, jclass clazz) { glPopAttrib(); - CHECK_GL_ERROR + } /* @@ -2225,7 +2225,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glPopAttrib(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilFunc(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glStencilFunc((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -2236,7 +2236,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointer(JNIEnv * env, jc { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glVertexPointer((GLint) p0, (GLint) p1, (GLint) p2, address); - CHECK_GL_ERROR + } /* @@ -2246,7 +2246,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointer(JNIEnv * env, jc static void JNICALL Java_org_lwjgl_opengl_GL11_nglVertexPointerVBO(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint buffer_offset) { glVertexPointer((GLint) p0, (GLint) p1, (GLint) p2, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -2313,7 +2313,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glVertex4i(JNIEnv * env, jclass c static void JNICALL Java_org_lwjgl_opengl_GL11_glTranslatef(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2) { glTranslatef((GLfloat) p0, (GLfloat) p1, (GLfloat) p2); - CHECK_GL_ERROR + } /* @@ -2324,7 +2324,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage2D(JNIEnv * env, jc { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glTexSubImage2D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, (GLint) p7, address); - CHECK_GL_ERROR + } /* @@ -2335,7 +2335,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexSubImage1D(JNIEnv * env, jc { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glTexSubImage1D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, address); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexParameterfv @@ -2357,7 +2357,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexParameteriv static void JNICALL Java_org_lwjgl_opengl_GL11_glTexParameterf(JNIEnv * env, jclass clazz, jint p0, jint p1, jfloat p2) { glTexParameterf((GLint) p0, (GLint) p1, (GLfloat) p2); - CHECK_GL_ERROR + } /* @@ -2367,7 +2367,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glTexParameterf(JNIEnv * env, jcl static void JNICALL Java_org_lwjgl_opengl_GL11_glTexParameteri(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glTexParameteri((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -2378,7 +2378,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage2D(JNIEnv * env, jclas { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glTexImage2D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, (GLint) p7, address); - CHECK_GL_ERROR + } /* @@ -2389,7 +2389,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1D(JNIEnv * env, jclas { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glTexImage1D((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3, (GLint) p4, (GLint) p5, (GLint) p6, address); - CHECK_GL_ERROR + } @@ -2400,7 +2400,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexImage1D(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glTexGenf(JNIEnv * env, jclass clazz, jint p0, jint p1, jfloat p2) { glTexGenf((GLint) p0, (GLint) p1, (GLfloat) p2); - CHECK_GL_ERROR + } @@ -2412,7 +2412,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexGenfv(JNIEnv * env, jclass { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glTexGenfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -2422,7 +2422,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexGenfv(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glTexGeni(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glTexGeni((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } @@ -2434,7 +2434,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexGeniv(JNIEnv * env, jclass { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glTexGeniv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } @@ -2446,7 +2446,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexGeniv(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glTexEnvf(JNIEnv * env, jclass clazz, jint p0, jint p1, jfloat p2) { glTexEnvf((GLint) p0, (GLint) p1, (GLfloat) p2); - CHECK_GL_ERROR + } /* @@ -2456,7 +2456,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glTexEnvf(JNIEnv * env, jclass cl static void JNICALL Java_org_lwjgl_opengl_GL11_glTexEnvi(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glTexEnvi((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -2467,7 +2467,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexEnvfv(JNIEnv * env, jclass { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glTexEnvfv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -2478,7 +2478,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexEnviv(JNIEnv * env, jclass { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glTexEnviv((GLint) p0, (GLint) p1, address); - CHECK_GL_ERROR + } /* @@ -2489,7 +2489,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexCoordPointer(JNIEnv * env, { const void *address = (const void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glTexCoordPointer((GLint) p0, (GLint) p1, (GLint) p2, address); - CHECK_GL_ERROR + } /* @@ -2499,7 +2499,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexCoordPointer(JNIEnv * env, static void JNICALL Java_org_lwjgl_opengl_GL11_nglTexCoordPointerVBO(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint buffer_offset) { glTexCoordPointer((GLint) p0, (GLint) p1, (GLint) p2, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -2549,7 +2549,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glTexCoord4f(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilOp(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2) { glStencilOp((GLint) p0, (GLint) p1, (GLint) p2); - CHECK_GL_ERROR + } /* @@ -2559,7 +2559,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilOp(JNIEnv * env, jclass static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilMask(JNIEnv * env, jclass clazz, jint p0) { glStencilMask((GLint) p0); - CHECK_GL_ERROR + } /* @@ -2569,7 +2569,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL11_glStencilMask(JNIEnv * env, jclas static void JNICALL Java_org_lwjgl_opengl_GL11_glViewport(JNIEnv * env, jclass clazz, jint p0, jint p1, jint p2, jint p3) { glViewport((GLint) p0, (GLint) p1, (GLint) p2, (GLint) p3); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_1(JNIEnv *env) diff --git a/src/native/common/org_lwjgl_opengl_GL12.cpp b/src/native/common/org_lwjgl_opengl_GL12.cpp index 0bc6b2b7..8632da2a 100644 --- a/src/native/common/org_lwjgl_opengl_GL12.cpp +++ b/src/native/common/org_lwjgl_opengl_GL12.cpp @@ -39,8 +39,8 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" +#include "common_tools.h" typedef void (APIENTRY * glDrawRangeElementsPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices ); typedef void (APIENTRY * glTexImage3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels ); @@ -62,7 +62,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElements { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glDrawRangeElements(mode, start, end, count, type, address); - CHECK_GL_ERROR + } /* @@ -74,7 +74,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL12_nglDrawRangeElementsVBO (JNIEnv *env, jclass clazz, jint mode, jint start, jint end, jint count, jint type, jint buffer_offset) { glDrawRangeElements(mode, start, end, count, type, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL12_nglTexImage3D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glTexImage3D(target, level, internalformat, width, height, depth, border, format, type, address); - CHECK_GL_ERROR + } /* @@ -100,7 +100,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL12_nglTexSubImage3D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, address); - CHECK_GL_ERROR + } /* @@ -112,7 +112,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL12_glCopyTexSubImage3D (JNIEnv *env, jclass clazz, jint target, jint level, jint xoffset, jint yoffset, jint zoffset, jint x, jint y, jint width, jint height) { glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_2(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/org_lwjgl_opengl_GL13.cpp b/src/native/common/org_lwjgl_opengl_GL13.cpp index d3def9e7..ceb6bff7 100644 --- a/src/native/common/org_lwjgl_opengl_GL13.cpp +++ b/src/native/common/org_lwjgl_opengl_GL13.cpp @@ -39,7 +39,6 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" typedef void (APIENTRY * glActiveTexturePROC) (GLenum texture ); @@ -85,7 +84,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_glActiveTexture (JNIEnv *env, jclass clazz, jint texture) { glActiveTexture(texture); - CHECK_GL_ERROR + } /* @@ -97,7 +96,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_glClientActiveTexture (JNIEnv *env, jclass clazz, jint texture) { glClientActiveTexture(texture); - CHECK_GL_ERROR + } /* @@ -110,7 +109,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage1D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage1D(target, level, internalformat, width, border, imagesize, address); - CHECK_GL_ERROR + } /* @@ -123,7 +122,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage2D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage2D(target, level, internalformat, width, height, border, imagesize, address); - CHECK_GL_ERROR + } /* @@ -136,7 +135,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexImage3D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imagesize, address); - CHECK_GL_ERROR + } /* @@ -149,7 +148,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage1D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage1D(target, level, xoffset, width, format, imagesize, address); - CHECK_GL_ERROR + } /* @@ -162,7 +161,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage2D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imagesize, address); - CHECK_GL_ERROR + } /* @@ -175,7 +174,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglCompressedTexSubImage3D { const void *address = (const void *)(offset + (const GLbyte *)env->GetDirectBufferAddress(buffer)); glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imagesize, address); - CHECK_GL_ERROR + } /* @@ -188,7 +187,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglGetCompressedTexImage { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetCompressedTexImage(target, lod, address); - CHECK_GL_ERROR + } @@ -256,7 +255,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglLoadTransposeMatrixf { const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); glLoadTransposeMatrixf(address); - CHECK_GL_ERROR + } @@ -271,7 +270,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_nglMultTransposeMatrixf { const GLfloat *address = (const GLfloat *)env->GetDirectBufferAddress(buffer); glMultTransposeMatrixf(address); - CHECK_GL_ERROR + } /* @@ -283,7 +282,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL13_glSampleCoverage (JNIEnv *env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverage(value, invert); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_3(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/org_lwjgl_opengl_GL14.cpp b/src/native/common/org_lwjgl_opengl_GL14.cpp index 30f5ab04..5108d8a0 100644 --- a/src/native/common/org_lwjgl_opengl_GL14.cpp +++ b/src/native/common/org_lwjgl_opengl_GL14.cpp @@ -39,8 +39,8 @@ * @version $Revision$ */ -#include "checkGLerror.h" #include "extgl.h" +#include "common_tools.h" typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); typedef void (APIENTRY * glBlendEquationPROC) (GLenum mode); @@ -80,14 +80,14 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendEquation (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); - CHECK_GL_ERROR + } static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendColor(JNIEnv * env, jclass clazz, jfloat p0, jfloat p1, jfloat p2, jfloat p3) { glBlendColor((GLfloat) p0, (GLfloat) p1, (GLfloat) p2, (GLfloat) p3); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer (JNIEnv *env, jclass clazz, jint p1, jint p2, jobject buffer, jint offset) { GLvoid *address = (GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glFogCoordPointer(p1, p2, address); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointer static void JNICALL Java_org_lwjgl_opengl_GL14_nglFogCoordPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint buffer_offset) { glFogCoordPointer(p1, p2, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays GLint *address = first_offset + (GLint *)env->GetDirectBufferAddress(first); GLsizei *address2 = count_offset + (GLsizei *)env->GetDirectBufferAddress(count); glMultiDrawArrays(mode, address, address2, (GLsizei)primcount); - CHECK_GL_ERROR + } /* @@ -145,7 +145,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglMultiDrawArrays static void JNICALL Java_org_lwjgl_opengl_GL14_glPointParameterf (JNIEnv *env, jclass clazz, jint p1, jfloat p2) { glPointParameterf(p1, p2); - CHECK_GL_ERROR + } /* @@ -157,7 +157,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglPointParameterfv (JNIEnv *env, jclass clazz, jint p1, jobject buffer, jint offset) { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glPointParameterfv(p1, address); - CHECK_GL_ERROR + } /* @@ -201,7 +201,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jobject buffer, jint offset) { const GLvoid *address = (const GLvoid *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glSecondaryColorPointer(p1, p2, p3, address); - CHECK_GL_ERROR + } /* @@ -212,7 +212,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointer static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint buffer_offset) { glSecondaryColorPointer(p1, p2, p3, offsetToPointer(buffer_offset)); - CHECK_GL_ERROR + } /* @@ -223,7 +223,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL14_nglSecondaryColorPointerVBO static void JNICALL Java_org_lwjgl_opengl_GL14_glBlendFuncSeparate (JNIEnv *env, jclass clazz, jint p1, jint p2, jint p3, jint p4) { glBlendFuncSeparate(p1, p2, p3, p4); - CHECK_GL_ERROR + } diff --git a/src/native/common/org_lwjgl_opengl_GL15.cpp b/src/native/common/org_lwjgl_opengl_GL15.cpp index d171bf47..1f768c1d 100644 --- a/src/native/common/org_lwjgl_opengl_GL15.cpp +++ b/src/native/common/org_lwjgl_opengl_GL15.cpp @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" typedef int GLintptr; typedef unsigned int GLsizeiptr; @@ -90,7 +90,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglBindBuffer (JNIEnv * env, jclass clazz, jint target, jint buffer) { glBindBuffer(target, buffer); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglDeleteBuffers { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glDeleteBuffers(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGenBuffers { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glGenBuffers(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -125,7 +125,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_GL15_glIsBuffer (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsBuffer(buffer); - CHECK_GL_ERROR + return result; } @@ -138,7 +138,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferData { GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset); glBufferData(target, size, data_ptr, usage); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglBufferSubData { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glBufferSubData(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -162,7 +162,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferSubData { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glGetBufferSubData(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -173,7 +173,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_GL15_glMapBuffer (JNIEnv * env, jclass clazz, jint target, jint access, jint size, jobject oldBuffer) { void *buffer_address = glMapBuffer((GLenum)target, (GLenum)access); - CHECK_GL_ERROR + if (oldBuffer != NULL) { void *old_buffer_address = env->GetDirectBufferAddress(oldBuffer); if (old_buffer_address == buffer_address) @@ -190,7 +190,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_GL15_glUnmapBuffer (JNIEnv * env, jclass clazz, jint target) { GLboolean result = glUnmapBuffer(target); - CHECK_GL_ERROR + return result; } @@ -203,7 +203,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetBufferParameteriv { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + params_offset; glGetBufferParameteriv(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -215,7 +215,7 @@ static jobject JNICALL Java_org_lwjgl_opengl_GL15_glGetBufferPointer { void *pointer; glGetBufferPointerv((GLenum)target, (GLenum)pname, &pointer); - CHECK_GL_ERROR + return safeNewBuffer(env, pointer, size); } @@ -228,7 +228,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGenQueries { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueries(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -240,7 +240,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglDeleteQueries { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueries(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -251,7 +251,7 @@ static jboolean JNICALL Java_org_lwjgl_opengl_GL15_glIsQuery (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQuery(id); - CHECK_GL_ERROR + return result; } @@ -263,7 +263,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_glBeginQuery (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQuery(target, id); - CHECK_GL_ERROR + } /* @@ -274,7 +274,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_glEndQuery (JNIEnv * env, jclass clazz, jint target) { glEndQuery(target); - CHECK_GL_ERROR + } /* @@ -286,7 +286,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryiv { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryiv(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -298,7 +298,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryObjectiv { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectiv(id, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -310,7 +310,7 @@ static void JNICALL Java_org_lwjgl_opengl_GL15_nglGetQueryObjectuiv { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuiv(id, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitOpenGL1_5(JNIEnv *env, jobject ext_set) diff --git a/src/native/common/org_lwjgl_opengl_GLContext.cpp b/src/native/common/org_lwjgl_opengl_GLContext.cpp index eed64752..fc9c3232 100644 --- a/src/native/common/org_lwjgl_opengl_GLContext.cpp +++ b/src/native/common/org_lwjgl_opengl_GLContext.cpp @@ -32,7 +32,7 @@ #include "org_lwjgl_opengl_GLContext.h" #include "extgl.h" -#include "checkGLerror.h" +#include "common_tools.h" /* * Class: org_lwjgl_opengl_GLContext