diff --git a/src/java/org/lwjgl/opengl/CoreGL.java b/src/java/org/lwjgl/opengl/CoreGL.java index 4449e6b1..61d23177 100644 --- a/src/java/org/lwjgl/opengl/CoreGL.java +++ b/src/java/org/lwjgl/opengl/CoreGL.java @@ -110,6 +110,86 @@ public class CoreGL extends BaseGL implements CoreGLConstants { public native void copyTexSubImage1D(int target, int level, int xoffset, int x, int y, int width); public native void copyTexImage2D(int target, int level, int internalFormat, int x, int y, int width, int height, int border); public native void copyTexImage1D(int target, int level, int internalFormat, int x, int y, int width, int border); + /* OpenGL 1.2 functions */ + public native void colorTableParameteriv(int target, int pname, int params); + public native void colorTableParameterfv(int target, int pname, int params); + public native void copyColorSubTable(int target, int start, int x, int y, int width); + public native void copyColorTable(int target, int internalformat, int x, int y, int width); + public native void blendEquation(int mode); + public native void histogram(int target, int width, int internalformat, boolean sink); + public native void resetHistogram(int target); + public native void getHistogram(int target, boolean reset, int format, int type, int values); + public native void getHistogramParameterfv(int target, int pname, int params); + public native void getHistogramParameteriv(int target, int pname, int params); + public native void minmax(int target, int internalformat, boolean sink); + public native void resetMinmax(int target); + public native void getMinmax(int target, boolean reset, int format, int types, int values); + public native void getMinmaxParameterfv(int target, int pname, int params); + public native void getMinmaxParameteriv(int target, int pname, int params); + public native void convolutionFilter1D(int target, int internalformat, int width, int format, int type, int image); + public native void convolutionFilter2D(int target, int internalformat, int width, int height, int format, int type, int image); + public native void convolutionParameterf(int target, int pname, float params); + public native void convolutionParameterfv(int target, int pname, int params); + public native void convolutionParameteri(int target, int pname, int params); + public native void convolutionParameteriv(int target, int pname, int params); + public native void copyConvolutionFilter1D(int target, int internalformat, int x, int y, int width); + public native void copyConvolutionFilter2D(int target, int internalformat, int x, int y, int width, int height); + public native void getConvolutionFilter(int target, int format, int type, int image); + public native void getConvolutionParameterfv(int target, int pname, int params); + public native void getConvolutionParameteriv(int target, int pname, int params); + public native void separableFilter2D(int target, int internalformat, int width, int height, int format, int type, int row, int column); + public native void getSeparableFilter(int target, int format, int type, int row, int column, int span); + public native void drawRangeElements(int mode, int start, int end, int count, int type, int indices); + public native void texImage3D(int target, int level, int internalFormat, int width, int height, int depth, int border, int format, int type, int pixels); + public native void texSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, int pixels); + public native void copyTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int x, int y, int width, int height); + /* OpenGL 1.3 funstions */ + public native void activeTexture(int texture); + public native void clientActiveTexture(int texture); + public native void compressedTexImage1D(int target, int level, int internalformat, int width, int border, int imageSize, int data); + public native void compressedTexImage2D(int target, int level, int internalformat, int width, int height, int border, int imageSize, int data); + public native void compressedTexImage3D(int target, int level, int internalformat, int width, int height, int depth, int border, int imageSize, int data); + public native void compressedTexSubImage1D(int target, int level, int xoffset, int width, int format, int imageSize, int data); + public native void compressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int imageSize, int data); + public native void compressedTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int imageSize, int data); + public native void getCompressedTexImage(int target, int lod, int img); + public native void multiTexCoord1d(int target, double s); + public native void multiTexCoord1dv(int target, int v); + public native void multiTexCoord1f(int target, float s); + public native void multiTexCoord1fv(int target, int v); + public native void multiTexCoord1i(int target, int s); + public native void multiTexCoord1iv(int target, int v); + public native void multiTexCoord1s(int target, short s); + public native void multiTexCoord1sv(int target, int v); + public native void multiTexCoord2d(int target, double s, double t); + public native void multiTexCoord2dv(int target, int v); + public native void multiTexCoord2f(int target, float s, float t); + public native void multiTexCoord2fv(int target, int v); + public native void multiTexCoord2i(int target, int s, int t); + public native void multiTexCoord2iv(int target, int v); + public native void multiTexCoord2s(int target, short s, short t); + public native void multiTexCoord2sv(int target, int v); + public native void multiTexCoord3d(int target, double s, double t, double r); + public native void multiTexCoord3dv(int target, int v); + public native void multiTexCoord3f(int target, float s, float t, float r); + public native void multiTexCoord3fv(int target, int v); + public native void multiTexCoord3i(int target, int s, int t, int r); + public native void multiTexCoord3iv(int target, int v); + public native void multiTexCoord3s(int target, short s, short t, short r); + public native void multiTexCoord3sv(int target, int v); + public native void multiTexCoord4d(int target, double s, double t, double r, double q); + public native void multiTexCoord4dv(int target, int v); + public native void multiTexCoord4f(int target, float s, float t, float r, float q); + public native void multiTexCoord4fv(int target, int v); + public native void multiTexCoord4i(int target, int s, int t, int r, int q); + public native void multiTexCoord4iv(int target, int v); + public native void multiTexCoord4s(int target, short s, short t, short r, short q); + public native void multiTexCoord4sv(int target, int v); + public native void loadTransposeMatrixd(int m); + public native void loadTransposeMatrixf(int m); + public native void multTransposeMatrixd(int m); + public native void multTransposeMatrixf(int m); + public native void sampleCoverage(float value, boolean invert); public native void copyPixels(int x, int y, int width, int height, int type); public native void colorPointer(int size, int type, int stride, int pointer); public native void colorMaterial(int face, int mode); @@ -130,6 +210,21 @@ public class CoreGL extends BaseGL implements CoreGLConstants { public native void color4ub(byte red, byte green, byte blue, byte alpha); public native void color4ui(int red, int green, int blue, int alpha); public native void color4us(short red, short green, short blue, short alpha); + public native void color3bv(int v); + public native void color3dv(int v); + public native void color3fv(int v); + public native void color3iv(int v); + public native void color3sv(int v); + public native void color3ubv(int v); + public native void color3uiv(int v); + public native void color3usv(int v); + public native void color4bv(int v); + public native void color4dv(int v); + public native void color4fv(int v); + public native void color4iv(int v); + public native void color4sv(int v); + public native void color4ubv(int v); + public native void color4uiv(int v); public native void clipPlane(int plane, int equation); public native void clearStencil(int s); public native void clearIndex(float c); diff --git a/src/java/org/lwjgl/opengl/CoreGLConstants.java b/src/java/org/lwjgl/opengl/CoreGLConstants.java index e3f00d12..264f6f46 100644 --- a/src/java/org/lwjgl/opengl/CoreGLConstants.java +++ b/src/java/org/lwjgl/opengl/CoreGLConstants.java @@ -926,6 +926,227 @@ public interface CoreGLConstants { /* GL_TEXTURE_BORDER_COLOR */ /* GL_TEXTURE_PRIORITY */ + /* OpenGL 1.2 constants */ + public static final int RESCALE_NORMAL = 0x803A; + public static final int CLAMP_TO_EDGE = 0x812F; + public static final int MAX_ELEMENTS_VERTICES = 0x80E8; + public static final int MAX_ELEMENTS_INDICES = 0x80E9; + public static final int BGR = 0x80E0; + public static final int BGRA = 0x80E1; + public static final int UNSIGNED_BYTE_3_3_2 = 0x8032; + public static final int UNSIGNED_BYTE_2_3_3_REV = 0x8362; + public static final int UNSIGNED_SHORT_5_6_5 = 0x8363; + public static final int UNSIGNED_SHORT_5_6_5_REV = 0x8364; + public static final int UNSIGNED_SHORT_4_4_4_4 = 0x8033; + public static final int UNSIGNED_SHORT_4_4_4_4_REV = 0x8365; + public static final int UNSIGNED_SHORT_5_5_5_1 = 0x8034; + public static final int UNSIGNED_SHORT_1_5_5_5_REV = 0x8366; + public static final int UNSIGNED_INT_8_8_8_8 = 0x8035; + public static final int UNSIGNED_INT_8_8_8_8_REV = 0x8367; + public static final int UNSIGNED_INT_10_10_10_2 = 0x8036; + public static final int UNSIGNED_INT_2_10_10_10_REV = 0x8368; + public static final int LIGHT_MODEL_COLOR_CONTROL = 0x81F8; + public static final int SINGLE_COLOR = 0x81F9; + public static final int SEPARATE_SPECULAR_COLOR = 0x81FA; + public static final int TEXTURE_MIN_LOD = 0x813A; + public static final int TEXTURE_MAX_LOD = 0x813B; + public static final int TEXTURE_BASE_LEVEL = 0x813C; + public static final int TEXTURE_MAX_LEVEL = 0x813D; + public static final int SMOOTH_POINT_SIZE_RANGE = 0x0B12; + public static final int SMOOTH_POINT_SIZE_GRANULARITY = 0x0B13; + public static final int SMOOTH_LINE_WIDTH_RANGE = 0x0B22; + public static final int SMOOTH_LINE_WIDTH_GRANULARITY = 0x0B23; + public static final int ALIASED_POINT_SIZE_RANGE = 0x846D; + public static final int ALIASED_LINE_WIDTH_RANGE = 0x846E; + public static final int PACK_SKIP_IMAGES = 0x806B; + public static final int PACK_IMAGE_HEIGHT = 0x806C; + public static final int UNPACK_SKIP_IMAGES = 0x806D; + public static final int UNPACK_IMAGE_HEIGHT = 0x806E; + public static final int TEXTURE_3D = 0x806F; + public static final int PROXY_TEXTURE_3D = 0x8070; + public static final int TEXTURE_DEPTH = 0x8071; + public static final int TEXTURE_WRAP_R = 0x8072; + public static final int MAX_3D_TEXTURE_SIZE = 0x8073; + public static final int TEXTURE_BINDING_3D = 0x806A; + public static final int COLOR_TABLE = 0x80D0; + public static final int POST_CONVOLUTION_COLOR_TABLE = 0x80D1; + public static final int POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2; + public static final int PROXY_COLOR_TABLE = 0x80D3; + public static final int PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4; + public static final int PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5; + public static final int COLOR_TABLE_SCALE = 0x80D6; + public static final int COLOR_TABLE_BIAS = 0x80D7; + public static final int COLOR_TABLE_FORMAT = 0x80D8; + public static final int COLOR_TABLE_WIDTH = 0x80D9; + public static final int COLOR_TABLE_RED_SIZE = 0x80DA; + public static final int COLOR_TABLE_GREEN_SIZE = 0x80DB; + public static final int COLOR_TABLE_BLUE_SIZE = 0x80DC; + public static final int COLOR_TABLE_ALPHA_SIZE = 0x80DD; + public static final int COLOR_TABLE_LUMINANCE_SIZE = 0x80DE; + public static final int COLOR_TABLE_INTENSITY_SIZE = 0x80DF; + public static final int CONVOLUTION_1D = 0x8010; + public static final int CONVOLUTION_2D = 0x8011; + public static final int SEPARABLE_2D = 0x8012; + public static final int CONVOLUTION_BORDER_MODE = 0x8013; + public static final int CONVOLUTION_FILTER_SCALE = 0x8014; + public static final int CONVOLUTION_FILTER_BIAS = 0x8015; + public static final int REDUCE = 0x8016; + public static final int CONVOLUTION_FORMAT = 0x8017; + public static final int CONVOLUTION_WIDTH = 0x8018; + public static final int CONVOLUTION_HEIGHT = 0x8019; + public static final int MAX_CONVOLUTION_WIDTH = 0x801A; + public static final int MAX_CONVOLUTION_HEIGHT = 0x801B; + public static final int POST_CONVOLUTION_RED_SCALE = 0x801C; + public static final int POST_CONVOLUTION_GREEN_SCALE = 0x801D; + public static final int POST_CONVOLUTION_BLUE_SCALE = 0x801E; + public static final int POST_CONVOLUTION_ALPHA_SCALE = 0x801F; + public static final int POST_CONVOLUTION_RED_BIAS = 0x8020; + public static final int POST_CONVOLUTION_GREEN_BIAS = 0x8021; + public static final int POST_CONVOLUTION_BLUE_BIAS = 0x8022; + public static final int POST_CONVOLUTION_ALPHA_BIAS = 0x8023; + public static final int CONSTANT_BORDER = 0x8151; + public static final int REPLICATE_BORDER = 0x8153; + public static final int CONVOLUTION_BORDER_COLOR = 0x8154; + public static final int COLOR_MATRIX = 0x80B1; + public static final int COLOR_MATRIX_STACK_DEPTH = 0x80B2; + public static final int MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3; + public static final int POST_COLOR_MATRIX_RED_SCALE = 0x80B4; + public static final int POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5; + public static final int POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6; + public static final int POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7; + public static final int POST_COLOR_MATRIX_RED_BIAS = 0x80B8; + public static final int POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9; + public static final int POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA; + public static final int POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB; + public static final int HISTOGRAM = 0x8024; + public static final int PROXY_HISTOGRAM = 0x8025; + public static final int HISTOGRAM_WIDTH = 0x8026; + public static final int HISTOGRAM_FORMAT = 0x8027; + public static final int HISTOGRAM_RED_SIZE = 0x8028; + public static final int HISTOGRAM_GREEN_SIZE = 0x8029; + public static final int HISTOGRAM_BLUE_SIZE = 0x802A; + public static final int HISTOGRAM_ALPHA_SIZE = 0x802B; + public static final int HISTOGRAM_LUMINANCE_SIZE = 0x802C; + public static final int HISTOGRAM_SINK = 0x802D; + public static final int MINMAX = 0x802E; + public static final int MINMAX_FORMAT = 0x802F; + public static final int MINMAX_SINK = 0x8030; + public static final int TABLE_TOO_LARGE = 0x8031; + public static final int BLEND_EQUATION = 0x8009; + public static final int MIN = 0x8007; + public static final int MAX = 0x8008; + public static final int FUNC_ADD = 0x8006; + public static final int FUNC_SUBTRACT = 0x800A; + public static final int FUNC_REVERSE_SUBTRACT = 0x800B; + public static final int BLEND_COLOR = 0x8005; + public static final int CONSTANT_COLOR = 0x8001; + public static final int ONE_MINUS_CONSTANT_COLOR = 0x8002; + public static final int CONSTANT_ALPHA = 0x8003; + public static final int ONE_MINUS_CONSTANT_ALPHA = 0x8004; + + /* OpenGL 1.3 constants */ + public static final int TEXTURE0 = 0x84C0; + public static final int TEXTURE1 = 0x84C1; + public static final int TEXTURE2 = 0x84C2; + public static final int TEXTURE3 = 0x84C3; + public static final int TEXTURE4 = 0x84C4; + public static final int TEXTURE5 = 0x84C5; + public static final int TEXTURE6 = 0x84C6; + public static final int TEXTURE7 = 0x84C7; + public static final int TEXTURE8 = 0x84C8; + public static final int TEXTURE9 = 0x84C9; + public static final int TEXTURE10 = 0x84CA; + public static final int TEXTURE11 = 0x84CB; + public static final int TEXTURE12 = 0x84CC; + public static final int TEXTURE13 = 0x84CD; + public static final int TEXTURE14 = 0x84CE; + public static final int TEXTURE15 = 0x84CF; + public static final int TEXTURE16 = 0x84D0; + public static final int TEXTURE17 = 0x84D1; + public static final int TEXTURE18 = 0x84D2; + public static final int TEXTURE19 = 0x84D3; + public static final int TEXTURE20 = 0x84D4; + public static final int TEXTURE21 = 0x84D5; + public static final int TEXTURE22 = 0x84D6; + public static final int TEXTURE23 = 0x84D7; + public static final int TEXTURE24 = 0x84D8; + public static final int TEXTURE25 = 0x84D9; + public static final int TEXTURE26 = 0x84DA; + public static final int TEXTURE27 = 0x84DB; + public static final int TEXTURE28 = 0x84DC; + public static final int TEXTURE29 = 0x84DD; + public static final int TEXTURE30 = 0x84DE; + public static final int TEXTURE31 = 0x84DF; + public static final int ACTIVE_TEXTURE = 0x84E0; + public static final int CLIENT_ACTIVE_TEXTURE = 0x84E1; + public static final int MAX_TEXTURE_UNITS = 0x84E2; + + public static final int NORMAL_MAP = 0x8511; + public static final int REFLECTION_MAP = 0x8512; + public static final int TEXTURE_CUBE_MAP = 0x8513; + public static final int TEXTURE_BINDING_CUBE_MAP = 0x8514; + public static final int TEXTURE_CUBE_MAP_POSITIVE_X = 0x8515; + public static final int TEXTURE_CUBE_MAP_NEGATIVE_X = 0x8516; + public static final int TEXTURE_CUBE_MAP_POSITIVE_Y = 0x8517; + public static final int TEXTURE_CUBE_MAP_NEGATIVE_Y = 0x8518; + public static final int TEXTURE_CUBE_MAP_POSITIVE_Z = 0x8519; + public static final int TEXTURE_CUBE_MAP_NEGATIVE_Z = 0x851A; + public static final int PROXY_TEXTURE_CUBE_MAP = 0x851B; + public static final int MAX_CUBE_MAP_TEXTURE_SIZE = 0x851C; + + public static final int COMPRESSED_ALPHA = 0x84E9; + public static final int COMPRESSED_LUMINANCE = 0x84EA; + public static final int COMPRESSED_LUMINANCE_ALPHA = 0x84EB; + public static final int COMPRESSED_INTENSITY = 0x84EC; + public static final int COMPRESSED_RGB = 0x84ED; + public static final int COMPRESSED_RGBA = 0x84EE; + public static final int TEXTURE_COMPRESSION_HINT = 0x84EF; + public static final int TEXTURE_COMPRESSED_IMAGE_SIZE = 0x86A0; + public static final int TEXTURE_COMPRESSED = 0x86A1; + public static final int NUM_COMPRESSED_TEXTURE_FORMATS = 0x86A2; + public static final int COMPRESSED_TEXTURE_FORMATS = 0x86A3; + + public static final int MULTISAMPLE = 0x809D; + public static final int SAMPLE_ALPHA_TO_COVERAGE = 0x809E; + public static final int SAMPLE_ALPHA_TO_ONE = 0x809F; + public static final int SAMPLE_COVERAGE = 0x80A0; + public static final int SAMPLE_BUFFERS = 0x80A8; + public static final int SAMPLES = 0x80A9; + public static final int SAMPLE_COVERAGE_VALUE = 0x80AA; + public static final int SAMPLE_COVERAGE_INVERT = 0x80AB; + public static final int MULTISAMPLE_BIT = 0x20000000; + + public static final int TRANSPOSE_MODELVIEW_MATRIX = 0x84E3; + public static final int TRANSPOSE_PROJECTION_MATRIX = 0x84E4; + public static final int TRANSPOSE_TEXTURE_MATRIX = 0x84E5; + public static final int TRANSPOSE_COLOR_MATRIX = 0x84E6; + + public static final int COMBINE = 0x8570; + public static final int COMBINE_RGB = 0x8571; + public static final int COMBINE_ALPHA = 0x8572; + public static final int SOURCE0_RGB = 0x8580; + public static final int SOURCE1_RGB = 0x8581; + public static final int SOURCE2_RGB = 0x8582; + public static final int SOURCE0_ALPHA = 0x8588; + public static final int SOURCE1_ALPHA = 0x8589; + public static final int SOURCE2_ALPHA = 0x858A; + public static final int OPERAND0_RGB = 0x8590; + public static final int OPERAND1_RGB = 0x8591; + public static final int OPERAND2_RGB = 0x8592; + public static final int OPERAND0_ALPHA = 0x8598; + public static final int OPERAND1_ALPHA = 0x8599; + public static final int OPERAND2_ALPHA = 0x859A; + public static final int RGB_SCALE = 0x8573; + public static final int ADD_SIGNED = 0x8574; + public static final int INTERPOLATE = 0x8575; + public static final int SUBTRACT = 0x84E7; + public static final int CONSTANT = 0x8576; + public static final int PRIMARY_COLOR = 0x8577; + public static final int PREVIOUS = 0x8578; + public static final int DOT3_RGB = 0x86AE; + public static final int DOT3_RGBA = 0x86AF; + public static final int CLAMP_TO_BORDER = 0x812D; + /* TextureTarget */ /* GL_TEXTURE_1D */ /* GL_TEXTURE_2D */