From: Caspian Rychlik-P. <ci...@us...> - 2002-10-18 23:21:53
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory usw-pr-cvs1:/tmp/cvs-serv28727/src/java/org/lwjgl/opengl Modified Files: GL.java CoreGL.java GLConstants.java Log Message: New extensions Index: GL.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- GL.java 20 Sep 2002 16:57:13 -0000 1.10 +++ GL.java 18 Oct 2002 23:21:49 -0000 1.11 @@ -1337,14 +1337,10 @@ public static native void wglFreeMemoryNV(int pointer); - - public static native int wglGetCurrentReadDCARB(); public static native String wglGetExtensionsStringARB(int hdc); - - public static native String wglGetExtensionsStringEXT(); public static native int wglGetPbufferDCARB(int hPbuffer); @@ -1379,7 +1375,9 @@ public static native int wglReleasePbufferDCARB(int hPbuffer, int hDC); - public static native boolean wglReleaseTexImageARB(int hPbuffer, int iBuffer); + public static native boolean wglReleaseTexImageARB( + int hPbuffer, + int iBuffer); public static native boolean wglRestoreBufferRegionARB( int hRegion, @@ -1468,21 +1466,32 @@ public boolean ARB_window_pos; public boolean EXT_abgr; public boolean EXT_bgra; + public boolean EXT_blend_color; public boolean EXT_blend_function_separate; + public boolean EXT_blend_minmax; + public boolean EXT_blend_subtract; public boolean EXT_compiled_vertex_array; public boolean EXT_cull_vertex; public boolean EXT_draw_range_elements; public boolean EXT_fog_coord; + public boolean EXT_light_max_exponent; public boolean EXT_multi_draw_arrays; + public boolean EXT_packed_pixels; + public boolean EXT_paletted_texture; public boolean EXT_point_parameters; - public boolean EXT_secondary_color ; + public boolean EXT_rescale_normal; + public boolean EXT_secondary_color; public boolean EXT_separate_specular_color; public boolean EXT_shadow_funcs; + public boolean EXT_shared_texture_palette; public boolean EXT_stencil_two_side; public boolean EXT_stencil_wrap; public boolean EXT_texture_compression_s3tc; + public boolean EXT_texture_env_combine; + public boolean EXT_texture_env_dot3; public boolean EXT_texture_filter_anisotropic; public boolean EXT_texture_lod_bias; + public boolean EXT_vertex_array; public boolean EXT_vertex_shader; public boolean EXT_vertex_weighting; public boolean ATI_element_array; @@ -1536,22 +1545,23 @@ * Determine which extensions are available */ private void determineAvailableExtensions() { - + determineAvailableWGLExtensions(); - + // Grab all the public booleans out of this class Field[] fields = GL.class.getDeclaredFields(); HashMap map = new HashMap(fields.length); - for (int i = 0; i < fields.length; i ++) { - if (!Modifier.isStatic(fields[i].getModifiers()) && fields[i].getType() == boolean.class) + for (int i = 0; i < fields.length; i++) { + if (!Modifier.isStatic(fields[i].getModifiers()) + && fields[i].getType() == boolean.class) map.put(fields[i].getName(), fields[i]); } - + String exts = getString(EXTENSIONS); StringTokenizer st = new StringTokenizer(exts); while (st.hasMoreTokens()) { String ext = st.nextToken(); - + Field f = (Field) map.get(ext); if (f != null) { try { @@ -1560,9 +1570,9 @@ e.printStackTrace(System.err); } } - + } - + // Let's see what openGL version we are too: String version = getString(VERSION); int i = version.indexOf("1."); @@ -1580,7 +1590,7 @@ } } } - + /* * Available WGL extensions */ @@ -1588,7 +1598,7 @@ public static boolean WGL_ARB_extensions_string; public static boolean WGL_ARB_pbuffer; public static boolean WGL_ARB_pixel_format; - public static boolean WGL_ARB_render_texture; + public static boolean WGL_ARB_render_texture; public static boolean WGL_EXT_extensions_string; public static boolean WGL_EXT_swap_control; @@ -1597,42 +1607,44 @@ * if available. */ private static native void checkWGLExtensionsString(); - + /** * Determine which WGL extensions are available */ private void determineAvailableWGLExtensions() { - + // First we must determine if WGL_EXT_extensions_string is available checkWGLExtensionsString(); if (!WGL_EXT_extensions_string && !WGL_ARB_extensions_string) return; - + // Grab all the public booleans out of this class Field[] fields = GL.class.getDeclaredFields(); HashMap map = new HashMap(fields.length); - for (int i = 0; i < fields.length; i ++) { - if (Modifier.isStatic(fields[i].getModifiers()) && fields[i].getType() == boolean.class) + for (int i = 0; i < fields.length; i++) { + if (Modifier.isStatic(fields[i].getModifiers()) + && fields[i].getType() == boolean.class) map.put(fields[i].getName(), fields[i]); } - + final String exts; - + if (WGL_ARB_extensions_string) - exts = wglGetExtensionsStringARB(Display.getHandle()); // Remember - this is an HWND not an HDC, which is what's required + exts = wglGetExtensionsStringARB(Display.getHandle()); + // Remember - this is an HWND not an HDC, which is what's required else exts = wglGetExtensionsStringEXT(); - + if (exts == null) return; - System.out.println("Available WGL extensions:"); + System.out.println("Available WGL extensions:"); StringTokenizer st = new StringTokenizer(exts); while (st.hasMoreTokens()) { String ext = st.nextToken(); - + System.out.println(ext); - + Field f = (Field) map.get(ext); if (f != null) { try { @@ -1641,8 +1653,8 @@ e.printStackTrace(System.err); } } - - } + + } } /* (non-Javadoc) Index: CoreGL.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CoreGL.java 19 Aug 2002 14:01:03 -0000 1.4 +++ CoreGL.java 18 Oct 2002 23:21:49 -0000 1.5 @@ -57,6 +57,38 @@ public native void accum(int op, float value); public native void alphaFunc(int func, float ref); + public native void colorTable( + int target, + int internalFormat, + int width, + int format, + int type, + int data); + + public native void colorSubTable( + int target, + int start, + int count, + int format, + int type, + int data); + + public native void getColorTable( + int target, + int format, + int type, + int data); + + public native void getColorTableParameteriv( + int target, + int pname, + int params); + + public native void getColorTableParameterfv( + int target, + int pname, + int params); + public native void clearColor(float red, float green, float blue, float alpha); public native void clearAccum(float red, float green, float blue, float alpha); public native void clear(int mask); Index: GLConstants.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLConstants.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GLConstants.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GLConstants.java 16 Aug 2002 21:53:02 -0000 1.4 +++ GLConstants.java 18 Oct 2002 23:21:49 -0000 1.5 @@ -39,7 +39,7 @@ import org.lwjgl.opengl.atix.ATIXPointSprites; import org.lwjgl.opengl.atix.ATIXTextureEnvRoute; import org.lwjgl.opengl.ext.*; -import org.lwjgl.opengl.ext.EXTAgbr; +import org.lwjgl.opengl.ext.EXTAbgr; import org.lwjgl.opengl.ext.EXTCompiledVertexArray; import org.lwjgl.opengl.hp.HPOcclusionTest; import org.lwjgl.opengl.nv.*; @@ -89,17 +89,28 @@ ATIVertexStreams, ATIXPointSprites, ATIXTextureEnvRoute, - EXTAgbr, + EXTAbgr, + EXTBgra, + EXTBlendColor, + EXTBlendMinmax, EXTCompiledVertexArray, EXTDrawRangeElements, EXTFogCoord, + EXTLightMaxExponent, + EXTPackedPixels, EXTPointParameters, + EXTRescaleNormal, EXTSecondaryColor, + EXTSeparateSpecularColor, + EXTSharedTexturePalette, EXTStencilTwoSide, EXTStencilWrap, EXTTextureCompressionS3TC, + EXTTextureEnvCombine, + EXTTextureEnvDot3, EXTTextureFilterAnisotropic, EXTTextureLODBias, + EXTVertexArray, EXTVertexShader, EXTVertexWeighting, HPOcclusionTest, |