From: Elias N. <eli...@us...> - 2003-08-23 11:54:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv1733/src/native/common Modified Files: extgl.c extgl.h org_lwjgl_opengl_GL.cpp org_lwjgl_opengl_GL.h Log Message: ATI_separate_stencil support added Index: extgl.c CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.c =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- extgl.c 16 May 2003 18:39:45 -0000 1.17 +++ extgl.c 23 Aug 2003 11:34:14 -0000 1.18 @@ -936,6 +936,13 @@ glEvalMapsNVPROC glEvalMapsNV = NULL; #endif /* GL_NV_evaluators */ +/* ATI_separate_stencil */ + +#ifdef GL_ATI_separate_stencil +glStencilOpSeparateATIPROC glStencilOpSeparateATI = NULL; +glStencilFuncSeparateATIPROC glStencilFuncSeparateATI = NULL; +#endif /* GL_ATI_separate_stencil */ + /* ATI_pn_triangles */ #ifdef GL_ATI_pn_triangles @@ -2094,6 +2101,16 @@ #endif } +void extgl_InitATISeparateStencil() +{ +#ifdef GL_ATI_separate_stencil + if (!extgl_Extensions.ATI_separate_stencil) + return; + glStencilOpSeparateATI = (glStencilOpSeparateATIPROC)extgl_GetProcAddress("glStencilOpSeparateATI"); + glStencilFuncSeparateATI = (glStencilFuncSeparateATIPROC)extgl_GetProcAddress("glStencilFuncSeparateATI"); +#endif +} + void extgl_InitNVEvaluators() { #ifdef GL_NV_evaluators @@ -3163,6 +3180,7 @@ extgl_Extensions.ATI_fragment_shader = GLQueryExtension("GL_ATI_fragment_shader"); extgl_Extensions.ATI_pn_triangles = GLQueryExtension("GL_ATI_pn_triangles"); extgl_Extensions.ATI_point_cull_mode = GLQueryExtension("GL_ATI_point_cull_mode"); + extgl_Extensions.ATI_separate_stencil = GLQueryExtension("GL_ATI_separate_stencil"); extgl_Extensions.ATI_text_fragment_shader = GLQueryExtension("GL_ATI_text_fragment_shader"); extgl_Extensions.ATI_texture_mirror_once = GLQueryExtension("GL_ATI_texture_mirror_once"); extgl_Extensions.ATI_vertex_array_object = GLQueryExtension("GL_ATI_vertex_array_object"); @@ -3228,6 +3246,7 @@ extgl_InitNVFence(); extgl_InitNVRegisterCombiners2(); extgl_InitATIPNTriangles(); + extgl_InitATISeparateStencil(); extgl_InitARBPointParameters(); extgl_InitARBVertexBlend(); extgl_InitEXTMultiDrawArrays(); Index: extgl.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/extgl.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- extgl.h 4 Aug 2003 23:00:48 -0000 1.12 +++ extgl.h 23 Aug 2003 11:34:14 -0000 1.13 @@ -5444,6 +5444,26 @@ #endif /* GL_ARB_fragment_program */ /*-------------------------------------------------------------------*/ +/*------------ATI_separate_stencil---------------------------------------*/ +/*-------------------------------------------------------------------*/ + +#ifndef GL_ATI_separate_stencil +#define GL_ATI_separate_stencil 1 + +#define GL_STENCIL_BACK_FUNC_ATI 0x8800 +#define GL_STENCIL_BACK_FAIL_ATI 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 + +typedef void (APIENTRY * glStencilOpSeparateATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); +typedef void (APIENTRY * glStencilFuncSeparateATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); + +extern glStencilOpSeparateATIPROC glStencilOpSeparateATI; +extern glStencilFuncSeparateATIPROC glStencilFuncSeparateATI; + +#endif /* GL_ATI_separate_stencil */ + +/*-------------------------------------------------------------------*/ /*------------GL_ATI_TEXT_FRAGMENT_SHADER----------------------------*/ /*-------------------------------------------------------------------*/ @@ -5883,6 +5903,7 @@ int ATI_fragment_shader; int ATI_pn_triangles; int ATI_point_cull_mode; + int ATI_separate_stencil; int ATI_text_fragment_shader; int ATI_texture_mirror_once; int ATI_vertex_array_object; Index: org_lwjgl_opengl_GL.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- org_lwjgl_opengl_GL.cpp 4 Aug 2003 23:00:49 -0000 1.17 +++ org_lwjgl_opengl_GL.cpp 23 Aug 2003 11:34:14 -0000 1.18 @@ -1912,6 +1912,32 @@ /* * Class: org_lwjgl_opengl_GL + * Method: glStencilOpSeparateATI + * Signature: (IIII)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilOpSeparateATI + (JNIEnv *env, jclass clazz, jint p0, jint p1, jint p2, jint p3) +{ + CHECK_EXISTS(glStencilOpSeparateATI) + glStencilOpSeparateATI(p0, p1, p2, p3); + CHECK_GL_ERROR +} + +/* + * Class: org_lwjgl_opengl_GL + * Method: glStencilFuncSeparateATI + * Signature: (IIII)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilFuncSeparateATI + (JNIEnv *env, jclass clazz, jint p0, jint p1, jint p2, jint p3) +{ + CHECK_EXISTS(glStencilFuncSeparateATI) + glStencilFuncSeparateATI(p0, p1, p2, p3); + CHECK_GL_ERROR +} + +/* + * Class: org_lwjgl_opengl_GL * Method: glPointParameterfARB */ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glPointParameterfARB(JNIEnv * env, jclass clazz, jint p0, jfloat p1) Index: org_lwjgl_opengl_GL.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_GL.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- org_lwjgl_opengl_GL.h 4 Aug 2003 23:00:49 -0000 1.13 +++ org_lwjgl_opengl_GL.h 23 Aug 2003 11:34:14 -0000 1.14 @@ -1281,6 +1281,22 @@ /* * Class: org_lwjgl_opengl_GL + * Method: glStencilOpSeparateATI + * Signature: (IIII)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilOpSeparateATI + (JNIEnv *, jclass, jint, jint, jint, jint); + +/* + * Class: org_lwjgl_opengl_GL + * Method: glStencilFuncSeparateATI + * Signature: (IIII)V + */ +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_glStencilFuncSeparateATI + (JNIEnv *, jclass, jint, jint, jint, jint); + +/* + * Class: org_lwjgl_opengl_GL * Method: glPointParameterfARB * Signature: (IF)V */ |