Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/native/common/arb org_lwjgl_opengl_ARBImaging.cpp,1.3,1.4 org_lwjgl_opengl_ARBMatrixPalette.cpp,1.3,1.4 org_lwjgl_opengl_ARBMultisample.cpp,1.3,1.4 org_lwjgl_opengl_ARBMultitexture.cpp,1.3,1.4 org_lwjgl_opengl_ARBOcclusionQuery.cpp,1.3,1.4 org_lwjgl_opengl_ARBPointParameters.cpp,1.3,1.4 org_lwjgl_opengl_ARBProgram.cpp,1.3,1.4 org_lwjgl_opengl_ARBShaderObjects.cpp,1.4,1.5 org_lwjgl_opengl_ARBTextureCompression.cpp,1.3,1.4 org_lwjgl_opengl_ARBTransposeMatrix.cpp,1.3,1.4 org_lwjgl_opengl_ARBVertexBlend.cpp,1.3,1.4 org_lwjgl_opengl_ARBVertexBufferObject.cpp,1.4,1.5 org_lwjgl_opengl_ARBVertexProgram.cpp,1.3,1.4 org_lwjgl_opengl_ARBVertexShader.cpp,1.3,1.4 org_lwjgl_opengl_ARBWindowPos.cpp,1.3,1.4
Update of /cvsroot/java-game-lib/LWJGL/src/native/common/arb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7407/src/native/common/arb Modified Files: org_lwjgl_opengl_ARBImaging.cpp org_lwjgl_opengl_ARBMatrixPalette.cpp org_lwjgl_opengl_ARBMultisample.cpp org_lwjgl_opengl_ARBMultitexture.cpp org_lwjgl_opengl_ARBOcclusionQuery.cpp org_lwjgl_opengl_ARBPointParameters.cpp org_lwjgl_opengl_ARBProgram.cpp org_lwjgl_opengl_ARBShaderObjects.cpp org_lwjgl_opengl_ARBTextureCompression.cpp org_lwjgl_opengl_ARBTransposeMatrix.cpp org_lwjgl_opengl_ARBVertexBlend.cpp org_lwjgl_opengl_ARBVertexBufferObject.cpp org_lwjgl_opengl_ARBVertexProgram.cpp org_lwjgl_opengl_ARBVertexShader.cpp org_lwjgl_opengl_ARBWindowPos.cpp Log Message: Removed GL_CHECK_ERROR Index: org_lwjgl_opengl_ARBImaging.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBImaging.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBImaging.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ { 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 @@ { 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 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetColorTable(target, format, type, address); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetColorTableParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetColorTableParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -187,7 +187,7 @@ { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glColorTableParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -200,7 +200,7 @@ { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glColorTableParameterfv(target, pname, address); - CHECK_GL_ERROR + } @@ -213,7 +213,7 @@ (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 @@ (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 @@ (JNIEnv *env, jclass clazz, jint mode) { glBlendEquation(mode); - CHECK_GL_ERROR + } /* @@ -249,7 +249,7 @@ 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 @@ (JNIEnv *env, jclass clazz, jint target, jint width, jint internalformat, jboolean sink) { glHistogram(target, width, internalformat, sink); - CHECK_GL_ERROR + } /* @@ -273,7 +273,7 @@ (JNIEnv *env, jclass clazz, jint target) { glResetHistogram(target); - CHECK_GL_ERROR + } /* @@ -286,7 +286,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetHistogram(target, reset, format, type, address); - CHECK_GL_ERROR + } /* @@ -299,7 +299,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetHistogramParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -312,7 +312,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetHistogramParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -324,7 +324,7 @@ (JNIEnv *env, jclass clazz, jint target, jint internalformat, jboolean sink) { glMinmax(target, internalformat, sink); - CHECK_GL_ERROR + } /* @@ -336,7 +336,7 @@ (JNIEnv *env, jclass clazz, jint target) { glResetMinmax(target); - CHECK_GL_ERROR + } /* @@ -349,7 +349,7 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetMinmax(target, reset, format, type, address); - CHECK_GL_ERROR + } /* @@ -362,7 +362,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -375,7 +375,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetMinmaxParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -388,7 +388,7 @@ { 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 @@ { 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 @@ (JNIEnv *env, jclass clazz, jint target, jint pname, jfloat params) { glConvolutionParameterf(target, pname, params); - CHECK_GL_ERROR + } /* @@ -426,7 +426,7 @@ { const GLfloat *address = offset + (const GLfloat *)env->GetDirectBufferAddress(buffer); glConvolutionParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -438,7 +438,7 @@ (JNIEnv *env, jclass clazz, jint target, jint pname, jint params) { glConvolutionParameteri(target, pname, params); - CHECK_GL_ERROR + } /* @@ -451,7 +451,7 @@ { const GLint *address = offset + (const GLint *)env->GetDirectBufferAddress(buffer); glConvolutionParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -463,7 +463,7 @@ (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 @@ (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 @@ { void *address = (void *)(offset + (GLbyte *)env->GetDirectBufferAddress(buffer)); glGetConvolutionFilter(target, format, type, address); - CHECK_GL_ERROR + } /* @@ -501,7 +501,7 @@ { GLfloat *address = offset + (GLfloat *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameterfv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -514,7 +514,7 @@ { GLint *address = offset + (GLint *)env->GetDirectBufferAddress(buffer); glGetConvolutionParameteriv(target, pname, address); - CHECK_GL_ERROR + } /* @@ -528,7 +528,7 @@ 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 @@ 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) Index: org_lwjgl_opengl_ARBMatrixPalette.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMatrixPalette.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBMatrixPalette.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ (JNIEnv * env, jclass clazz, jint index) { glCurrentPaletteMatrixARB(index); - CHECK_GL_ERROR + } /* @@ -69,7 +69,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glMatrixIndexPointerARB(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -80,7 +80,7 @@ (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 @@ { GLubyte *pIndices_ptr = (GLubyte *)env->GetDirectBufferAddress(pIndices) + pIndices_offset; glMatrixIndexubvARB(size, pIndices_ptr); - CHECK_GL_ERROR + } /* @@ -104,7 +104,7 @@ { GLuint *piIndices_ptr = (GLuint *)env->GetDirectBufferAddress(piIndices) + piIndices_offset; glMatrixIndexuivARB(size, piIndices_ptr); - CHECK_GL_ERROR + } /* @@ -116,7 +116,7 @@ { GLushort *psIndices_ptr = (GLushort *)env->GetDirectBufferAddress(psIndices) + psIndices_offset; glMatrixIndexusvARB(size, psIndices_ptr); - CHECK_GL_ERROR + } void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBMultisample.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultisample.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBMultisample.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert); @@ -49,7 +49,7 @@ (JNIEnv * env, jclass clazz, jfloat value, jboolean invert) { glSampleCoverageARB(value, invert); - CHECK_GL_ERROR + } void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBMultitexture.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBMultitexture.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBMultitexture.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ (JNIEnv * env, jclass clazz, jint texture) { glClientActiveTextureARB(texture); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ (JNIEnv * env, jclass clazz, jint texture) { glActiveTextureARB(texture); - CHECK_GL_ERROR + } /* @@ -97,7 +97,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s) { glMultiTexCoord1fARB(target, s); - CHECK_GL_ERROR + } /* @@ -108,7 +108,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s) { glMultiTexCoord1iARB(target, s); - CHECK_GL_ERROR + } /* @@ -119,7 +119,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s) { glMultiTexCoord1sARB(target, s); - CHECK_GL_ERROR + } /* @@ -130,7 +130,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t) { glMultiTexCoord2fARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -141,7 +141,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s, jint t) { glMultiTexCoord2iARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -152,7 +152,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t) { glMultiTexCoord2sARB(target, s, t); - CHECK_GL_ERROR + } /* @@ -163,7 +163,7 @@ (JNIEnv * env, jclass clazz, jint target, jfloat s, jfloat t, jfloat r) { glMultiTexCoord3fARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -174,7 +174,7 @@ (JNIEnv * env, jclass clazz, jint target, jint s, jint t, jint r) { glMultiTexCoord3iARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -185,7 +185,7 @@ (JNIEnv * env, jclass clazz, jint target, jshort s, jshort t, jshort r) { glMultiTexCoord3sARB(target, s, t, r); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ (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 @@ (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 @@ (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) Index: org_lwjgl_opengl_ARBOcclusionQuery.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBOcclusionQuery.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBOcclusionQuery.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glGenQueriesARB(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -76,7 +76,7 @@ { GLuint *ids_ptr = (GLuint *)env->GetDirectBufferAddress(ids) + idsOffset; glDeleteQueriesARB(n, ids_ptr); - CHECK_GL_ERROR + } /* @@ -87,7 +87,7 @@ (JNIEnv * env, jclass clazz, jint id) { GLboolean result = glIsQueryARB(id); - CHECK_GL_ERROR + return result; } @@ -99,7 +99,7 @@ (JNIEnv * env, jclass clazz, jint target, jint id) { glBeginQueryARB(target, id); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ (JNIEnv * env, jclass clazz, jint target) { glEndQueryARB(target); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryivARB(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -134,7 +134,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectivARB(id, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -146,7 +146,7 @@ { GLuint *params_ptr = (GLuint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetQueryObjectuivARB(id, pname, params_ptr); - CHECK_GL_ERROR + } void extgl_InitARBOcclusionQuery(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBPointParameters.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBPointParameters.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBPointParameters.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ (JNIEnv * env, jclass clazz, jint pname, jfloat param) { glPointParameterfARB(pname, param); - CHECK_GL_ERROR + } /* @@ -63,7 +63,7 @@ { GLfloat *pfParams_ptr = (GLfloat *)env->GetDirectBufferAddress(pfParams) + pfParams_offset; glPointParameterfvARB(pname, pfParams_ptr); - CHECK_GL_ERROR + } void extgl_InitARBPointParameters(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBProgram.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ { GLvoid *string_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(string) + stringOffset); glProgramStringARB(target, format, length, string_ptr); - CHECK_GL_ERROR + } /* @@ -86,7 +86,7 @@ (JNIEnv * env, jclass clazz, jint target, jint program) { glBindProgramARB(target, program); - CHECK_GL_ERROR + } /* @@ -98,7 +98,7 @@ { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glDeleteProgramsARB(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -110,7 +110,7 @@ { GLuint *programs_ptr = (GLuint *)env->GetDirectBufferAddress(programs) + programsOffset; glGenProgramsARB(n, programs_ptr); - CHECK_GL_ERROR + } /* @@ -121,7 +121,7 @@ (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 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramEnvParameter4fvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ (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 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glProgramLocalParameter4fvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -168,7 +168,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramEnvParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -180,7 +180,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramLocalParameterfvARB(target, index, params_ptr); - CHECK_GL_ERROR + } /* @@ -192,7 +192,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetProgramivARB(target, parameterName, params_ptr); - CHECK_GL_ERROR + } /* @@ -204,7 +204,7 @@ { GLvoid *paramString_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(paramString) + paramStringOffset); glGetProgramStringARB(target, parameterName, paramString_ptr); - CHECK_GL_ERROR + } /* @@ -215,7 +215,7 @@ (JNIEnv * env, jclass clazz, jint program) { GLboolean result = glIsProgramARB(program); - CHECK_GL_ERROR + return result; } Index: org_lwjgl_opengl_ARBShaderObjects.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBShaderObjects.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_ARBShaderObjects.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_ARBShaderObjects.cpp 7 Mar 2004 16:01:44 -0000 1.5 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned char GLcharARB; typedef unsigned int GLhandleARB; @@ -134,7 +134,7 @@ (JNIEnv * env, jclass clazz, jint obj) { glDeleteObjectARB(obj); - CHECK_GL_ERROR + } /* @@ -145,7 +145,7 @@ (JNIEnv * env, jclass clazz, jint pname) { GLhandleARB result = glGetHandleARB(pname); - CHECK_GL_ERROR + return result; } @@ -157,7 +157,7 @@ (JNIEnv * env, jclass clazz, jint containerObj, jint attachedObj) { glDetachObjectARB(containerObj, attachedObj); - CHECK_GL_ERROR + } /* @@ -168,7 +168,7 @@ (JNIEnv * env, jclass clazz, jint shaderType) { GLhandleARB result = glCreateShaderObjectARB(shaderType); - CHECK_GL_ERROR + return result; } @@ -213,7 +213,7 @@ (JNIEnv * env, jclass clazz, jint shaderObj) { glShaderSourceARB(shaderObj, sourceCount, (const GLcharARB **)sources, (const GLint *)sourcesLengths); - CHECK_GL_ERROR + } /* @@ -224,7 +224,7 @@ (JNIEnv * env, jclass clazz, jint shaderObj) { glCompileShaderARB(shaderObj); - CHECK_GL_ERROR + } /* @@ -235,7 +235,7 @@ (JNIEnv * env, jclass clazz) { GLuint result = glCreateProgramObjectARB(); - CHECK_GL_ERROR + return result; } @@ -247,7 +247,7 @@ (JNIEnv * env, jclass clazz, jint containerObj, jint obj) { glAttachObjectARB(containerObj, obj); - CHECK_GL_ERROR + } /* @@ -258,7 +258,7 @@ (JNIEnv * env, jclass clazz, jint programObj) { glLinkProgramARB(programObj); - CHECK_GL_ERROR + } /* @@ -269,7 +269,7 @@ (JNIEnv * env, jclass clazz, jint programObj) { glUseProgramObjectARB(programObj); - CHECK_GL_ERROR + } /* @@ -280,7 +280,7 @@ (JNIEnv * env, jclass clazz, jint programObj) { glValidateProgramARB(programObj); - CHECK_GL_ERROR + } /* @@ -291,7 +291,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0) { glUniform1fARB(location, v0); - CHECK_GL_ERROR + } /* @@ -302,7 +302,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1) { glUniform2fARB(location, v0, v1); - CHECK_GL_ERROR + } /* @@ -313,7 +313,7 @@ (JNIEnv * env, jclass clazz, jint location, jfloat v0, jfloat v1, jfloat v2) { glUniform3fARB(location, v0, v1, v2); - CHECK_GL_ERROR + } /* @@ -324,7 +324,7 @@ (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 @@ (JNIEnv * env, jclass clazz, jint location, jint v0) { glUniform1iARB(location, v0); - CHECK_GL_ERROR + } /* @@ -346,7 +346,7 @@ (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1) { glUniform2iARB(location, v0, v1); - CHECK_GL_ERROR + } /* @@ -357,7 +357,7 @@ (JNIEnv * env, jclass clazz, jint location, jint v0, jint v1, jint v2) { glUniform3iARB(location, v0, v1, v2); - CHECK_GL_ERROR + } /* @@ -368,7 +368,7 @@ (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 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform1fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -392,7 +392,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform2fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -404,7 +404,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform3fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -416,7 +416,7 @@ { GLfloat *values_ptr = (GLfloat *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform4fvARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -428,7 +428,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform1ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -440,7 +440,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform2ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -452,7 +452,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform3ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -464,7 +464,7 @@ { GLint *values_ptr = (GLint *)env->GetDirectBufferAddress(values) + valuesOffset; glUniform4ivARB(location, count, values_ptr); - CHECK_GL_ERROR + } /* @@ -476,7 +476,7 @@ { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix2fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -488,7 +488,7 @@ { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix3fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -500,7 +500,7 @@ { GLfloat *matrices_ptr = (GLfloat *)env->GetDirectBufferAddress(matrices) + matricesOffset; glUniformMatrix4fvARB(location, count, transpose, matrices_ptr); - CHECK_GL_ERROR + } /* @@ -512,7 +512,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetObjectParameterfvARB(obj, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -524,7 +524,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetObjectParameterivARB(obj, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -544,7 +544,7 @@ glGetInfoLogARB(obj, maxLength, length_ptr, infoLog_ptr); } - CHECK_GL_ERROR + } /* @@ -564,7 +564,7 @@ glGetAttachedObjectsARB(containerObj, maxCount, count_ptr, obj_ptr); } - CHECK_GL_ERROR + } /* @@ -576,7 +576,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLuint result = glGetUniformLocationARB(programObj, name_ptr); - CHECK_GL_ERROR + return result; } @@ -599,7 +599,7 @@ glGetActiveUniformARB(programObj, index, maxLength, length_ptr, size_ptr, type_ptr, name_ptr); } - CHECK_GL_ERROR + } /* @@ -611,7 +611,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetUniformfvARB(programObj, location, params_ptr); - CHECK_GL_ERROR + } /* @@ -623,7 +623,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetUniformivARB(programObj, location, params_ptr); - CHECK_GL_ERROR + } /* @@ -642,7 +642,7 @@ glGetShaderSourceARB(obj, maxLength, length_ptr, source_ptr); } - CHECK_GL_ERROR + } void extgl_InitARBShaderObjects(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBTextureCompression.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTextureCompression.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBTextureCompression.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBTextureCompression.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ { 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 @@ { 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 @@ { 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 @@ { 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 @@ { 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 @@ { 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 @@ { 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) Index: org_lwjgl_opengl_ARBTransposeMatrix.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBTransposeMatrix.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBTransposeMatrix.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBTransposeMatrix.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; glLoadTransposeMatrixfARB(pfMtx_ptr); - CHECK_GL_ERROR + } /* @@ -64,7 +64,7 @@ { GLfloat *pfMtx_ptr = (GLfloat *)env->GetDirectBufferAddress(pfMtx) + pfMtx_offset; glMultTransposeMatrixfARB(pfMtx_ptr); - CHECK_GL_ERROR + } void extgl_InitARBTransposeMatrix(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBVertexBlend.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBlend.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBVertexBlend.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBVertexBlend.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ { GLbyte *pWeights_ptr = (GLbyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; glWeightbvARB(size, pWeights_ptr); - CHECK_GL_ERROR + } /* @@ -78,7 +78,7 @@ { GLfloat *pfWeights_ptr = (GLfloat *)env->GetDirectBufferAddress(pfWeights) + pfWeights_offset; glWeightfvARB(size, pfWeights_ptr); - CHECK_GL_ERROR + } /* @@ -90,7 +90,7 @@ { GLint *piWeights_ptr = (GLint *)env->GetDirectBufferAddress(piWeights) + piWeights_offset; glWeightivARB(size, piWeights_ptr); - CHECK_GL_ERROR + } /* @@ -102,7 +102,7 @@ { GLshort *psWeights_ptr = (GLshort *)env->GetDirectBufferAddress(psWeights) + psWeights_offset; glWeightsvARB(size, psWeights_ptr); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ { GLubyte *pWeights_ptr = (GLubyte *)env->GetDirectBufferAddress(pWeights) + pWeights_offset; glWeightubvARB(size, pWeights_ptr); - CHECK_GL_ERROR + } /* @@ -126,7 +126,7 @@ { GLuint *piWeights_ptr = (GLuint *)env->GetDirectBufferAddress(piWeights) + piWeights_offset; glWeightuivARB(size, piWeights_ptr); - CHECK_GL_ERROR + } /* @@ -138,7 +138,7 @@ { GLushort *psWeights_ptr = (GLushort *)env->GetDirectBufferAddress(psWeights) + psWeights_offset; glWeightusvARB(size, psWeights_ptr); - CHECK_GL_ERROR + } /* @@ -150,7 +150,7 @@ { GLvoid *pPointer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(pPointer) + pPointer_offset); glWeightPointerARB(size, type, stride, pPointer_ptr); - CHECK_GL_ERROR + } /* @@ -161,7 +161,7 @@ (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 @@ (JNIEnv * env, jclass clazz, jint count) { glVertexBlendARB(count); - CHECK_GL_ERROR + } void extgl_InitARBVertexBlend(JNIEnv *env, jobject ext_set) Index: org_lwjgl_opengl_ARBVertexBufferObject.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexBufferObject.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_ARBVertexBufferObject.cpp 7 Mar 2004 15:41:10 -0000 1.4 +++ org_lwjgl_opengl_ARBVertexBufferObject.cpp 7 Mar 2004 16:01:44 -0000 1.5 @@ -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 @@ (JNIEnv * env, jclass clazz, jint target, jint buffer) { glBindBufferARB(target, buffer); - CHECK_GL_ERROR + } /* @@ -84,7 +84,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glDeleteBuffersARB(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -96,7 +96,7 @@ { GLuint *buffers_ptr = (GLuint *)env->GetDirectBufferAddress(buffers) + buffers_offset; glGenBuffersARB(n, buffers_ptr); - CHECK_GL_ERROR + } /* @@ -107,7 +107,7 @@ (JNIEnv * env, jclass clazz, jint buffer) { GLboolean result = glIsBufferARB(buffer); - CHECK_GL_ERROR + return result; } @@ -120,7 +120,7 @@ { GLvoid *data_ptr = (GLvoid *)safeGetBufferAddress(env, data, data_offset); glBufferDataARB(target, size, data_ptr, usage); - CHECK_GL_ERROR + } /* @@ -132,7 +132,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glBufferSubDataARB(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ { GLvoid *data_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(data) + data_offset); glGetBufferSubDataARB(target, offset, size, data_ptr); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ (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 @@ (JNIEnv * env, jclass clazz, jint target) { GLboolean result = glUnmapBufferARB(target); - CHECK_GL_ERROR + return result; } @@ -184,7 +184,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + params_offset; glGetBufferParameterivARB(target, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -196,7 +196,7 @@ { void *pointer; glGetBufferPointervARB((GLenum)target, (GLenum)pname, &pointer); - CHECK_GL_ERROR + return safeNewBuffer(env, pointer, size); } Index: org_lwjgl_opengl_ARBVertexProgram.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexProgram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBVertexProgram.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBVertexProgram.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ (JNIEnv * env, jclass clazz, jint index, jshort x) { glVertexAttrib1sARB(index, x); - CHECK_GL_ERROR + } /* @@ -111,7 +111,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x) { glVertexAttrib1fARB(index, x); - CHECK_GL_ERROR + } /* @@ -122,7 +122,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y) { glVertexAttrib2sARB(index, x, y); - CHECK_GL_ERROR + } /* @@ -133,7 +133,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y) { glVertexAttrib2fARB(index, x, y); - CHECK_GL_ERROR + } /* @@ -144,7 +144,7 @@ (JNIEnv * env, jclass clazz, jint index, jshort x, jshort y, jshort z) { glVertexAttrib3sARB(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -155,7 +155,7 @@ (JNIEnv * env, jclass clazz, jint index, jfloat x, jfloat y, jfloat z) { glVertexAttrib3fARB(index, x, y, z); - CHECK_GL_ERROR + } /* @@ -166,7 +166,7 @@ (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 @@ (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 @@ (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 @@ { GLvoid *buffer_ptr = (GLvoid *)((GLubyte *)env->GetDirectBufferAddress(buffer) + bufferOffset); glVertexAttribPointerARB(index, size, type, normalized, stride, buffer_ptr); - CHECK_GL_ERROR + } /* @@ -211,7 +211,7 @@ (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 @@ (JNIEnv * env, jclass clazz, jint index) { glEnableVertexAttribArrayARB(index); - CHECK_GL_ERROR + } /* @@ -233,7 +233,7 @@ (JNIEnv * env, jclass clazz, jint index) { glDisableVertexAttribArrayARB(index); - CHECK_GL_ERROR + } /* @@ -245,7 +245,7 @@ { GLfloat *params_ptr = (GLfloat *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribfvARB(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -257,7 +257,7 @@ { GLint *params_ptr = (GLint *)env->GetDirectBufferAddress(params) + paramsOffset; glGetVertexAttribivARB(index, pname, params_ptr); - CHECK_GL_ERROR + } /* @@ -269,7 +269,7 @@ { void *address; glGetVertexAttribPointervARB((GLuint)index, (GLuint)pname, &address); - CHECK_GL_ERROR + return safeNewBuffer(env, address, size); } Index: org_lwjgl_opengl_ARBVertexShader.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBVertexShader.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBVertexShader.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBVertexShader.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -35,7 +35,7 @@ // ---------------------------------- #include "extgl.h" -#include "checkGLerror.h" + typedef unsigned char GLcharARB; typedef unsigned int GLhandleARB; @@ -57,7 +57,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; glBindAttribLocationARB(programObj, index, name_ptr); - CHECK_GL_ERROR + } /* @@ -79,7 +79,7 @@ glGetActiveAttribARB(programObj, index, maxLength, length_ptr, size_ptr, type_ptr, name_ptr); } - CHECK_GL_ERROR + } /* @@ -91,7 +91,7 @@ { GLubyte *name_ptr = (GLubyte *)env->GetDirectBufferAddress(name) + nameOffset; GLuint result = glGetAttribLocationARB(programObj, name_ptr); - CHECK_GL_ERROR + return result; } Index: org_lwjgl_opengl_ARBWindowPos.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/arb/org_lwjgl_opengl_ARBWindowPos.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- org_lwjgl_opengl_ARBWindowPos.cpp 7 Mar 2004 15:41:10 -0000 1.3 +++ org_lwjgl_opengl_ARBWindowPos.cpp 7 Mar 2004 16:01:44 -0000 1.4 @@ -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 @@ (JNIEnv * env, jclass clazz, jfloat x, jfloat y) { glWindowPos2fARB(x, y); - CHECK_GL_ERROR + } /* @@ -70,7 +70,7 @@ (JNIEnv * env, jclass clazz, jint x, jint y) { glWindowPos2iARB(x, y); - CHECK_GL_ERROR + } /* @@ -81,7 +81,7 @@ (JNIEnv * env, jclass clazz, jshort x, jshort y) { glWindowPos2sARB(x, y); - CHECK_GL_ERROR + } /* @@ -92,7 +92,7 @@ (JNIEnv * env, jclass clazz, jfloat x, jfloat y, jfloat z) { glWindowPos3fARB(x, y, z); - CHECK_GL_ERROR + } /* @@ -103,7 +103,7 @@ (JNIEnv * env, jclass clazz, jint x, jint y, jint z) { glWindowPos3iARB(x, y, z); - CHECK_GL_ERROR + } /* @@ -114,7 +114,7 @@ (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) |
