|
From: Ioannis T. <sp...@us...> - 2004-03-29 16:59:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28608 Modified Files: extgl.cpp extgl.h Log Message: New extensions and static import modifications Index: extgl.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- extgl.cpp 18 Mar 2004 21:58:02 -0000 1.34 +++ extgl.cpp 29 Mar 2004 16:47:53 -0000 1.35 @@ -545,8 +545,6 @@ } } - extgl_Extensions.GL_ARB_depth_texture = GLQueryExtension(env, ext_set, "GL_ARB_depth_texture"); - extgl_Extensions.GL_ARB_imaging = GLQueryExtension(env, ext_set, "GL_ARB_imaging"); extgl_Extensions.GL_ARB_depth_texture = GLQueryExtension(env, ext_set, "GL_ARB_depth_texture"); extgl_Extensions.GL_ARB_fragment_program = GLQueryExtension(env, ext_set, "GL_ARB_fragment_program"); @@ -582,11 +580,14 @@ extgl_Extensions.GL_EXT_bgra = GLQueryExtension(env, ext_set, "GL_EXT_bgra"); extgl_Extensions.GL_EXT_blend_func_separate = GLQueryExtension(env, ext_set, "GL_EXT_blend_func_separate"); extgl_Extensions.GL_EXT_blend_subtract = GLQueryExtension(env, ext_set, "GL_EXT_blend_subtract"); + extgl_Extensions.GL_EXT_Cg_shader = GLQueryExtension(env, ext_set, "GL_EXT_Cg_shader"); extgl_Extensions.GL_EXT_compiled_vertex_array = GLQueryExtension(env, ext_set, "GL_EXT_compiled_vertex_array"); + extgl_Extensions.GL_EXT_depth_bounds_test = GLQueryExtension(env, ext_set, "GL_EXT_depth_bounds_test"); extgl_Extensions.GL_EXT_draw_range_elements = GLQueryExtension(env, ext_set, "GL_EXT_draw_range_elements"); extgl_Extensions.GL_EXT_fog_coord = GLQueryExtension(env, ext_set, "GL_EXT_fog_coord"); extgl_Extensions.GL_EXT_multi_draw_arrays = GLQueryExtension(env, ext_set, "GL_EXT_multi_draw_arrays"); extgl_Extensions.GL_EXT_packed_pixels = GLQueryExtension(env, ext_set, "GL_EXT_packed_pixels"); + extgl_Extensions.GL_EXT_pixel_buffer_object = GLQueryExtension(env, ext_set, "GL_EXT_pixel_buffer_object"); extgl_Extensions.GL_EXT_point_parameters = GLQueryExtension(env, ext_set, "GL_EXT_point_parameters"); extgl_Extensions.GL_EXT_rescale_normal = GLQueryExtension(env, ext_set, "GL_EXT_rescale_normal"); extgl_Extensions.GL_EXT_secondary_color = GLQueryExtension(env, ext_set, "GL_EXT_secondary_color"); @@ -625,6 +626,7 @@ extgl_Extensions.GL_NV_float_buffer = GLQueryExtension(env, ext_set, "GL_NV_float_buffer"); extgl_Extensions.GL_NV_fog_distance = GLQueryExtension(env, ext_set, "GL_NV_fog_distance"); extgl_Extensions.GL_NV_fragment_program = GLQueryExtension(env, ext_set, "GL_NV_fragment_program"); + extgl_Extensions.GL_NV_fragment_program_option = GLQueryExtension(env, ext_set, "GL_NV_fragment_program_option"); extgl_Extensions.GL_NV_half_float = GLQueryExtension(env, ext_set, "GL_NV_half_float"); extgl_Extensions.GL_NV_light_max_exponent = GLQueryExtension(env, ext_set, "GL_NV_light_max_exponent"); extgl_Extensions.GL_NV_multisample_filter_hint = GLQueryExtension(env, ext_set, "GL_NV_multisample_filter_hint"); @@ -648,10 +650,12 @@ extgl_Extensions.GL_NV_vertex_program = GLQueryExtension(env, ext_set, "GL_NV_vertex_program"); extgl_Extensions.GL_NV_vertex_program1_1 = GLQueryExtension(env, ext_set, "GL_NV_vertex_program1_1"); extgl_Extensions.GL_NV_vertex_program2 = GLQueryExtension(env, ext_set, "GL_NV_vertex_program2"); + extgl_Extensions.GL_NV_vertex_program2_option = GLQueryExtension(env, ext_set, "GL_NV_vertex_program2_option"); } extern bool extgl_InitOpenGL1_1(JNIEnv *env); -//extern void extgl_InitARBFragmentProgram(JNIEnv *env, jobject ext_set); + +extern void extgl_InitARBBufferObject(JNIEnv *env, jobject ext_set); extern void extgl_InitARBImaging(JNIEnv *env, jobject ext_set); extern void extgl_InitARBMatrixPalette(JNIEnv *env, jobject ext_set); extern void extgl_InitARBMultisample(JNIEnv *env, jobject ext_set); @@ -663,13 +667,13 @@ extern void extgl_InitARBTextureCompression(JNIEnv *env, jobject ext_set); extern void extgl_InitARBTransposeMatrix(JNIEnv *env, jobject ext_set); extern void extgl_InitARBVertexBlend(JNIEnv *env, jobject ext_set); -extern void extgl_InitARBVertexBufferObject(JNIEnv *env, jobject ext_set); extern void extgl_InitARBVertexProgram(JNIEnv *env, jobject ext_set); extern void extgl_InitARBVertexShader(JNIEnv *env, jobject ext_set); extern void extgl_InitARBWindowPos(JNIEnv *env, jobject ext_set); extern void extgl_InitEXTBlendFuncSeparate(JNIEnv *env, jobject ext_set); extern void extgl_InitEXTCompiledVertexArray(JNIEnv *env, jobject ext_set); +extern void extgl_InitEXTDepthBoundsTest(JNIEnv *env, jobject ext_set); extern void extgl_InitEXTDrawRangeElements(JNIEnv *env, jobject ext_set); extern void extgl_InitEXTFogCoord(JNIEnv *env, jobject ext_set); extern void extgl_InitEXTMultiDrawArrays(JNIEnv *env, jobject ext_set); @@ -722,7 +726,7 @@ //extgl_InitEXTNurbsTesselator(env, ext_set); /* first load the extensions */ - // extgl_InitARBFragmentProgram(env, ext_set); + extgl_InitARBBufferObject(env, ext_set); extgl_InitARBImaging(env, ext_set); extgl_InitARBMatrixPalette(env, ext_set); extgl_InitARBMultisample(env, ext_set); @@ -734,14 +738,13 @@ extgl_InitARBTextureCompression(env, ext_set); extgl_InitARBTransposeMatrix(env, ext_set); extgl_InitARBVertexBlend(env, ext_set); - extgl_InitARBVertexBufferObject(env, ext_set); extgl_InitARBVertexProgram(env, ext_set); extgl_InitARBVertexShader(env, ext_set); extgl_InitARBWindowPos(env, ext_set); extgl_InitEXTBlendFuncSeparate(env, ext_set); extgl_InitEXTCompiledVertexArray(env, ext_set); - //extgl_InitEXTCullVertex(env, ext_set); + extgl_InitEXTDepthBoundsTest(env, ext_set); extgl_InitEXTDrawRangeElements(env, ext_set); extgl_InitEXTFogCoord(env, ext_set); extgl_InitEXTMultiDrawArrays(env, ext_set); @@ -751,7 +754,6 @@ extgl_InitEXTVertexShader(env, ext_set); extgl_InitEXTVertexWeighting(env, ext_set); - //extgl_InitNVElementArray(env, ext_set); extgl_InitNVEvaluators(env, ext_set); extgl_InitNVFence(env, ext_set); extgl_InitNVFragmentProgram(env, ext_set); Index: extgl.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/extgl.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- extgl.h 18 Mar 2004 21:58:02 -0000 1.35 +++ extgl.h 29 Mar 2004 16:47:53 -0000 1.36 @@ -2088,11 +2088,14 @@ bool GL_EXT_bgra; bool GL_EXT_blend_func_separate; bool GL_EXT_blend_subtract; + bool GL_EXT_Cg_shader; bool GL_EXT_compiled_vertex_array; + bool GL_EXT_depth_bounds_test; bool GL_EXT_draw_range_elements; bool GL_EXT_fog_coord; bool GL_EXT_multi_draw_arrays; bool GL_EXT_packed_pixels; + bool GL_EXT_pixel_buffer_object; bool GL_EXT_point_parameters; bool GL_EXT_rescale_normal; bool GL_EXT_secondary_color; @@ -2131,6 +2134,7 @@ bool GL_NV_float_buffer; bool GL_NV_fog_distance; bool GL_NV_fragment_program; + bool GL_NV_fragment_program_option; bool GL_NV_half_float; bool GL_NV_light_max_exponent; bool GL_NV_multisample_filter_hint; @@ -2154,6 +2158,7 @@ bool GL_NV_vertex_program; bool GL_NV_vertex_program1_1; bool GL_NV_vertex_program2; + bool GL_NV_vertex_program2_option; }; extern struct ExtensionTypes extgl_Extensions; |