Menu
▾
▴
[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/util GL.java,1.6,1.7 GLImpl.java,1.6,1.7 IGL.java,1.5,1.6
|
From: Ioannis T. <sp...@us...> - 2005-01-13 02:16:17
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3312 Modified Files: GL.java GLImpl.java IGL.java Log Message: Implemented PBO support Index: GLImpl.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/GLImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- GLImpl.java 25 Nov 2004 22:17:33 -0000 1.6 +++ GLImpl.java 13 Jan 2005 02:15:50 -0000 1.7 @@ -249,6 +249,20 @@ } /** + * + * @param width + * @param height + * @param xorig + * @param yorig + * @param xmove + * @param ymove + * @param buffer_offect + */ + public void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int buffer_offect) { + GL.glBitmap(width, height, xorig, yorig, xmove, ymove, buffer_offect); + } + + /** * @param red * @param green * @param blue @@ -6548,4 +6562,397 @@ GL.glStencilOpSeparate(face, sfail, dpfail, dppass); } + /** + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public void glDrawPixels(int width, int height, int format, int type, int buffer_offset) { + GL.glDrawPixels(width, height, format, type, buffer_offset); + } + + /** + * @param map + * @param buffer_offset + */ + public void glGetPixelMapfv(int map, int buffer_offset) { + GL.glGetPixelMapfv(map, buffer_offset); + } + + /** + * @param map + * @param buffer_offset + */ + public void glGetPixelMapuiv(int map, int buffer_offset) { + GL.glGetPixelMapuiv(map, buffer_offset); + } + + /** + * @param map + * @param buffer_offset + */ + public void glGetPixelMapusv(int map, int buffer_offset) { + GL.glGetPixelMapusv(map, buffer_offset); + } + + /** + * @param buffer_offset + */ + public void glGetPolygonStipple(int buffer_offset) { + GL.glGetPolygonStipple(buffer_offset); + } + + /** + * @param target + * @param level + * @param format + * @param type + * @param buffer_offset + */ + public void glGetTexImage(int target, int level, int format, int type, int buffer_offset) { + GL.glGetTexImage(target, level, format, type, buffer_offset); + } + + /** + * @param map + * @param mapsize + * @param buffer_offset + */ + public void glPixelMapfv(int map, int mapsize, int buffer_offset) { + GL.glPixelMapfv(map, mapsize, buffer_offset); + } + + /** + * @param map + * @param mapsize + * @param buffer_offset + */ + public void glPixelMapuiv(int map, int mapsize, int buffer_offset) { + GL.glPixelMapuiv(map, mapsize, buffer_offset); + } + + /** + * @param map + * @param mapsize + * @param buffer_offset + */ + public void glPixelMapusv(int map, int mapsize, int buffer_offset) { + GL.glPixelMapusv(map, mapsize, buffer_offset); + } + + /** + * @param buffer_offset + */ + public void glPolygonStipple(int buffer_offset) { + GL.glPolygonStipple(buffer_offset); + } + + /** + * @param x + * @param y + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public void glReadPixels(int x, int y, int width, int height, int format, int type, int buffer_offset) { + GL.glReadPixels(x, y, width, height, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param border + * @param format + * @param type + * @param buffer_offset + */ + public void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int buffer_offset) { + GL.glTexImage1D(target, level, internalformat, width, border, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param border + * @param format + * @param type + * @param buffer_offset + */ + public void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int buffer_offset) { + GL.glTexImage2D(target, level, internalformat, width, height, border, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset + * @param width + * @param format + * @param type + * @param buffer_offset + */ + public void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int buffer_offset) { + GL.glTexSubImage1D(target, level, xoffset, width, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int buffer_offset) { + GL.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalFormat + * @param width + * @param height + * @param depth + * @param border + * @param format + * @param type + * @param buffer_offset + */ + public void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int buffer_offset) { + GL.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param zoffset + * @param width + * @param height + * @param depth + * @param format + * @param type + * @param buffer_offset + */ + public void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int buffer_offset) { + GL.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param border + * @param imageSize + * @param buffer_offset + */ + public void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int buffer_offset) { + GL.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param border + * @param imageSize + * @param buffer_offset + */ + public void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int buffer_offset) { + GL.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param depth + * @param border + * @param imageSize + * @param buffer_offset + */ + public void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int buffer_offset) { + GL.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset + * @param width + * @param format + * @param imageSize + * @param buffer_offset + */ + public void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int buffer_offset) { + GL.glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param width + * @param height + * @param format + * @param imageSize + * @param buffer_offset + */ + public void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int buffer_offset) { + GL.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param zoffset + * @param width + * @param height + * @param depth + * @param format + * @param imageSize + * @param buffer_offset + */ + public void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int buffer_offset) { + GL.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, buffer_offset); + } + + /** + * @param target + * @param lod + * @param buffer_offset + */ + public void glGetCompressedTexImage(int target, int lod, int buffer_offset) { + GL.glGetCompressedTexImage(target, lod, buffer_offset); + } + + /** + * @param target + * @param start + * @param count + * @param format + * @param type + * @param buffer_offset + */ + public void glColorSubTable(int target, int start, int count, int format, int type, int buffer_offset) { + GL.glColorSubTable(target, start, count, format, type, buffer_offset); + } + + /** + * @param target + * @param internalFormat + * @param width + * @param format + * @param type + * @param buffer_offset + */ + public void glColorTable(int target, int internalFormat, int width, int format, int type, int buffer_offset) { + GL.glColorTable(target, internalFormat, width, format, type, buffer_offset); + } + + /** + * @param target + * @param internalformat + * @param width + * @param format + * @param type + * @param buffer_offset + */ + public void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, int buffer_offset) { + GL.glConvolutionFilter1D(target, internalformat, width, format, type, buffer_offset); + } + + /** + * @param target + * @param internalformat + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int buffer_offset) { + GL.glConvolutionFilter2D(target, internalformat, width, height, format, type, buffer_offset); + } + + /** + * @param target + * @param format + * @param type + * @param buffer_offset + */ + public void glGetConvolutionFilter(int target, int format, int type, int buffer_offset) { + GL.glGetConvolutionFilter(target, format, type, buffer_offset); + } + + /** + * @param target + * @param reset + * @param format + * @param type + * @param buffer_offset + */ + public void glGetHistogram(int target, boolean reset, int format, int type, int buffer_offset) { + GL.glGetHistogram(target, reset, format, type, buffer_offset); + } + + /** + * @param target + * @param reset + * @param format + * @param types + * @param buffer_offset + */ + public void glGetMinmax(int target, boolean reset, int format, int types, int buffer_offset) { + GL.glGetMinmax(target, reset, format, types, buffer_offset); + } + + /** + * @param target + * @param format + * @param type + * @param row_offset + * @param column_offset + * @param span_offset + */ + public void glGetSeparableFilter(int target, int format, int type, int row_offset, int column_offset, int span_offset) { + GL.glGetSeparableFilter(target, format, type, row_offset, column_offset, span_offset); + } + + /** + * @param target + * @param internalformat + * @param width + * @param height + * @param format + * @param type + * @param row_offset + * @param column_offset + */ + public void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, int row_offset, int column_offset) { + GL.glSeparableFilter2D(target, internalformat, width, height, format, type, row_offset, column_offset); + } + } Index: GL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/GL.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- GL.java 25 Nov 2004 22:17:33 -0000 1.6 +++ GL.java 13 Jan 2005 02:15:47 -0000 1.7 @@ -97,6 +97,19 @@ } /** + * @param width + * @param height + * @param xorig + * @param yorig + * @param xmove + * @param ymove + * @param buffer_offect + */ + public static void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int buffer_offect) { + GL11.glBitmap(width, height, xorig, yorig, xmove, ymove, buffer_offect); + } + + /** * @param sfactor * @param dfactor */ @@ -467,6 +480,17 @@ GL11.glDrawPixels(width, height, format, type, pixels); } + /** + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public static void glDrawPixels(int width, int height, int format, int type, int buffer_offset) { + GL11.glDrawPixels(width, height, format, type, buffer_offset); + } + /** @param flag */ public static void glEdgeFlag(boolean flag) { GL11.glEdgeFlag(flag); @@ -752,6 +776,14 @@ /** * @param map + * @param buffer_offset + */ + public static void glGetPixelMapfv(int map, int buffer_offset) { + GL11.glGetPixelMapfv(map, buffer_offset); + } + + /** + * @param map * @param values */ public static void glGetPixelMap(int map, IntBuffer values) { @@ -760,6 +792,14 @@ /** * @param map + * @param buffer_offset + */ + public static void glGetPixelMapuiv(int map, int buffer_offset) { + GL11.glGetPixelMapuiv(map, buffer_offset); + } + + /** + * @param map * @param values */ public static void glGetPixelMap(int map, ShortBuffer values) { @@ -767,6 +807,14 @@ } /** + * @param map + * @param buffer_offset + */ + public static void glGetPixelMapusv(int map, int buffer_offset) { + GL11.glGetPixelMapusv(map, buffer_offset); + } + + /** * @param pname * @param size * @@ -782,6 +830,13 @@ } /** + * @param buffer_offset + */ + public static void glGetPolygonStipple(int buffer_offset) { + GL11.glGetPolygonStipple(buffer_offset); + } + + /** * @param name * * @return @@ -862,6 +917,16 @@ /** * @param target * @param level + * @param format + * @param type + * @param buffer_offset + */ + public static void glGetTexImage(int target, int level, int format, int type, int buffer_offset) { + GL11.glGetTexImage(target, level, format, type, buffer_offset); + } + /** + * @param target + * @param level * @param pname * @param params */ @@ -1282,6 +1347,15 @@ /** * @param map + * @param mapsize + * @param buffer_offset + */ + public static void glPixelMapfv(int map, int mapsize, int buffer_offset) { + GL11.glPixelMapfv(map, mapsize, buffer_offset); + } + + /** + * @param map * @param values */ public static void glPixelMap(int map, IntBuffer values) { @@ -1290,6 +1364,15 @@ /** * @param map + * @param mapsize + * @param buffer_offset + */ + public static void glPixelMapuiv(int map, int mapsize, int buffer_offset) { + GL11.glPixelMapuiv(map, mapsize, buffer_offset); + } + + /** + * @param map * @param values */ public static void glPixelMap(int map, ShortBuffer values) { @@ -1297,6 +1380,15 @@ } /** + * @param map + * @param mapsize + * @param buffer_offset + */ + public static void glPixelMapusv(int map, int mapsize, int buffer_offset) { + GL11.glPixelMapusv(map, mapsize, buffer_offset); + } + + /** * @param pname * @param param */ @@ -1363,6 +1455,13 @@ } /** + * @param buffer_offset + */ + public static void glPolygonStipple(int buffer_offset) { + GL11.glPolygonStipple(buffer_offset); + } + + /** * */ public static void glPopAttrib() { @@ -1511,6 +1610,19 @@ } /** + * @param x + * @param y + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public static void glReadPixels(int x, int y, int width, int height, int format, int type, int buffer_offset) { + GL11.glReadPixels(x, y, width, height, format, type, buffer_offset); + } + + /** * @param x1 * @param y1 * @param x2 @@ -1785,6 +1897,20 @@ * @param level * @param internalformat * @param width + * @param border + * @param format + * @param type + * @param buffer_offset + */ + public static void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int buffer_offset) { + GL11.glTexImage1D(target, level, internalformat, width, border, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param internalformat + * @param width * @param height * @param border * @param format @@ -1842,6 +1968,21 @@ /** * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param border + * @param format + * @param type + * @param buffer_offset + */ + public static void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int buffer_offset) { + GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, buffer_offset); + } + + /** + * @param target * @param pname * @param param */ @@ -1919,6 +2060,19 @@ * @param target * @param level * @param xoffset + * @param width + * @param format + * @param type + * @param buffer_offset + */ + public static void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int buffer_offset) { + GL11.glTexSubImage1D(target, level, xoffset, width, format, type, buffer_offset); + } + + /** + * @param target + * @param level + * @param xoffset * @param yoffset * @param width * @param height @@ -1961,6 +2115,21 @@ } /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public static void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int buffer_offset) { + GL11.glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, buffer_offset); + } + + /** * @param x * @param y * @param z @@ -2185,6 +2354,22 @@ /** * @param target * @param level + * @param internalFormat + * @param width + * @param height + * @param depth + * @param border + * @param format + * @param type + * @param buffer_offset + */ + public static void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int buffer_offset) { + GL12.glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, buffer_offset); + } + + /** + * @param target + * @param level * @param xoffset * @param yoffset * @param zoffset @@ -2250,6 +2435,23 @@ GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels); } + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param zoffset + * @param width + * @param height + * @param depth + * @param format + * @param type + * @param buffer_offset + */ + public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int buffer_offset) { + GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, buffer_offset); + } + /** @param texture */ public static void glActiveTexture(int texture) { GL13.glActiveTexture(texture); @@ -2317,6 +2519,18 @@ * @param level * @param internalformat * @param width + * @param border + * @param imageSize + * @param buffer_offset + */ + public static void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int buffer_offset) { + GL13.glCompressedTexImage1D(target, level, internalformat, width, border, imageSize, buffer_offset); + } + /** + * @param target + * @param level + * @param internalformat + * @param width * @param height * @param border * @param imageSize @@ -2374,6 +2588,19 @@ * @param internalformat * @param width * @param height + * @param border + * @param imageSize + * @param buffer_offset + */ + public static void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int buffer_offset) { + GL13.glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, buffer_offset); + } + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param height * @param depth * @param border * @param imageSize @@ -2431,6 +2658,20 @@ /** * @param target * @param level + * @param internalformat + * @param width + * @param height + * @param depth + * @param border + * @param imageSize + * @param buffer_offset + */ + public static void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int buffer_offset) { + GL13.glCompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, buffer_offset); + } + /** + * @param target + * @param level * @param xoffset * @param width * @param format @@ -2484,6 +2725,18 @@ * @param target * @param level * @param xoffset + * @param width + * @param format + * @param imageSize + * @param buffer_offset + */ + public static void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int buffer_offset) { + GL13.glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, buffer_offset); + } + /** + * @param target + * @param level + * @param xoffset * @param yoffset * @param width * @param height @@ -2545,6 +2798,20 @@ * @param level * @param xoffset * @param yoffset + * @param width + * @param height + * @param format + * @param imageSize + * @param buffer_offset + */ + public static void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int buffer_offset) { + GL13.glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, buffer_offset); + } + /** + * @param target + * @param level + * @param xoffset + * @param yoffset * @param zoffset * @param width * @param height @@ -2610,6 +2877,22 @@ /** * @param target + * @param level + * @param xoffset + * @param yoffset + * @param zoffset + * @param width + * @param height + * @param depth + * @param format + * @param imageSize + * @param buffer_offset + */ + public static void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int buffer_offset) { + GL13.glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, buffer_offset); + } + /** + * @param target * @param lod * @param img */ @@ -2635,6 +2918,15 @@ GL13.glGetCompressedTexImage(target, lod, img); } + /** + * @param target + * @param lod + * @param buffer_offset + */ + public static void glGetCompressedTexImage(int target, int lod, int buffer_offset) { + GL13.glGetCompressedTexImage(target, lod, buffer_offset); + } + /** @param m */ public static void glLoadTransposeMatrix(FloatBuffer m) { GL13.glLoadTransposeMatrix(m); @@ -3413,6 +3705,18 @@ /** * @param target + * @param start + * @param count + * @param format + * @param type + * @param buffer_offset + */ + public static void glColorSubTable(int target, int start, int count, int format, int type, int buffer_offset) { + ARBImaging.glColorSubTable(target, start, count, format, type, buffer_offset); + } + + /** + * @param target * @param internalFormat * @param width * @param format @@ -3437,6 +3741,18 @@ /** * @param target + * @param internalFormat + * @param width + * @param format + * @param type + * @param buffer_offset + */ + public static void glColorTable(int target, int internalFormat, int width, int format, int type, int buffer_offset) { + ARBImaging.glColorTable(target, internalFormat, width, format, type, buffer_offset); + } + + /** + * @param target * @param pname * @param params */ @@ -3505,6 +3821,18 @@ * @param target * @param internalformat * @param width + * @param format + * @param type + * @param buffer_offset + */ + public static void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, int buffer_offset) { + ARBImaging.glConvolutionFilter1D(target, internalformat, width, format, type, buffer_offset); + + } + /** + * @param target + * @param internalformat + * @param width * @param height * @param format * @param type @@ -3542,6 +3870,19 @@ /** * @param target + * @param internalformat + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + public static void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int buffer_offset) { + ARBImaging.glConvolutionFilter2D(target, internalformat, width, height, format, type, buffer_offset); + } + + /** + * @param target * @param pname * @param params */ @@ -3701,6 +4042,16 @@ /** * @param target + * @param format + * @param type + * @param buffer_offset + */ + public static void glGetConvolutionFilter(int target, int format, int type, int buffer_offset) { + ARBImaging.glGetConvolutionFilter(target, format, type, buffer_offset); + } + + /** + * @param target * @param pname * @param params */ @@ -3761,6 +4112,10 @@ ARBImaging.glGetHistogram(target, reset, format, type, values); } + public static void glGetHistogram(int target, boolean reset, int format, int type, int buffer_offset) { + ARBImaging.glGetHistogram(target, reset, format, type, buffer_offset); + } + /** * @param target * @param pname @@ -3825,6 +4180,17 @@ /** * @param target + * @param reset + * @param format + * @param types + * @param buffer_offset + */ + public static void glGetMinmax(int target, boolean reset, int format, int types, int buffer_offset) { + ARBImaging.glGetMinmax(target, reset, format, types, buffer_offset); + } + + /** + * @param target * @param pname * @param params */ @@ -3850,8 +4216,19 @@ * @param span */ public static void glGetSeparableFilter(int target, int format, int type, Buffer row, Buffer column, Buffer span) { - ARBImaging - .glGetSeparableFilter(target, format, type, row, column, span); + ARBImaging.glGetSeparableFilter(target, format, type, row, column, span); + } + + /** + * @param target + * @param format + * @param type + * @param row_offset + * @param column_offset + * @param span_offset + */ + public static void glGetSeparableFilter(int target, int format, int type, int row_offset, int column_offset, int span_offset) { + ARBImaging.glGetSeparableFilter(target, format, type, row_offset, column_offset, span_offset); } /** @@ -3897,6 +4274,20 @@ ARBImaging.glSeparableFilter2D(target, internalformat, width, height, format, type, row, column); } + /** + * @param target + * @param internalformat + * @param width + * @param height + * @param format + * @param type + * @param row_offset + * @param column_offset + */ + public static void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, int row_offset, int column_offset) { + ARBImaging.glSeparableFilter2D(target, internalformat, width, height, format, type, row_offset, column_offset); + } + /** @param index */ public static void glCurrentPaletteMatrixARB(int index) { ARBMatrixPalette.glCurrentPaletteMatrixARB(index); Index: IGL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/util/IGL.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- IGL.java 25 Nov 2004 22:17:33 -0000 1.5 +++ IGL.java 13 Jan 2005 02:15:51 -0000 1.6 @@ -83,6 +83,18 @@ void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, ByteBuffer bitmap); /** + * + * @param width + * @param height + * @param xorig + * @param yorig + * @param xmove + * @param ymove + * @param buffer_offect + */ + void glBitmap(int width, int height, float xorig, float yorig, float xmove, float ymove, int buffer_offect); + + /** * @param sfactor * @param dfactor */ @@ -397,6 +409,16 @@ void glDrawPixels(int width, int height, int format, int type, ShortBuffer pixels); /** + * + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + void glDrawPixels(int width, int height, int format, int type, int buffer_offset); + + /** * @param flag */ void glEdgeFlag(boolean flag); @@ -623,17 +645,35 @@ /** * @param map + * @param buffer_offset + */ + void glGetPixelMapfv(int map, int buffer_offset); + + /** + * @param map * @param values */ void glGetPixelMap(int map, IntBuffer values); /** * @param map + * @param buffer_offset + */ + void glGetPixelMapuiv(int map, int buffer_offset); + + /** + * @param map * @param values */ void glGetPixelMap(int map, ShortBuffer values); /** + * @param map + * @param buffer_offset + */ + void glGetPixelMapusv(int map, int buffer_offset); + + /** * @param pname * @param size * @@ -647,6 +687,11 @@ void glGetPolygonStipple(ByteBuffer mask); /** + * @param buffer_offset + */ + void glGetPolygonStipple(int buffer_offset); + + /** * @param name * * @return @@ -711,6 +756,15 @@ /** * @param target * @param level + * @param format + * @param type + * @param buffer_offset + */ + void glGetTexImage(int target, int level, int format, int type, int buffer_offset); + + /** + * @param target + * @param level * @param pname * @param params */ @@ -1059,6 +1113,30 @@ void glPixelMap(int map, ShortBuffer values); /** + * + * @param map + * @param mapsize + * @param buffer_offset + */ + void glPixelMapfv(int map, int mapsize, int buffer_offset); + + /** + * + * @param map + * @param mapsize + * @param buffer_offset + */ + void glPixelMapuiv(int map, int mapsize, int buffer_offset); + + /** + * + * @param map + * @param mapsize + * @param buffer_offset + */ + void glPixelMapusv(int map, int mapsize, int buffer_offset); + + /** * @param pname * @param param */ @@ -1112,6 +1190,12 @@ /** * + * @param buffer_offset + */ + void glPolygonStipple(int buffer_offset); + + /** + * */ void glPopAttrib(); @@ -1231,6 +1315,17 @@ void glReadPixels(int x, int y, int width, int height, int format, int type, ShortBuffer pixels); /** + * @param x + * @param y + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + void glReadPixels(int x, int y, int width, int height, int format, int type, int buffer_offset); + + /** * @param x1 * @param y1 * @param x2 @@ -1453,6 +1548,18 @@ */ void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, ShortBuffer pixels); + /** + * + * @param target + * @param level + * @param internalformat + * @param width + * @param border + * @param format + * @param type + * @param buffer_offset + */ + void glTexImage1D(int target, int level, int internalformat, int width, int border, int format, int type, int buffer_offset); /** * @param target @@ -1509,6 +1616,19 @@ */ void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, ShortBuffer pixels); + /** + * + * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param border + * @param format + * @param type + * @param buffer_offset + */ + void glTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, int buffer_offset); /** * @param target @@ -1561,6 +1681,17 @@ */ void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, IntBuffer pixels); + /** + * + * @param target + * @param level + * @param xoffset + * @param width + * @param format + * @param type + * @param buffer_offset + */ + void glTexSubImage1D(int target, int level, int xoffset, int width, int format, int type, int buffer_offset); /** * @param target @@ -1615,6 +1746,19 @@ */ void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, ShortBuffer pixels); + /** + * + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + void glTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type, int buffer_offset); /** * @param x @@ -1787,7 +1931,6 @@ */ void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, IntBuffer pixels); - /** * @param target * @param level @@ -1802,6 +1945,19 @@ */ void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, ShortBuffer pixels); + /** + * @param target + * @param level + * @param internalFormat + * @param width + * @param height + * @param depth + * @param border + * @param format + * @param type + * @param buffer_offset + */ + void glTexImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int buffer_offset); /** * @param target @@ -1866,6 +2022,21 @@ */ void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, ShortBuffer pixels); + /** + * + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param zoffset + * @param width + * @param height + * @param depth + * @param format + * @param type + * @param buffer_offset + */ + void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int buffer_offset); /** * @param texture @@ -1924,6 +2095,16 @@ */ void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, ShortBuffer data); + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param border + * @param imageSize + * @param buffer_offset + */ + void glCompressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int buffer_offset); /** * @param target @@ -1974,6 +2155,17 @@ */ void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, ShortBuffer data); + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param border + * @param imageSize + * @param buffer_offset + */ + void glCompressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int buffer_offset); /** * @param target @@ -2027,6 +2219,18 @@ */ void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, ShortBuffer data); + /** + * @param target + * @param level + * @param internalformat + * @param width + * @param height + * @param depth + * @param border + * @param imageSize + * @param buffer_offset + */ + void glCompressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int buffer_offset); /** * @param target @@ -2075,6 +2279,16 @@ */ void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, ShortBuffer data); + /** + * @param target + * @param level + * @param xoffset + * @param width + * @param format + * @param imageSize + * @param buffer_offset + */ + void glCompressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int buffer_offset); /** * @param target @@ -2089,7 +2303,6 @@ */ void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ByteBuffer data); - /** * @param target * @param level @@ -2103,7 +2316,6 @@ */ void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, FloatBuffer data); - /** * @param target * @param level @@ -2131,6 +2343,18 @@ */ void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, ShortBuffer data); + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param width + * @param height + * @param format + * @param imageSize + * @param buffer_offset + */ + void glCompressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int buffer_offset); /** * @param target @@ -2147,7 +2371,6 @@ */ void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ByteBuffer data); - /** * @param target * @param level @@ -2163,7 +2386,6 @@ */ void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, FloatBuffer data); - /** * @param target * @param level @@ -2179,7 +2401,6 @@ */ void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, IntBuffer data); - /** * @param target * @param level @@ -2195,6 +2416,20 @@ */ void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, ShortBuffer data); + /** + * @param target + * @param level + * @param xoffset + * @param yoffset + * @param zoffset + * @param width + * @param height + * @param depth + * @param format + * @param imageSize + * @param buffer_offset + */ + void glCompressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int buffer_offset); /** * @param target @@ -2218,6 +2453,13 @@ void glGetCompressedTexImage(int target, int lod, ShortBuffer img); /** + * @param target + * @param lod + * @param buffer_offset + */ + void glGetCompressedTexImage(int target, int lod, int buffer_offset); + + /** * @param m */ void glLoadTransposeMatrix(FloatBuffer m); @@ -2846,6 +3088,16 @@ /** * @param target + * @param start + * @param count + * @param format + * @param type + * @param buffer_offset + */ + void glColorSubTable(int target, int start, int count, int format, int type, int buffer_offset); + + /** + * @param target * @param internalFormat * @param width * @param format @@ -2865,6 +3117,15 @@ */ void glColorTable(int target, int internalFormat, int width, int format, int type, FloatBuffer data); + /** + * @param target + * @param internalFormat + * @param width + * @param format + * @param type + * @param buffer_offset + */ + void glColorTable(int target, int internalFormat, int width, int format, int type, int buffer_offset); /** * @param target @@ -2890,7 +3151,6 @@ */ void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ByteBuffer image); - /** * @param target * @param internalformat @@ -2901,7 +3161,6 @@ */ void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, FloatBuffer image); - /** * @param target * @param internalformat @@ -2912,7 +3171,6 @@ */ void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, IntBuffer image); - /** * @param target * @param internalformat @@ -2923,6 +3181,15 @@ */ void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, ShortBuffer image); + /** + * @param target + * @param internalformat + * @param width + * @param format + * @param type + * @param buffer_offset + */ + void glConvolutionFilter1D(int target, int internalformat, int width, int format, int type, int buffer_offset); /** * @param target @@ -2935,7 +3202,6 @@ */ void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ByteBuffer image); - /** * @param target * @param internalformat @@ -2947,7 +3213,6 @@ */ void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, IntBuffer image); - /** * @param target * @param internalformat @@ -2959,6 +3224,16 @@ */ void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, ShortBuffer image); + /** + * @param target + * @param internalformat + * @param width + * @param height + * @param format + * @param type + * @param buffer_offset + */ + void glConvolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int buffer_offset); /** * @param target @@ -3091,6 +3366,14 @@ /** * @param target + * @param format + * @param type + * @param buffer_offset + */ + void glGetConvolutionFilter(int target, int format, int type, int buffer_offset); + + /** + * @param target * @param pname * @param params */ @@ -3141,6 +3424,15 @@ /** * @param target + * @param reset + * @param format + * @param type + * @param buffer_offset + */ + void glGetHistogram(int target, boolean reset, int format, int type, int buffer_offset); + + /** + * @param target * @param pname * @param params */ @@ -3191,6 +3483,15 @@ /** * @param target + * @param reset + * @param format + * @param types + * @param buffer_offset + */ + void glGetMinmax(int target, boolean reset, int format, int types, int buffer_offset); + + /** + * @param target * @param pname * @param params */ @@ -3213,6 +3514,15 @@ */ void glGetSeparableFilter(int target, int format, int type, Buffer row, Buffer column, Buffer span); + /** + * @param target + * @param format + * @param type + * @param row_offset + * @param column_offset + * @param span_offset + */ + void glGetSeparableFilter(int target, int format, int type, int row_offset, int column_offset, int span_offset); /** * @param target @@ -3251,6 +3561,17 @@ */ void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, Buffer row, Buffer column); + /** + * @param target + * @param internalformat + * @param width + * @param height + * @param format + * @param type + * @param row_offset + * @param column_offset + */ + void glSeparableFilter2D(int target, int internalformat, int width, int height, int format, int type, int row_offset, int column_offset); /** * @param index @@ -5204,7 +5525,7 @@ * @param name */ void glGetActiveUniform(int program, int index, - IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name); + IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name); /** * @param program @@ -5243,7 +5564,7 @@ * @param name */ void glGetActiveAttrib(int program, int index, - IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name); + IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name); /** * @param program |
