diff options
Diffstat (limited to 'xc/extras')
174 files changed, 3877 insertions, 266 deletions
diff --git a/xc/extras/Mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h new file mode 100644 index 000000000..3e11b4a9b --- /dev/null +++ b/xc/extras/Mesa/include/GL/gl.h @@ -0,0 +1,2246 @@ +/* $Id: gl.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ + +/* + * Mesa 3-D graphics library + * Version: 3.1 + * + * Copyright (C) 1999 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + + + +#ifndef GL_H +#define GL_H + +#if defined(USE_MGL_NAMESPACE) +#include "gl_mangle.h" +#endif + + +#if defined(__BEOS__) +#include <stdlib.h> /* to get some BeOS-isms */ +#endif + + +#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO)) +#define OPENSTEP +#endif + + +#if defined(_WIN32) && !defined(__WIN32__) +# define __WIN32__ +#endif + +#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) +# pragma warning( disable : 4068 ) /* unknown pragma */ +# pragma warning( disable : 4710 ) /* function 'foo' not inlined */ +# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */ +# pragma warning( disable : 4127 ) /* conditional expression is constant */ +# if defined(MESA_MINWARN) +# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ +# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ +# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ +# pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */ +# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ +# endif +# if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# define GLAPI __declspec(dllexport) +# define WGLAPI __declspec(dllexport) +# elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# define GLAPI __declspec(dllimport) +# define WGLAPI __declspec(dllimport) +# else /* for use with static link lib build of Win32 edition only */ +# define GLAPI extern +# define WGLAPI __declspec(dllimport) +# endif /* _STATIC_MESA support */ +# define GLAPIENTRY __stdcall +# define GLCALLBACK __stdcall +# define GLWINAPI __stdcall +# define GLWINAPIV __cdecl +#else +/* non-Windows compilation */ +# define GLAPI extern +# define GLAPIENTRY +# define GLCALLBACK +# define GLWINAPI +# define GLWINAPIV +#endif /* WIN32 / CYGWIN32 bracket */ + +/* compatability guard so we don't need to change client code */ + +#if defined(_WIN32) && !defined(_WINDEF_) && !defined(OPENSTEP) +# define CALLBACK GLCALLBACK +typedef int (GLAPIENTRY *PROC)(); +typedef void *HGLRC; +typedef void *HDC; +typedef unsigned long COLORREF; +#endif + +#if defined(_WIN32) && !defined(_WINGDI_) && !defined(OPENSTEP) +# define WGL_FONT_LINES 0 +# define WGL_FONT_POLYGONS 1 +# ifdef UNICODE +# define wglUseFontBitmaps wglUseFontBitmapsW +# define wglUseFontOutlines wglUseFontOutlinesW +# else +# define wglUseFontBitmaps wglUseFontBitmapsA +# define wglUseFontOutlines wglUseFontOutlinesA +# endif /* !UNICODE */ +typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR; +typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT; +typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR; +#include <gl/mesa_wgl.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + +#ifdef macintosh + #pragma enumsalwaysint on + #if PRAGMA_IMPORT_SUPPORTED + #pragma import on + #endif +#endif + + + +/* + * Apps can test for this symbol to do conditional compilation if needed. + */ +#define MESA + +#define MESA_MAJOR_VERSION 3 +#define MESA_MINOR_VERSION 1 + + +#define GL_VERSION_1_1 1 +#define GL_VERSION_1_2 1 + + +/* + * + * Enumerations + * + */ + +typedef enum { + /* Boolean values */ + GL_FALSE = 0, + GL_TRUE = 1, + + /* Data types */ + GL_BYTE = 0x1400, + GL_UNSIGNED_BYTE = 0x1401, + GL_SHORT = 0x1402, + GL_UNSIGNED_SHORT = 0x1403, + GL_INT = 0x1404, + GL_UNSIGNED_INT = 0x1405, + GL_FLOAT = 0x1406, + GL_DOUBLE = 0x140A, + GL_2_BYTES = 0x1407, + GL_3_BYTES = 0x1408, + GL_4_BYTES = 0x1409, + + /* Primitives */ + GL_POINTS = 0x0000, + GL_LINES = 0x0001, + GL_LINE_LOOP = 0x0002, + GL_LINE_STRIP = 0x0003, + GL_TRIANGLES = 0x0004, + GL_TRIANGLE_STRIP = 0x0005, + GL_TRIANGLE_FAN = 0x0006, + GL_QUADS = 0x0007, + GL_QUAD_STRIP = 0x0008, + GL_POLYGON = 0x0009, + + /* Vertex Arrays */ + GL_VERTEX_ARRAY = 0x8074, + GL_NORMAL_ARRAY = 0x8075, + GL_COLOR_ARRAY = 0x8076, + GL_INDEX_ARRAY = 0x8077, + GL_TEXTURE_COORD_ARRAY = 0x8078, + GL_EDGE_FLAG_ARRAY = 0x8079, + GL_VERTEX_ARRAY_SIZE = 0x807A, + GL_VERTEX_ARRAY_TYPE = 0x807B, + GL_VERTEX_ARRAY_STRIDE = 0x807C, + GL_NORMAL_ARRAY_TYPE = 0x807E, + GL_NORMAL_ARRAY_STRIDE = 0x807F, + GL_COLOR_ARRAY_SIZE = 0x8081, + GL_COLOR_ARRAY_TYPE = 0x8082, + GL_COLOR_ARRAY_STRIDE = 0x8083, + GL_INDEX_ARRAY_TYPE = 0x8085, + GL_INDEX_ARRAY_STRIDE = 0x8086, + GL_TEXTURE_COORD_ARRAY_SIZE = 0x8088, + GL_TEXTURE_COORD_ARRAY_TYPE = 0x8089, + GL_TEXTURE_COORD_ARRAY_STRIDE = 0x808A, + GL_EDGE_FLAG_ARRAY_STRIDE = 0x808C, + GL_VERTEX_ARRAY_POINTER = 0x808E, + GL_NORMAL_ARRAY_POINTER = 0x808F, + GL_COLOR_ARRAY_POINTER = 0x8090, + GL_INDEX_ARRAY_POINTER = 0x8091, + GL_TEXTURE_COORD_ARRAY_POINTER = 0x8092, + GL_EDGE_FLAG_ARRAY_POINTER = 0x8093, + GL_V2F = 0x2A20, + GL_V3F = 0x2A21, + GL_C4UB_V2F = 0x2A22, + GL_C4UB_V3F = 0x2A23, + GL_C3F_V3F = 0x2A24, + GL_N3F_V3F = 0x2A25, + GL_C4F_N3F_V3F = 0x2A26, + GL_T2F_V3F = 0x2A27, + GL_T4F_V4F = 0x2A28, + GL_T2F_C4UB_V3F = 0x2A29, + GL_T2F_C3F_V3F = 0x2A2A, + GL_T2F_N3F_V3F = 0x2A2B, + GL_T2F_C4F_N3F_V3F = 0x2A2C, + GL_T4F_C4F_N3F_V4F = 0x2A2D, + + /* Matrix Mode */ + GL_MATRIX_MODE = 0x0BA0, + GL_MODELVIEW = 0x1700, + GL_PROJECTION = 0x1701, + GL_TEXTURE = 0x1702, + + /* Points */ + GL_POINT_SMOOTH = 0x0B10, + GL_POINT_SIZE = 0x0B11, + GL_POINT_SIZE_GRANULARITY = 0x0B13, + GL_POINT_SIZE_RANGE = 0x0B12, + + /* Lines */ + GL_LINE_SMOOTH = 0x0B20, + GL_LINE_STIPPLE = 0x0B24, + GL_LINE_STIPPLE_PATTERN = 0x0B25, + GL_LINE_STIPPLE_REPEAT = 0x0B26, + GL_LINE_WIDTH = 0x0B21, + GL_LINE_WIDTH_GRANULARITY = 0x0B23, + GL_LINE_WIDTH_RANGE = 0x0B22, + + /* Polygons */ + GL_POINT = 0x1B00, + GL_LINE = 0x1B01, + GL_FILL = 0x1B02, + GL_CW = 0x0900, + GL_CCW = 0x0901, + GL_FRONT = 0x0404, + GL_BACK = 0x0405, + GL_POLYGON_MODE = 0x0B40, + GL_POLYGON_SMOOTH = 0x0B41, + GL_POLYGON_STIPPLE = 0x0B42, + GL_EDGE_FLAG = 0x0B43, + GL_CULL_FACE = 0x0B44, + GL_CULL_FACE_MODE = 0x0B45, + GL_FRONT_FACE = 0x0B46, + GL_POLYGON_OFFSET_FACTOR = 0x8038, + GL_POLYGON_OFFSET_UNITS = 0x2A00, + GL_POLYGON_OFFSET_POINT = 0x2A01, + GL_POLYGON_OFFSET_LINE = 0x2A02, + GL_POLYGON_OFFSET_FILL = 0x8037, + + /* Display Lists */ + GL_COMPILE = 0x1300, + GL_COMPILE_AND_EXECUTE = 0x1301, + GL_LIST_BASE = 0x0B32, + GL_LIST_INDEX = 0x0B33, + GL_LIST_MODE = 0x0B30, + + /* Depth buffer */ + GL_NEVER = 0x0200, + GL_LESS = 0x0201, + GL_GEQUAL = 0x0206, + GL_LEQUAL = 0x0203, + GL_GREATER = 0x0204, + GL_NOTEQUAL = 0x0205, + GL_EQUAL = 0x0202, + GL_ALWAYS = 0x0207, + GL_DEPTH_TEST = 0x0B71, + GL_DEPTH_BITS = 0x0D56, + GL_DEPTH_CLEAR_VALUE = 0x0B73, + GL_DEPTH_FUNC = 0x0B74, + GL_DEPTH_RANGE = 0x0B70, + GL_DEPTH_WRITEMASK = 0x0B72, + GL_DEPTH_COMPONENT = 0x1902, + + /* Lighting */ + GL_LIGHTING = 0x0B50, + GL_LIGHT0 = 0x4000, + GL_LIGHT1 = 0x4001, + GL_LIGHT2 = 0x4002, + GL_LIGHT3 = 0x4003, + GL_LIGHT4 = 0x4004, + GL_LIGHT5 = 0x4005, + GL_LIGHT6 = 0x4006, + GL_LIGHT7 = 0x4007, + GL_SPOT_EXPONENT = 0x1205, + GL_SPOT_CUTOFF = 0x1206, + GL_CONSTANT_ATTENUATION = 0x1207, + GL_LINEAR_ATTENUATION = 0x1208, + GL_QUADRATIC_ATTENUATION = 0x1209, + GL_AMBIENT = 0x1200, + GL_DIFFUSE = 0x1201, + GL_SPECULAR = 0x1202, + GL_SHININESS = 0x1601, + GL_EMISSION = 0x1600, + GL_POSITION = 0x1203, + GL_SPOT_DIRECTION = 0x1204, + GL_AMBIENT_AND_DIFFUSE = 0x1602, + GL_COLOR_INDEXES = 0x1603, + GL_LIGHT_MODEL_TWO_SIDE = 0x0B52, + GL_LIGHT_MODEL_LOCAL_VIEWER = 0x0B51, + GL_LIGHT_MODEL_AMBIENT = 0x0B53, + GL_FRONT_AND_BACK = 0x0408, + GL_SHADE_MODEL = 0x0B54, + GL_FLAT = 0x1D00, + GL_SMOOTH = 0x1D01, + GL_COLOR_MATERIAL = 0x0B57, + GL_COLOR_MATERIAL_FACE = 0x0B55, + GL_COLOR_MATERIAL_PARAMETER = 0x0B56, + GL_NORMALIZE = 0x0BA1, + + /* User clipping planes */ + GL_CLIP_PLANE0 = 0x3000, + GL_CLIP_PLANE1 = 0x3001, + GL_CLIP_PLANE2 = 0x3002, + GL_CLIP_PLANE3 = 0x3003, + GL_CLIP_PLANE4 = 0x3004, + GL_CLIP_PLANE5 = 0x3005, + + /* Accumulation buffer */ + GL_ACCUM_RED_BITS = 0x0D58, + GL_ACCUM_GREEN_BITS = 0x0D59, + GL_ACCUM_BLUE_BITS = 0x0D5A, + GL_ACCUM_ALPHA_BITS = 0x0D5B, + GL_ACCUM_CLEAR_VALUE = 0x0B80, + GL_ACCUM = 0x0100, + GL_ADD = 0x0104, + GL_LOAD = 0x0101, + GL_MULT = 0x0103, + GL_RETURN = 0x0102, + + /* Alpha testing */ + GL_ALPHA_TEST = 0x0BC0, + GL_ALPHA_TEST_REF = 0x0BC2, + GL_ALPHA_TEST_FUNC = 0x0BC1, + + /* Blending */ + GL_BLEND = 0x0BE2, + GL_BLEND_SRC = 0x0BE1, + GL_BLEND_DST = 0x0BE0, + GL_ZERO = 0, + GL_ONE = 1, + GL_SRC_COLOR = 0x0300, + GL_ONE_MINUS_SRC_COLOR = 0x0301, + GL_DST_COLOR = 0x0306, + GL_ONE_MINUS_DST_COLOR = 0x0307, + GL_SRC_ALPHA = 0x0302, + GL_ONE_MINUS_SRC_ALPHA = 0x0303, + GL_DST_ALPHA = 0x0304, + GL_ONE_MINUS_DST_ALPHA = 0x0305, + GL_SRC_ALPHA_SATURATE = 0x0308, + GL_CONSTANT_COLOR = 0x8001, + GL_ONE_MINUS_CONSTANT_COLOR = 0x8002, + GL_CONSTANT_ALPHA = 0x8003, + GL_ONE_MINUS_CONSTANT_ALPHA = 0x8004, + + /* Render Mode */ + GL_FEEDBACK = 0x1C01, + GL_RENDER = 0x1C00, + GL_SELECT = 0x1C02, + + /* Feedback */ + GL_2D = 0x0600, + GL_3D = 0x0601, + GL_3D_COLOR = 0x0602, + GL_3D_COLOR_TEXTURE = 0x0603, + GL_4D_COLOR_TEXTURE = 0x0604, + GL_POINT_TOKEN = 0x0701, + GL_LINE_TOKEN = 0x0702, + GL_LINE_RESET_TOKEN = 0x0707, + GL_POLYGON_TOKEN = 0x0703, + GL_BITMAP_TOKEN = 0x0704, + GL_DRAW_PIXEL_TOKEN = 0x0705, + GL_COPY_PIXEL_TOKEN = 0x0706, + GL_PASS_THROUGH_TOKEN = 0x0700, + GL_FEEDBACK_BUFFER_POINTER = 0x0DF0, + GL_FEEDBACK_BUFFER_SIZE = 0x0DF1, + GL_FEEDBACK_BUFFER_TYPE = 0x0DF2, + + /* Selection */ + GL_SELECTION_BUFFER_POINTER = 0x0DF3, + GL_SELECTION_BUFFER_SIZE = 0x0DF4, + + /* Fog */ + GL_FOG = 0x0B60, + GL_FOG_MODE = 0x0B65, + GL_FOG_DENSITY = 0x0B62, + GL_FOG_COLOR = 0x0B66, + GL_FOG_INDEX = 0x0B61, + GL_FOG_START = 0x0B63, + GL_FOG_END = 0x0B64, + GL_LINEAR = 0x2601, + GL_EXP = 0x0800, + GL_EXP2 = 0x0801, + + /* Logic Ops */ + GL_LOGIC_OP = 0x0BF1, + GL_INDEX_LOGIC_OP = 0x0BF1, + GL_COLOR_LOGIC_OP = 0x0BF2, + GL_LOGIC_OP_MODE = 0x0BF0, + GL_CLEAR = 0x1500, + GL_SET = 0x150F, + GL_COPY = 0x1503, + GL_COPY_INVERTED = 0x150C, + GL_NOOP = 0x1505, + GL_INVERT = 0x150A, + GL_AND = 0x1501, + GL_NAND = 0x150E, + GL_OR = 0x1507, + GL_NOR = 0x1508, + GL_XOR = 0x1506, + GL_EQUIV = 0x1509, + GL_AND_REVERSE = 0x1502, + GL_AND_INVERTED = 0x1504, + GL_OR_REVERSE = 0x150B, + GL_OR_INVERTED = 0x150D, + + /* Stencil */ + GL_STENCIL_TEST = 0x0B90, + GL_STENCIL_WRITEMASK = 0x0B98, + GL_STENCIL_BITS = 0x0D57, + GL_STENCIL_FUNC = 0x0B92, + GL_STENCIL_VALUE_MASK = 0x0B93, + GL_STENCIL_REF = 0x0B97, + GL_STENCIL_FAIL = 0x0B94, + GL_STENCIL_PASS_DEPTH_PASS = 0x0B96, + GL_STENCIL_PASS_DEPTH_FAIL = 0x0B95, + GL_STENCIL_CLEAR_VALUE = 0x0B91, + GL_STENCIL_INDEX = 0x1901, + GL_KEEP = 0x1E00, + GL_REPLACE = 0x1E01, + GL_INCR = 0x1E02, + GL_DECR = 0x1E03, + + /* Buffers, Pixel Drawing/Reading */ + GL_NONE = 0, + GL_LEFT = 0x0406, + GL_RIGHT = 0x0407, + /*GL_FRONT = 0x0404, */ + /*GL_BACK = 0x0405, */ + /*GL_FRONT_AND_BACK = 0x0408, */ + GL_FRONT_LEFT = 0x0400, + GL_FRONT_RIGHT = 0x0401, + GL_BACK_LEFT = 0x0402, + GL_BACK_RIGHT = 0x0403, + GL_AUX0 = 0x0409, + GL_AUX1 = 0x040A, + GL_AUX2 = 0x040B, + GL_AUX3 = 0x040C, + GL_COLOR_INDEX = 0x1900, + GL_RED = 0x1903, + GL_GREEN = 0x1904, + GL_BLUE = 0x1905, + GL_ALPHA = 0x1906, + GL_LUMINANCE = 0x1909, + GL_LUMINANCE_ALPHA = 0x190A, + GL_ALPHA_BITS = 0x0D55, + GL_RED_BITS = 0x0D52, + GL_GREEN_BITS = 0x0D53, + GL_BLUE_BITS = 0x0D54, + GL_INDEX_BITS = 0x0D51, + GL_SUBPIXEL_BITS = 0x0D50, + GL_AUX_BUFFERS = 0x0C00, + GL_READ_BUFFER = 0x0C02, + GL_DRAW_BUFFER = 0x0C01, + GL_DOUBLEBUFFER = 0x0C32, + GL_STEREO = 0x0C33, + GL_BITMAP = 0x1A00, + GL_COLOR = 0x1800, + GL_DEPTH = 0x1801, + GL_STENCIL = 0x1802, + GL_DITHER = 0x0BD0, + GL_RGB = 0x1907, + GL_RGBA = 0x1908, + + /* Implementation limits */ + GL_MAX_LIST_NESTING = 0x0B31, + GL_MAX_ATTRIB_STACK_DEPTH = 0x0D35, + GL_MAX_MODELVIEW_STACK_DEPTH = 0x0D36, + GL_MAX_NAME_STACK_DEPTH = 0x0D37, + GL_MAX_PROJECTION_STACK_DEPTH = 0x0D38, + GL_MAX_TEXTURE_STACK_DEPTH = 0x0D39, + GL_MAX_EVAL_ORDER = 0x0D30, + GL_MAX_LIGHTS = 0x0D31, + GL_MAX_CLIP_PLANES = 0x0D32, + GL_MAX_TEXTURE_SIZE = 0x0D33, + GL_MAX_PIXEL_MAP_TABLE = 0x0D34, + GL_MAX_VIEWPORT_DIMS = 0x0D3A, + GL_MAX_CLIENT_ATTRIB_STACK_DEPTH= 0x0D3B, + + /* Gets */ + GL_ATTRIB_STACK_DEPTH = 0x0BB0, + GL_CLIENT_ATTRIB_STACK_DEPTH = 0x0BB1, + GL_COLOR_CLEAR_VALUE = 0x0C22, + GL_COLOR_WRITEMASK = 0x0C23, + GL_CURRENT_INDEX = 0x0B01, + GL_CURRENT_COLOR = 0x0B00, + GL_CURRENT_NORMAL = 0x0B02, + GL_CURRENT_RASTER_COLOR = 0x0B04, + GL_CURRENT_RASTER_DISTANCE = 0x0B09, + GL_CURRENT_RASTER_INDEX = 0x0B05, + GL_CURRENT_RASTER_POSITION = 0x0B07, + GL_CURRENT_RASTER_TEXTURE_COORDS = 0x0B06, + GL_CURRENT_RASTER_POSITION_VALID = 0x0B08, + GL_CURRENT_TEXTURE_COORDS = 0x0B03, + GL_INDEX_CLEAR_VALUE = 0x0C20, + GL_INDEX_MODE = 0x0C30, + GL_INDEX_WRITEMASK = 0x0C21, + GL_MODELVIEW_MATRIX = 0x0BA6, + GL_MODELVIEW_STACK_DEPTH = 0x0BA3, + GL_NAME_STACK_DEPTH = 0x0D70, + GL_PROJECTION_MATRIX = 0x0BA7, + GL_PROJECTION_STACK_DEPTH = 0x0BA4, + GL_RENDER_MODE = 0x0C40, + GL_RGBA_MODE = 0x0C31, + GL_TEXTURE_MATRIX = 0x0BA8, + GL_TEXTURE_STACK_DEPTH = 0x0BA5, + GL_VIEWPORT = 0x0BA2, + + /* Evaluators */ + GL_AUTO_NORMAL = 0x0D80, + GL_MAP1_COLOR_4 = 0x0D90, + GL_MAP1_GRID_DOMAIN = 0x0DD0, + GL_MAP1_GRID_SEGMENTS = 0x0DD1, + GL_MAP1_INDEX = 0x0D91, + GL_MAP1_NORMAL = 0x0D92, + GL_MAP1_TEXTURE_COORD_1 = 0x0D93, + GL_MAP1_TEXTURE_COORD_2 = 0x0D94, + GL_MAP1_TEXTURE_COORD_3 = 0x0D95, + GL_MAP1_TEXTURE_COORD_4 = 0x0D96, + GL_MAP1_VERTEX_3 = 0x0D97, + GL_MAP1_VERTEX_4 = 0x0D98, + GL_MAP2_COLOR_4 = 0x0DB0, + GL_MAP2_GRID_DOMAIN = 0x0DD2, + GL_MAP2_GRID_SEGMENTS = 0x0DD3, + GL_MAP2_INDEX = 0x0DB1, + GL_MAP2_NORMAL = 0x0DB2, + GL_MAP2_TEXTURE_COORD_1 = 0x0DB3, + GL_MAP2_TEXTURE_COORD_2 = 0x0DB4, + GL_MAP2_TEXTURE_COORD_3 = 0x0DB5, + GL_MAP2_TEXTURE_COORD_4 = 0x0DB6, + GL_MAP2_VERTEX_3 = 0x0DB7, + GL_MAP2_VERTEX_4 = 0x0DB8, + GL_COEFF = 0x0A00, + GL_DOMAIN = 0x0A02, + GL_ORDER = 0x0A01, + + /* Hints */ + GL_FOG_HINT = 0x0C54, + GL_LINE_SMOOTH_HINT = 0x0C52, + GL_PERSPECTIVE_CORRECTION_HINT = 0x0C50, + GL_POINT_SMOOTH_HINT = 0x0C51, + GL_POLYGON_SMOOTH_HINT = 0x0C53, + GL_DONT_CARE = 0x1100, + GL_FASTEST = 0x1101, + GL_NICEST = 0x1102, + + /* Scissor box */ + GL_SCISSOR_TEST = 0x0C11, + GL_SCISSOR_BOX = 0x0C10, + + /* Pixel Mode / Transfer */ + GL_MAP_COLOR = 0x0D10, + GL_MAP_STENCIL = 0x0D11, + GL_INDEX_SHIFT = 0x0D12, + GL_INDEX_OFFSET = 0x0D13, + GL_RED_SCALE = 0x0D14, + GL_RED_BIAS = 0x0D15, + GL_GREEN_SCALE = 0x0D18, + GL_GREEN_BIAS = 0x0D19, + GL_BLUE_SCALE = 0x0D1A, + GL_BLUE_BIAS = 0x0D1B, + GL_ALPHA_SCALE = 0x0D1C, + GL_ALPHA_BIAS = 0x0D1D, + GL_DEPTH_SCALE = 0x0D1E, + GL_DEPTH_BIAS = 0x0D1F, + GL_PIXEL_MAP_S_TO_S_SIZE = 0x0CB1, + GL_PIXEL_MAP_I_TO_I_SIZE = 0x0CB0, + GL_PIXEL_MAP_I_TO_R_SIZE = 0x0CB2, + GL_PIXEL_MAP_I_TO_G_SIZE = 0x0CB3, + GL_PIXEL_MAP_I_TO_B_SIZE = 0x0CB4, + GL_PIXEL_MAP_I_TO_A_SIZE = 0x0CB5, + GL_PIXEL_MAP_R_TO_R_SIZE = 0x0CB6, + GL_PIXEL_MAP_G_TO_G_SIZE = 0x0CB7, + GL_PIXEL_MAP_B_TO_B_SIZE = 0x0CB8, + GL_PIXEL_MAP_A_TO_A_SIZE = 0x0CB9, + GL_PIXEL_MAP_S_TO_S = 0x0C71, + GL_PIXEL_MAP_I_TO_I = 0x0C70, + GL_PIXEL_MAP_I_TO_R = 0x0C72, + GL_PIXEL_MAP_I_TO_G = 0x0C73, + GL_PIXEL_MAP_I_TO_B = 0x0C74, + GL_PIXEL_MAP_I_TO_A = 0x0C75, + GL_PIXEL_MAP_R_TO_R = 0x0C76, + GL_PIXEL_MAP_G_TO_G = 0x0C77, + GL_PIXEL_MAP_B_TO_B = 0x0C78, + GL_PIXEL_MAP_A_TO_A = 0x0C79, + GL_PACK_ALIGNMENT = 0x0D05, + GL_PACK_LSB_FIRST = 0x0D01, + GL_PACK_ROW_LENGTH = 0x0D02, + GL_PACK_SKIP_PIXELS = 0x0D04, + GL_PACK_SKIP_ROWS = 0x0D03, + GL_PACK_SWAP_BYTES = 0x0D00, + GL_UNPACK_ALIGNMENT = 0x0CF5, + GL_UNPACK_LSB_FIRST = 0x0CF1, + GL_UNPACK_ROW_LENGTH = 0x0CF2, + GL_UNPACK_SKIP_PIXELS = 0x0CF4, + GL_UNPACK_SKIP_ROWS = 0x0CF3, + GL_UNPACK_SWAP_BYTES = 0x0CF0, + GL_ZOOM_X = 0x0D16, + GL_ZOOM_Y = 0x0D17, + + /* Texture mapping */ + GL_TEXTURE_ENV = 0x2300, + GL_TEXTURE_ENV_MODE = 0x2200, + GL_TEXTURE_1D = 0x0DE0, + GL_TEXTURE_2D = 0x0DE1, + GL_TEXTURE_WRAP_S = 0x2802, + GL_TEXTURE_WRAP_T = 0x2803, + GL_TEXTURE_MAG_FILTER = 0x2800, + GL_TEXTURE_MIN_FILTER = 0x2801, + GL_TEXTURE_ENV_COLOR = 0x2201, + GL_TEXTURE_GEN_S = 0x0C60, + GL_TEXTURE_GEN_T = 0x0C61, + GL_TEXTURE_GEN_MODE = 0x2500, + GL_TEXTURE_BORDER_COLOR = 0x1004, + GL_TEXTURE_WIDTH = 0x1000, + GL_TEXTURE_HEIGHT = 0x1001, + GL_TEXTURE_BORDER = 0x1005, + GL_TEXTURE_COMPONENTS = 0x1003, + GL_TEXTURE_RED_SIZE = 0x805C, + GL_TEXTURE_GREEN_SIZE = 0x805D, + GL_TEXTURE_BLUE_SIZE = 0x805E, + GL_TEXTURE_ALPHA_SIZE = 0x805F, + GL_TEXTURE_LUMINANCE_SIZE = 0x8060, + GL_TEXTURE_INTENSITY_SIZE = 0x8061, + GL_NEAREST_MIPMAP_NEAREST = 0x2700, + GL_NEAREST_MIPMAP_LINEAR = 0x2702, + GL_LINEAR_MIPMAP_NEAREST = 0x2701, + GL_LINEAR_MIPMAP_LINEAR = 0x2703, + GL_OBJECT_LINEAR = 0x2401, + GL_OBJECT_PLANE = 0x2501, + GL_EYE_LINEAR = 0x2400, + GL_EYE_PLANE = 0x2502, + GL_SPHERE_MAP = 0x2402, + GL_DECAL = 0x2101, + GL_MODULATE = 0x2100, + GL_NEAREST = 0x2600, + GL_REPEAT = 0x2901, + GL_CLAMP = 0x2900, + GL_S = 0x2000, + GL_T = 0x2001, + GL_R = 0x2002, + GL_Q = 0x2003, + GL_TEXTURE_GEN_R = 0x0C62, + GL_TEXTURE_GEN_Q = 0x0C63, + + /* GL 1.1 texturing */ + GL_PROXY_TEXTURE_1D = 0x8063, + GL_PROXY_TEXTURE_2D = 0x8064, + GL_TEXTURE_PRIORITY = 0x8066, + GL_TEXTURE_RESIDENT = 0x8067, + GL_TEXTURE_BINDING_1D = 0x8068, + GL_TEXTURE_BINDING_2D = 0x8069, + GL_TEXTURE_INTERNAL_FORMAT = 0x1003, + + /* GL 1.2 texturing */ + GL_PACK_SKIP_IMAGES = 0x806B, + GL_PACK_IMAGE_HEIGHT = 0x806C, + GL_UNPACK_SKIP_IMAGES = 0x806D, + GL_UNPACK_IMAGE_HEIGHT = 0x806E, + GL_TEXTURE_3D = 0x806F, + GL_PROXY_TEXTURE_3D = 0x8070, + GL_TEXTURE_DEPTH = 0x8071, + GL_TEXTURE_WRAP_R = 0x8072, + GL_MAX_3D_TEXTURE_SIZE = 0x8073, + GL_TEXTURE_BINDING_3D = 0x806A, + + /* Internal texture formats (GL 1.1) */ + GL_ALPHA4 = 0x803B, + GL_ALPHA8 = 0x803C, + GL_ALPHA12 = 0x803D, + GL_ALPHA16 = 0x803E, + GL_LUMINANCE4 = 0x803F, + GL_LUMINANCE8 = 0x8040, + GL_LUMINANCE12 = 0x8041, + GL_LUMINANCE16 = 0x8042, + GL_LUMINANCE4_ALPHA4 = 0x8043, + GL_LUMINANCE6_ALPHA2 = 0x8044, + GL_LUMINANCE8_ALPHA8 = 0x8045, + GL_LUMINANCE12_ALPHA4 = 0x8046, + GL_LUMINANCE12_ALPHA12 = 0x8047, + GL_LUMINANCE16_ALPHA16 = 0x8048, + GL_INTENSITY = 0x8049, + GL_INTENSITY4 = 0x804A, + GL_INTENSITY8 = 0x804B, + GL_INTENSITY12 = 0x804C, + GL_INTENSITY16 = 0x804D, + GL_R3_G3_B2 = 0x2A10, + GL_RGB4 = 0x804F, + GL_RGB5 = 0x8050, + GL_RGB8 = 0x8051, + GL_RGB10 = 0x8052, + GL_RGB12 = 0x8053, + GL_RGB16 = 0x8054, + GL_RGBA2 = 0x8055, + GL_RGBA4 = 0x8056, + GL_RGB5_A1 = 0x8057, + GL_RGBA8 = 0x8058, + GL_RGB10_A2 = 0x8059, + GL_RGBA12 = 0x805A, + GL_RGBA16 = 0x805B, + + /* Utility */ + GL_VENDOR = 0x1F00, + GL_RENDERER = 0x1F01, + GL_VERSION = 0x1F02, + GL_EXTENSIONS = 0x1F03, + + /* Errors */ + GL_INVALID_VALUE = 0x0501, + GL_INVALID_ENUM = 0x0500, + GL_INVALID_OPERATION = 0x0502, + GL_STACK_OVERFLOW = 0x0503, + GL_STACK_UNDERFLOW = 0x0504, + GL_OUT_OF_MEMORY = 0x0505, + + /* + * Extensions + */ + + /* GL_EXT_blend_minmax and GL_EXT_blend_color */ + GL_CONSTANT_COLOR_EXT = 0x8001, + GL_ONE_MINUS_CONSTANT_COLOR_EXT = 0x8002, + GL_CONSTANT_ALPHA_EXT = 0x8003, + GL_ONE_MINUS_CONSTANT_ALPHA_EXT = 0x8004, + GL_BLEND_EQUATION_EXT = 0x8009, + GL_MIN_EXT = 0x8007, + GL_MAX_EXT = 0x8008, + GL_FUNC_ADD_EXT = 0x8006, + GL_FUNC_SUBTRACT_EXT = 0x800A, + GL_FUNC_REVERSE_SUBTRACT_EXT = 0x800B, + GL_BLEND_COLOR_EXT = 0x8005, + + /* GL_EXT_polygon_offset */ + GL_POLYGON_OFFSET_EXT = 0x8037, + GL_POLYGON_OFFSET_FACTOR_EXT = 0x8038, + GL_POLYGON_OFFSET_BIAS_EXT = 0x8039, + + /* GL_EXT_vertex_array */ + GL_VERTEX_ARRAY_EXT = 0x8074, + GL_NORMAL_ARRAY_EXT = 0x8075, + GL_COLOR_ARRAY_EXT = 0x8076, + GL_INDEX_ARRAY_EXT = 0x8077, + GL_TEXTURE_COORD_ARRAY_EXT = 0x8078, + GL_EDGE_FLAG_ARRAY_EXT = 0x8079, + GL_VERTEX_ARRAY_SIZE_EXT = 0x807A, + GL_VERTEX_ARRAY_TYPE_EXT = 0x807B, + GL_VERTEX_ARRAY_STRIDE_EXT = 0x807C, + GL_VERTEX_ARRAY_COUNT_EXT = 0x807D, + GL_NORMAL_ARRAY_TYPE_EXT = 0x807E, + GL_NORMAL_ARRAY_STRIDE_EXT = 0x807F, + GL_NORMAL_ARRAY_COUNT_EXT = 0x8080, + GL_COLOR_ARRAY_SIZE_EXT = 0x8081, + GL_COLOR_ARRAY_TYPE_EXT = 0x8082, + GL_COLOR_ARRAY_STRIDE_EXT = 0x8083, + GL_COLOR_ARRAY_COUNT_EXT = 0x8084, + GL_INDEX_ARRAY_TYPE_EXT = 0x8085, + GL_INDEX_ARRAY_STRIDE_EXT = 0x8086, + GL_INDEX_ARRAY_COUNT_EXT = 0x8087, + GL_TEXTURE_COORD_ARRAY_SIZE_EXT = 0x8088, + GL_TEXTURE_COORD_ARRAY_TYPE_EXT = 0x8089, + GL_TEXTURE_COORD_ARRAY_STRIDE_EXT = 0x808A, + GL_TEXTURE_COORD_ARRAY_COUNT_EXT = 0x808B, + GL_EDGE_FLAG_ARRAY_STRIDE_EXT = 0x808C, + GL_EDGE_FLAG_ARRAY_COUNT_EXT = 0x808D, + GL_VERTEX_ARRAY_POINTER_EXT = 0x808E, + GL_NORMAL_ARRAY_POINTER_EXT = 0x808F, + GL_COLOR_ARRAY_POINTER_EXT = 0x8090, + GL_INDEX_ARRAY_POINTER_EXT = 0x8091, + GL_TEXTURE_COORD_ARRAY_POINTER_EXT = 0x8092, + GL_EDGE_FLAG_ARRAY_POINTER_EXT = 0x8093, + + /* GL_EXT_texture_object */ + GL_TEXTURE_PRIORITY_EXT = 0x8066, + GL_TEXTURE_RESIDENT_EXT = 0x8067, + GL_TEXTURE_1D_BINDING_EXT = 0x8068, + GL_TEXTURE_2D_BINDING_EXT = 0x8069, + + /* GL_EXT_texture3D */ + GL_PACK_SKIP_IMAGES_EXT = 0x806B, + GL_PACK_IMAGE_HEIGHT_EXT = 0x806C, + GL_UNPACK_SKIP_IMAGES_EXT = 0x806D, + GL_UNPACK_IMAGE_HEIGHT_EXT = 0x806E, + GL_TEXTURE_3D_EXT = 0x806F, + GL_PROXY_TEXTURE_3D_EXT = 0x8070, + GL_TEXTURE_DEPTH_EXT = 0x8071, + GL_TEXTURE_WRAP_R_EXT = 0x8072, + GL_MAX_3D_TEXTURE_SIZE_EXT = 0x8073, + GL_TEXTURE_3D_BINDING_EXT = 0x806A, + + /* GL_EXT_paletted_texture */ + GL_TABLE_TOO_LARGE_EXT = 0x8031, + GL_COLOR_TABLE_FORMAT_EXT = 0x80D8, + GL_COLOR_TABLE_WIDTH_EXT = 0x80D9, + GL_COLOR_TABLE_RED_SIZE_EXT = 0x80DA, + GL_COLOR_TABLE_GREEN_SIZE_EXT = 0x80DB, + GL_COLOR_TABLE_BLUE_SIZE_EXT = 0x80DC, + GL_COLOR_TABLE_ALPHA_SIZE_EXT = 0x80DD, + GL_COLOR_TABLE_LUMINANCE_SIZE_EXT = 0x80DE, + GL_COLOR_TABLE_INTENSITY_SIZE_EXT = 0x80DF, + GL_TEXTURE_INDEX_SIZE_EXT = 0x80ED, + GL_COLOR_INDEX1_EXT = 0x80E2, + GL_COLOR_INDEX2_EXT = 0x80E3, + GL_COLOR_INDEX4_EXT = 0x80E4, + GL_COLOR_INDEX8_EXT = 0x80E5, + GL_COLOR_INDEX12_EXT = 0x80E6, + GL_COLOR_INDEX16_EXT = 0x80E7, + + /* GL_EXT_shared_texture_palette */ + GL_SHARED_TEXTURE_PALETTE_EXT = 0x81FB, + + /* GL_EXT_point_parameters */ + GL_POINT_SIZE_MIN_EXT = 0x8126, + GL_POINT_SIZE_MAX_EXT = 0x8127, + GL_POINT_FADE_THRESHOLD_SIZE_EXT = 0x8128, + GL_DISTANCE_ATTENUATION_EXT = 0x8129, + + /* GL_EXT_rescale_normal */ + GL_RESCALE_NORMAL_EXT = 0x803A, + + /* GL_EXT_abgr */ + GL_ABGR_EXT = 0x8000, + + /* GL_EXT_stencil_wrap */ + GL_INCR_WRAP_EXT = 0x8507, + GL_DECR_WRAP_EXT = 0x8508, + + /* GL_SGIS_texture_edge_clamp */ + GL_CLAMP_TO_EDGE_SGIS = 0x812F, + + /* GL_INGR_blend_func_separate */ + GL_BLEND_DST_RGB_INGR = 0x80C8, + GL_BLEND_SRC_RGB_INGR = 0x80C9, + GL_BLEND_DST_ALPHA_INGR = 0x80CA, + GL_BLEND_SRC_ALPHA_INGR = 0x80CB, + + /* OpenGL 1.2 */ + GL_RESCALE_NORMAL = 0x803A, + GL_CLAMP_TO_EDGE = 0x812F, + GL_MAX_ELEMENTS_VERTICES = 0x80E8, + GL_MAX_ELEMENTS_INDICES = 0x80E9, + GL_BGR = 0x80E0, + GL_BGRA = 0x80E1, + GL_UNSIGNED_BYTE_3_3_2 = 0x8032, + GL_UNSIGNED_BYTE_2_3_3_REV = 0x8362, + GL_UNSIGNED_SHORT_5_6_5 = 0x8363, + GL_UNSIGNED_SHORT_5_6_5_REV = 0x8364, + GL_UNSIGNED_SHORT_4_4_4_4 = 0x8033, + GL_UNSIGNED_SHORT_4_4_4_4_REV = 0x8365, + GL_UNSIGNED_SHORT_5_5_5_1 = 0x8034, + GL_UNSIGNED_SHORT_1_5_5_5_REV = 0x8366, + GL_UNSIGNED_INT_8_8_8_8 = 0x8035, + GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367, + GL_UNSIGNED_INT_10_10_10_2 = 0x8036, + GL_UNSIGNED_INT_2_10_10_10_REV = 0x8368, + GL_LIGHT_MODEL_COLOR_CONTROL = 0x81F8, + GL_SINGLE_COLOR = 0x81F9, + GL_SEPARATE_SPECULAR_COLOR = 0x81FA, + GL_TEXTURE_MIN_LOD = 0x813A, + GL_TEXTURE_MAX_LOD = 0x813B, + GL_TEXTURE_BASE_LEVEL = 0x813C, + GL_TEXTURE_MAX_LEVEL = 0x813D, + + /* GL_ARB_multitexture */ + GL_TEXTURE0_ARB = 0x84C0, + GL_TEXTURE1_ARB = 0x84C1, + GL_TEXTURE2_ARB = 0x84C2, + GL_TEXTURE3_ARB = 0x84C3, + GL_TEXTURE4_ARB = 0x84C4, + GL_TEXTURE5_ARB = 0x84C5, + GL_TEXTURE6_ARB = 0x84C6, + GL_TEXTURE7_ARB = 0x84C7, + GL_TEXTURE8_ARB = 0x84C8, + GL_TEXTURE9_ARB = 0x84C9, + GL_TEXTURE10_ARB = 0x84CA, + GL_TEXTURE11_ARB = 0x84CB, + GL_TEXTURE12_ARB = 0x84CC, + GL_TEXTURE13_ARB = 0x84CD, + GL_TEXTURE14_ARB = 0x84CE, + GL_TEXTURE15_ARB = 0x84CF, + GL_TEXTURE16_ARB = 0x84D0, + GL_TEXTURE17_ARB = 0x84D1, + GL_TEXTURE18_ARB = 0x84D2, + GL_TEXTURE19_ARB = 0x84D3, + GL_TEXTURE20_ARB = 0x84D4, + GL_TEXTURE21_ARB = 0x84D5, + GL_TEXTURE22_ARB = 0x84D6, + GL_TEXTURE23_ARB = 0x84D7, + GL_TEXTURE24_ARB = 0x84D8, + GL_TEXTURE25_ARB = 0x84D9, + GL_TEXTURE26_ARB = 0x84DA, + GL_TEXTURE27_ARB = 0x84DB, + GL_TEXTURE28_ARB = 0x84DC, + GL_TEXTURE29_ARB = 0x84DD, + GL_TEXTURE30_ARB = 0x84DE, + GL_TEXTURE31_ARB = 0x84DF, + GL_ACTIVE_TEXTURE_ARB = 0x84E0, + GL_CLIENT_ACTIVE_TEXTURE_ARB = 0x84E1, + GL_MAX_TEXTURE_UNITS_ARB = 0x84E2, + + /* + * OpenGL 1.2 imaging subset (NOT IMPLEMENTED BY MESA) + */ + /* GL_EXT_color_table */ + GL_COLOR_TABLE = 0x80D0, + GL_POST_CONVOLUTION_COLOR_TABLE = 0x80D1, + GL_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D2, + GL_PROXY_COLOR_TABLE = 0x80D3, + GL_PROXY_POST_CONVOLUTION_COLOR_TABLE = 0x80D4, + GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE = 0x80D5, + GL_COLOR_TABLE_SCALE = 0x80D6, + GL_COLOR_TABLE_BIAS = 0x80D7, + GL_COLOR_TABLE_FORMAT = 0x80D8, + GL_COLOR_TABLE_WIDTH = 0x80D9, + GL_COLOR_TABLE_RED_SIZE = 0x80DA, + GL_COLOR_TABLE_GREEN_SIZE = 0x80DB, + GL_COLOR_TABLE_BLUE_SIZE = 0x80DC, + GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD, + GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE, + GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF, + /* GL_EXT_convolution and GL_HP_convolution_border_modes */ + GL_CONVOLUTION_1D = 0x8010, + GL_CONVOLUTION_2D = 0x8011, + GL_SEPARABLE_2D = 0x8012, + GL_CONVOLUTION_BORDER_MODE = 0x8013, + GL_CONVOLUTION_FILTER_SCALE = 0x8014, + GL_CONVOLUTION_FILTER_BIAS = 0x8015, + GL_REDUCE = 0x8016, + GL_CONVOLUTION_FORMAT = 0x8017, + GL_CONVOLUTION_WIDTH = 0x8018, + GL_CONVOLUTION_HEIGHT = 0x8019, + GL_MAX_CONVOLUTION_WIDTH = 0x801A, + GL_MAX_CONVOLUTION_HEIGHT = 0x801B, + GL_POST_CONVOLUTION_RED_SCALE = 0x801C, + GL_POST_CONVOLUTION_GREEN_SCALE = 0x801D, + GL_POST_CONVOLUTION_BLUE_SCALE = 0x801E, + GL_POST_CONVOLUTION_ALPHA_SCALE = 0x801F, + GL_POST_CONVOLUTION_RED_BIAS = 0x8020, + GL_POST_CONVOLUTION_GREEN_BIAS = 0x8021, + GL_POST_CONVOLUTION_BLUE_BIAS = 0x8022, + GL_POST_CONVOLUTION_ALPHA_BIAS = 0x8023, + GL_CONSTANT_BORDER = 0x8151, + GL_REPLICATE_BORDER = 0x8153, + GL_CONVOLUTION_BORDER_COLOR = 0x8154, + /* GL_SGI_color_matrix */ + GL_COLOR_MATRIX = 0x80B1, + GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2, + GL_MAX_COLOR_MATRIX_STACK_DEPTH = 0x80B3, + GL_POST_COLOR_MATRIX_RED_SCALE = 0x80B4, + GL_POST_COLOR_MATRIX_GREEN_SCALE = 0x80B5, + GL_POST_COLOR_MATRIX_BLUE_SCALE = 0x80B6, + GL_POST_COLOR_MATRIX_ALPHA_SCALE = 0x80B7, + GL_POST_COLOR_MATRIX_RED_BIAS = 0x80B8, + GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9, + GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA, + GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB, + /* GL_EXT_histogram */ + GL_HISTOGRAM = 0x8024, + GL_PROXY_HISTOGRAM = 0x8025, + GL_HISTOGRAM_WIDTH = 0x8026, + GL_HISTOGRAM_FORMAT = 0x8027, + GL_HISTOGRAM_RED_SIZE = 0x8028, + GL_HISTOGRAM_GREEN_SIZE = 0x8029, + GL_HISTOGRAM_BLUE_SIZE = 0x802A, + GL_HISTOGRAM_ALPHA_SIZE = 0x802B, + GL_HISTOGRAM_LUMINANCE_SIZE = 0x802C, + GL_HISTOGRAM_SINK = 0x802D, + GL_MINMAX = 0x802E, + GL_MINMAX_FORMAT = 0x802F, + GL_MINMAX_SINK = 0x8030, + GL_TABLE_TOO_LARGE = 0x8031, + /* GL_EXT_blend_color, GL_EXT_blend_minmax */ + GL_BLEND_EQUATION = 0x8009, + GL_MIN = 0x8007, + GL_MAX = 0x8008, + GL_FUNC_ADD = 0x8006, + GL_FUNC_SUBTRACT = 0x800A, + GL_FUNC_REVERSE_SUBTRACT = 0x800B, + GL_BLEND_COLOR = 0x8005, + + /* GL_NV_texgen_reflection (nVidia) */ + GL_NORMAL_MAP_NV = 0x8511, + GL_REFLECTION_MAP_NV = 0x8512, + + /* GL_PGI_misc_hints */ + GL_PREFER_DOUBLEBUFFER_HINT_PGI = 107000, + GL_STRICT_DEPTHFUNC_HINT_PGI = 107030, + GL_STRICT_LIGHTING_HINT_PGI = 107031, + GL_STRICT_SCISSOR_HINT_PGI = 107032, + GL_FULL_STIPPLE_HINT_PGI = 107033, + GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI = 107011, + GL_NATIVE_GRAPHICS_END_HINT_PGI = 107012, + GL_CONSERVE_MEMORY_HINT_PGI = 107005, + GL_RECLAIM_MEMORY_HINT_PGI = 107006, + GL_ALWAYS_FAST_HINT_PGI = 107020, + GL_ALWAYS_SOFT_HINT_PGI = 107021, + GL_ALLOW_DRAW_OBJ_HINT_PGI = 107022, + GL_ALLOW_DRAW_WIN_HINT_PGI = 107023, + GL_ALLOW_DRAW_FRG_HINT_PGI = 107024, + GL_ALLOW_DRAW_SPN_HINT_PGI = 107024, + GL_ALLOW_DRAW_MEM_HINT_PGI = 107025, + GL_CLIP_NEAR_HINT_PGI = 107040, + GL_CLIP_FAR_HINT_PGI = 107041, + GL_WIDE_LINE_HINT_PGI = 107042, + GL_BACK_NORMALS_HINT_PGI = 107043, + GL_NATIVE_GRAPHICS_HANDLE_PGI = 107010, + + /* GL_EXT_compiled_vertex_array */ + GL_ARRAY_ELEMENT_LOCK_FIRST_SGI = 0x81A8, + GL_ARRAY_ELEMENT_LOCK_COUNT_SGI = 0x81A9, + + /* GL_EXT_clip_volume_hint */ + GL_CLIP_VOLUME_CLIPPING_HINT_EXT = 0x80F0 + + +/* When you add new enums, please make sure you update the strings + * in enums.c as well... + */ + +} +#ifdef CENTERLINE_CLPP + /* CenterLine C++ workaround: */ + gl_enum; + typedef int GLenum; +#else + /* all other compilers */ + GLenum; +#endif + + +/* GL_NO_ERROR must be zero */ +#define GL_NO_ERROR 0 + + + +enum { + GL_CURRENT_BIT = 0x00000001, + GL_POINT_BIT = 0x00000002, + GL_LINE_BIT = 0x00000004, + GL_POLYGON_BIT = 0x00000008, + GL_POLYGON_STIPPLE_BIT = 0x00000010, + GL_PIXEL_MODE_BIT = 0x00000020, + GL_LIGHTING_BIT = 0x00000040, + GL_FOG_BIT = 0x00000080, + GL_DEPTH_BUFFER_BIT = 0x00000100, + GL_ACCUM_BUFFER_BIT = 0x00000200, + GL_STENCIL_BUFFER_BIT = 0x00000400, + GL_VIEWPORT_BIT = 0x00000800, + GL_TRANSFORM_BIT = 0x00001000, + GL_ENABLE_BIT = 0x00002000, + GL_COLOR_BUFFER_BIT = 0x00004000, + GL_HINT_BIT = 0x00008000, + GL_EVAL_BIT = 0x00010000, + GL_LIST_BIT = 0x00020000, + GL_TEXTURE_BIT = 0x00040000, + GL_SCISSOR_BIT = 0x00080000, + GL_ALL_ATTRIB_BITS = 0x000FFFFF +}; + + +enum { + GL_CLIENT_PIXEL_STORE_BIT = 0x00000001, + GL_CLIENT_VERTEX_ARRAY_BIT = 0x00000002 +}; +#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF + + +typedef unsigned int GLbitfield; + + +#ifdef CENTERLINE_CLPP +#define signed +#endif + + +/* + * + * Data types (may be architecture dependent in some cases) + * + */ + +/* C type GL type storage */ +/*-------------------------------------------------------------------------*/ +typedef void GLvoid; +typedef unsigned char GLboolean; +typedef signed char GLbyte; /* 1-byte signed */ +typedef short GLshort; /* 2-byte signed */ +typedef int GLint; /* 4-byte signed */ +typedef unsigned char GLubyte; /* 1-byte unsigned */ +typedef unsigned short GLushort; /* 2-byte unsigned */ +typedef unsigned int GLuint; /* 4-byte unsigned */ +typedef int GLsizei; /* 4-byte signed */ +typedef float GLfloat; /* single precision float */ +typedef float GLclampf; /* single precision float in [0,1] */ +typedef double GLdouble; /* double precision float */ +typedef double GLclampd; /* double precision float in [0,1] */ + + + +#if defined(__BEOS__) || defined(__QUICKDRAW__) +#pragma export on +#endif + + +/* + * Miscellaneous + */ + +GLAPI void GLAPIENTRY glClearIndex( GLfloat c ); + +GLAPI void GLAPIENTRY glClearColor( GLclampf red, + GLclampf green, + GLclampf blue, + GLclampf alpha ); + +GLAPI void GLAPIENTRY glClear( GLbitfield mask ); + +GLAPI void GLAPIENTRY glIndexMask( GLuint mask ); + +GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, + GLboolean blue, GLboolean alpha ); + +GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref ); + +GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor ); + +GLAPI void GLAPIENTRY glLogicOp( GLenum opcode ); + +GLAPI void GLAPIENTRY glCullFace( GLenum mode ); + +GLAPI void GLAPIENTRY glFrontFace( GLenum mode ); + +GLAPI void GLAPIENTRY glPointSize( GLfloat size ); + +GLAPI void GLAPIENTRY glLineWidth( GLfloat width ); + +GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern ); + +GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode ); + +GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units ); + +GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask ); + +GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask ); + +GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag ); + +GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag ); + +GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, + GLsizei width, GLsizei height); + +GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation ); + +GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation ); + +GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode ); + +GLAPI void GLAPIENTRY glReadBuffer( GLenum mode ); + +GLAPI void GLAPIENTRY glEnable( GLenum cap ); + +GLAPI void GLAPIENTRY glDisable( GLenum cap ); + +GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap ); + + +GLAPI void GLAPIENTRY glEnableClientState( GLenum cap ); /* 1.1 */ + +GLAPI void GLAPIENTRY glDisableClientState( GLenum cap ); /* 1.1 */ + + +GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params ); + +GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params ); + +GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params ); + +GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask ); + +GLAPI void GLAPIENTRY glPopAttrib( void ); + + +GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask ); /* 1.1 */ + +GLAPI void GLAPIENTRY glPopClientAttrib( void ); /* 1.1 */ + + +GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode ); + +GLAPI GLenum GLAPIENTRY glGetError( void ); + +GLAPI const GLubyte* GLAPIENTRY glGetString( GLenum name ); + +GLAPI void GLAPIENTRY glFinish( void ); + +GLAPI void GLAPIENTRY glFlush( void ); + +GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode ); + + + +/* + * Depth Buffer + */ + +GLAPI void GLAPIENTRY glClearDepth( GLclampd depth ); + +GLAPI void GLAPIENTRY glDepthFunc( GLenum func ); + +GLAPI void GLAPIENTRY glDepthMask( GLboolean flag ); + +GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val ); + + +/* + * Accumulation Buffer + */ + +GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, + GLfloat blue, GLfloat alpha ); + +GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value ); + + + +/* + * Transformation + */ + +GLAPI void GLAPIENTRY glMatrixMode( GLenum mode ); + +GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, + GLdouble near_val, GLdouble far_val ); + +GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, + GLdouble near_val, GLdouble far_val ); + +GLAPI void GLAPIENTRY glViewport( GLint x, GLint y, + GLsizei width, GLsizei height ); + +GLAPI void GLAPIENTRY glPushMatrix( void ); + +GLAPI void GLAPIENTRY glPopMatrix( void ); + +GLAPI void GLAPIENTRY glLoadIdentity( void ); + +GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m ); +GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m ); + +GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m ); +GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m ); + +GLAPI void GLAPIENTRY glRotated( GLdouble angle, + GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glRotatef( GLfloat angle, + GLfloat x, GLfloat y, GLfloat z ); + +GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z ); + +GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z ); + + + +/* + * Display Lists + */ + +GLAPI GLboolean GLAPIENTRY glIsList( GLuint list ); + +GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range ); + +GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range ); + +GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode ); + +GLAPI void GLAPIENTRY glEndList( void ); + +GLAPI void GLAPIENTRY glCallList( GLuint list ); + +GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type, + const GLvoid *lists ); + +GLAPI void GLAPIENTRY glListBase( GLuint base ); + + + +/* + * Drawing Functions + */ + +GLAPI void GLAPIENTRY glBegin( GLenum mode ); + +GLAPI void GLAPIENTRY glEnd( void ); + + +GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y ); +GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y ); +GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y ); +GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y ); + +GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z ); +GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z ); +GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z ); + +GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ); +GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w ); +GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); + +GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glVertex2iv( const GLint *v ); +GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glVertex3iv( const GLint *v ); +GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glVertex4iv( const GLint *v ); +GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz ); +GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz ); +GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz ); +GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz ); +GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz ); + +GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v ); +GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glNormal3iv( const GLint *v ); +GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glIndexd( GLdouble c ); +GLAPI void GLAPIENTRY glIndexf( GLfloat c ); +GLAPI void GLAPIENTRY glIndexi( GLint c ); +GLAPI void GLAPIENTRY glIndexs( GLshort c ); +GLAPI void GLAPIENTRY glIndexub( GLubyte c ); /* 1.1 */ + +GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c ); +GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c ); +GLAPI void GLAPIENTRY glIndexiv( const GLint *c ); +GLAPI void GLAPIENTRY glIndexsv( const GLshort *c ); +GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c ); /* 1.1 */ + +GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue ); +GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue ); +GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue ); +GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue ); +GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue ); +GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue ); +GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue ); +GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue ); + +GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green, + GLbyte blue, GLbyte alpha ); +GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green, + GLdouble blue, GLdouble alpha ); +GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green, + GLfloat blue, GLfloat alpha ); +GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green, + GLint blue, GLint alpha ); +GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green, + GLshort blue, GLshort alpha ); +GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green, + GLubyte blue, GLubyte alpha ); +GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green, + GLuint blue, GLuint alpha ); +GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green, + GLushort blue, GLushort alpha ); + + +GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v ); +GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glColor3iv( const GLint *v ); +GLAPI void GLAPIENTRY glColor3sv( const GLshort *v ); +GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v ); +GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v ); +GLAPI void GLAPIENTRY glColor3usv( const GLushort *v ); + +GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v ); +GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glColor4iv( const GLint *v ); +GLAPI void GLAPIENTRY glColor4sv( const GLshort *v ); +GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v ); +GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v ); +GLAPI void GLAPIENTRY glColor4usv( const GLushort *v ); + + +GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s ); +GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s ); +GLAPI void GLAPIENTRY glTexCoord1i( GLint s ); +GLAPI void GLAPIENTRY glTexCoord1s( GLshort s ); + +GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t ); +GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t ); +GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t ); +GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t ); + +GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r ); +GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r ); +GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r ); +GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r ); + +GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); +GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q ); +GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q ); +GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); + +GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y ); +GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y ); +GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y ); +GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y ); + +GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z ); +GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z ); +GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z ); + +GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ); +GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w ); +GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w ); + +GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v ); +GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v ); +GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v ); +GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 ); +GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ); +GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 ); +GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 ); + + +GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 ); +GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 ); +GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 ); +GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 ); + + + +/* + * Vertex Arrays (1.1) + */ + +GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride, + const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride, + const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, void **params ); + +GLAPI void GLAPIENTRY glArrayElement( GLint i ); + +GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count ); + +GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count, + GLenum type, const GLvoid *indices ); + +GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride, + const GLvoid *pointer ); + + +/* + * Lighting + */ + +GLAPI void GLAPIENTRY glShadeModel( GLenum mode ); + +GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param ); +GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname, + const GLfloat *params ); +GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname, + const GLint *params ); + +GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname, + GLfloat *params ); +GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param ); +GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param ); +GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params ); + +GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode ); + + + + +/* + * Raster functions + */ + +GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor ); + +GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLint mapsize, + const GLfloat *values ); +GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLint mapsize, + const GLuint *values ); +GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLint mapsize, + const GLushort *values ); + +GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values ); +GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values ); +GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values ); + +GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height, + GLfloat xorig, GLfloat yorig, + GLfloat xmove, GLfloat ymove, + const GLubyte *bitmap ); + +GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y, + GLsizei width, GLsizei height, + GLenum format, GLenum type, + GLvoid *pixels ); + +GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y, + GLsizei width, GLsizei height, + GLenum type ); + + + +/* + * Stenciling + */ + +GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask ); + +GLAPI void GLAPIENTRY glStencilMask( GLuint mask ); + +GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass ); + +GLAPI void GLAPIENTRY glClearStencil( GLint s ); + + + +/* + * Texture mapping + */ + +GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param ); +GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params ); +GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params ); +GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname, + const GLfloat *params ); +GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname, + const GLint *params ); + +GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target, + GLenum pname, GLfloat *params); +GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target, + GLenum pname, GLint *params ); + +GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level, + GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level, + GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level, + GLint internalFormat, + GLsizei width, GLint border, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level, + GLint internalFormat, + GLsizei width, GLsizei height, + GLint border, GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level, + GLenum format, GLenum type, + GLvoid *pixels ); + + + +/* 1.1 functions */ + +GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures ); + +GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures); + +GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture ); + +GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n, + const GLuint *textures, + const GLclampf *priorities ); + +GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n, + const GLuint *textures, + GLboolean *residences ); + +GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture ); + + +GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level, + GLint xoffset, + GLsizei width, GLenum format, + GLenum type, const GLvoid *pixels ); + + +GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLsizei width, GLsizei height, + GLenum format, GLenum type, + const GLvoid *pixels ); + + +GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level, + GLenum internalformat, + GLint x, GLint y, + GLsizei width, GLint border ); + + +GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level, + GLenum internalformat, + GLint x, GLint y, + GLsizei width, GLsizei height, + GLint border ); + + +GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level, + GLint xoffset, GLint x, GLint y, + GLsizei width ); + + +GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint x, GLint y, + GLsizei width, GLsizei height ); + + + + +/* + * Evaluators + */ + +GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2, + GLint stride, + GLint order, const GLdouble *points ); +GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2, + GLint stride, + GLint order, const GLfloat *points ); + +GLAPI void GLAPIENTRY glMap2d( GLenum target, + GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, + GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, + const GLdouble *points ); +GLAPI void GLAPIENTRY glMap2f( GLenum target, + GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, + GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, + const GLfloat *points ); + +GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v ); +GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v ); +GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v ); + +GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u ); +GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u ); + +GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u ); +GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u ); + +GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v ); +GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v ); + +GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u ); +GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u ); + +GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 ); +GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 ); + +GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2, + GLint vn, GLdouble v1, GLdouble v2 ); +GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2, + GLint vn, GLfloat v1, GLfloat v2 ); + +GLAPI void GLAPIENTRY glEvalPoint1( GLint i ); + +GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j ); + +GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 ); + +GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ); + + + +/* + * Fog + */ + +GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param ); + +GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params ); + +GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params ); + + + +/* + * Selection and Feedback + */ + +GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ); + +GLAPI void GLAPIENTRY glPassThrough( GLfloat token ); + +GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer ); + +GLAPI void GLAPIENTRY glInitNames( void ); + +GLAPI void GLAPIENTRY glLoadName( GLuint name ); + +GLAPI void GLAPIENTRY glPushName( GLuint name ); + +GLAPI void GLAPIENTRY glPopName( void ); + + + +/* + * Extensions + */ + +/* GL_EXT_blend_minmax */ +GLAPI void GLAPIENTRY glBlendEquationEXT( GLenum mode ); + + + +/* GL_EXT_blend_color */ +GLAPI void GLAPIENTRY glBlendColorEXT( GLclampf red, GLclampf green, + GLclampf blue, GLclampf alpha ); + + + +/* GL_EXT_polygon_offset */ +GLAPI void GLAPIENTRY glPolygonOffsetEXT( GLfloat factor, GLfloat bias ); + + + +/* GL_EXT_vertex_array */ + +GLAPI void GLAPIENTRY glVertexPointerEXT( GLint size, GLenum type, + GLsizei stride, + GLsizei count, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glNormalPointerEXT( GLenum type, GLsizei stride, + GLsizei count, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glColorPointerEXT( GLint size, GLenum type, + GLsizei stride, + GLsizei count, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glIndexPointerEXT( GLenum type, GLsizei stride, + GLsizei count, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glTexCoordPointerEXT( GLint size, GLenum type, + GLsizei stride, GLsizei count, + const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glEdgeFlagPointerEXT( GLsizei stride, GLsizei count, + const GLboolean *ptr ); + +GLAPI void GLAPIENTRY glGetPointervEXT( GLenum pname, void **params ); + +GLAPI void GLAPIENTRY glArrayElementEXT( GLint i ); + +GLAPI void GLAPIENTRY glDrawArraysEXT( GLenum mode, GLint first, + GLsizei count ); + + + +/* GL_EXT_texture_object */ + +GLAPI void GLAPIENTRY glGenTexturesEXT( GLsizei n, GLuint *textures ); + +GLAPI void GLAPIENTRY glDeleteTexturesEXT( GLsizei n, const GLuint *textures); + +GLAPI void GLAPIENTRY glBindTextureEXT( GLenum target, GLuint texture ); + +GLAPI void GLAPIENTRY glPrioritizeTexturesEXT( GLsizei n, + const GLuint *textures, + const GLclampf *priorities ); + +GLAPI GLboolean GLAPIENTRY glAreTexturesResidentEXT( GLsizei n, + const GLuint *textures, + GLboolean *residences ); + +GLAPI GLboolean GLAPIENTRY glIsTextureEXT( GLuint texture ); + + + +/* GL_EXT_texture3D */ + +GLAPI void GLAPIENTRY glTexImage3DEXT( GLenum target, GLint level, + GLenum internalFormat, + GLsizei width, GLsizei height, + GLsizei depth, GLint border, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glTexSubImage3DEXT( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, + GLenum type, const GLvoid *pixels); + +GLAPI void GLAPIENTRY glCopyTexSubImage3DEXT( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLint x, + GLint y, GLsizei width, + GLsizei height ); + + + +/* GL_EXT_color_table */ + +GLAPI void GLAPIENTRY glColorTableEXT( GLenum target, GLenum internalformat, + GLsizei width, GLenum format, + GLenum type, const GLvoid *table ); + +GLAPI void GLAPIENTRY glColorSubTableEXT( GLenum target, + GLsizei start, GLsizei count, + GLenum format, GLenum type, + const GLvoid *data ); + +GLAPI void GLAPIENTRY glGetColorTableEXT( GLenum target, GLenum format, + GLenum type, GLvoid *table ); + +GLAPI void GLAPIENTRY glGetColorTableParameterfvEXT( GLenum target, + GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetColorTableParameterivEXT( GLenum target, + GLenum pname, + GLint *params ); + + +/* GL_ARB_multitexture */ + +GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture); +GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture); +GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s); +GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s); +GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s); +GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s); +GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v); +GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t); +GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t); +GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t); +GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t); +GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v); +GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r); +GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r); +GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r); +GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r); +GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v); +GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q); +GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v); + + + +/* GL_EXT_point_parameters */ +GLAPI void GLAPIENTRY glPointParameterfEXT( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glPointParameterfvEXT( GLenum pname, + const GLfloat *params ); + + + +/* GL_INGR_blend_func_separate */ +GLAPI void GLAPIENTRY glBlendFuncSeparateINGR( GLenum sfactorRGB, + GLenum dfactorRGB, + GLenum sfactorAlpha, + GLenum dfactorAlpha ); + + + +/* GL_MESA_window_pos */ + +GLAPI void GLAPIENTRY glWindowPos2iMESA( GLint x, GLint y ); +GLAPI void GLAPIENTRY glWindowPos2sMESA( GLshort x, GLshort y ); +GLAPI void GLAPIENTRY glWindowPos2fMESA( GLfloat x, GLfloat y ); +GLAPI void GLAPIENTRY glWindowPos2dMESA( GLdouble x, GLdouble y ); + +GLAPI void GLAPIENTRY glWindowPos2ivMESA( const GLint *p ); +GLAPI void GLAPIENTRY glWindowPos2svMESA( const GLshort *p ); +GLAPI void GLAPIENTRY glWindowPos2fvMESA( const GLfloat *p ); +GLAPI void GLAPIENTRY glWindowPos2dvMESA( const GLdouble *p ); + +GLAPI void GLAPIENTRY glWindowPos3iMESA( GLint x, GLint y, GLint z ); +GLAPI void GLAPIENTRY glWindowPos3sMESA( GLshort x, GLshort y, GLshort z ); +GLAPI void GLAPIENTRY glWindowPos3fMESA( GLfloat x, GLfloat y, GLfloat z ); +GLAPI void GLAPIENTRY glWindowPos3dMESA( GLdouble x, GLdouble y, GLdouble z ); + +GLAPI void GLAPIENTRY glWindowPos3ivMESA( const GLint *p ); +GLAPI void GLAPIENTRY glWindowPos3svMESA( const GLshort *p ); +GLAPI void GLAPIENTRY glWindowPos3fvMESA( const GLfloat *p ); +GLAPI void GLAPIENTRY glWindowPos3dvMESA( const GLdouble *p ); + +GLAPI void GLAPIENTRY glWindowPos4iMESA( GLint x, GLint y, GLint z, GLint w ); +GLAPI void GLAPIENTRY glWindowPos4sMESA( GLshort x, GLshort y, GLshort z, GLshort w ); +GLAPI void GLAPIENTRY glWindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w ); +GLAPI void GLAPIENTRY glWindowPos4dMESA( GLdouble x, GLdouble y, GLdouble z, GLdouble w); + +GLAPI void GLAPIENTRY glWindowPos4ivMESA( const GLint *p ); +GLAPI void GLAPIENTRY glWindowPos4svMESA( const GLshort *p ); +GLAPI void GLAPIENTRY glWindowPos4fvMESA( const GLfloat *p ); +GLAPI void GLAPIENTRY glWindowPos4dvMESA( const GLdouble *p ); + + +/* GL_MESA_resize_buffers */ + +GLAPI void GLAPIENTRY glResizeBuffersMESA( void ); + + +/* 1.2 functions */ +GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start, + GLuint end, GLsizei count, GLenum type, const GLvoid *indices ); + +GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level, + GLint internalFormat, + GLsizei width, GLsizei height, + GLsizei depth, GLint border, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, + GLenum type, const GLvoid *pixels); + +GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLint x, + GLint y, GLsizei width, + GLsizei height ); + + +/* 1.2 imaging extension functions */ + +GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat, + GLsizei width, GLenum format, + GLenum type, const GLvoid *table ); + +GLAPI void GLAPIENTRY glColorSubTable( GLenum target, + GLsizei start, GLsizei count, + GLenum format, GLenum type, + const GLvoid *data ); + +GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname, + const GLint *params); + +GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params); + +GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *table ); + +GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glBlendEquation( GLenum mode ); + +GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green, + GLclampf blue, GLclampf alpha ); + +GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width, + GLenum internalformat, GLboolean sink ); + +GLAPI void GLAPIENTRY glResetHistogram( GLenum target ); + +GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset, + GLenum format, GLenum type, + GLvoid *values ); + +GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat, + GLboolean sink ); + +GLAPI void GLAPIENTRY glResetMinmax( GLenum target ); + +GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset, + GLenum format, GLenum types, + GLvoid *values ); + +GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target, + GLenum internalformat, GLsizei width, GLenum format, GLenum type, + const GLvoid *image ); + +GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target, + GLenum internalformat, GLsizei width, GLsizei height, GLenum format, + GLenum type, const GLvoid *image ); + +GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname, + GLfloat params ); + +GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname, + const GLfloat *params ); + +GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname, + GLint params ); + +GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname, + const GLint *params ); + +GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target, + GLenum internalformat, GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target, + GLenum internalformat, GLint x, GLint y, GLsizei width, + GLsizei height); + +GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format, + GLenum type, GLvoid *image ); + +GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target, + GLenum internalformat, GLsizei width, GLsizei height, GLenum format, + GLenum type, const GLvoid *row, const GLvoid *column ); + +GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, + GLenum type, GLvoid *row, GLvoid *column, GLvoid *span ); + + + +/* GL_EXT_compiled_vertex_array */ +GLAPI void GLAPIENTRY glLockArraysEXT( GLint first, GLsizei count ); +GLAPI void GLAPIENTRY glUnlockArraysEXT( void ); + + + +#if defined(__BEOS__) || defined(__QUICKDRAW__) +#pragma export off +#endif + + +/* + * Compile-time tests for extensions: + */ +#define GL_EXT_blend_color 1 +#define GL_EXT_blend_logic_op 1 +#define GL_EXT_blend_minmax 1 +#define GL_EXT_blend_subtract 1 +#define GL_EXT_polygon_offset 1 +#define GL_EXT_vertex_array 1 +#define GL_EXT_texture_object 1 +#define GL_EXT_texture3D 1 +#define GL_EXT_paletted_texture 1 +#define GL_EXT_shared_texture_palette 1 +#define GL_EXT_point_parameters 1 +#define GL_EXT_rescale_normal 1 +#define GL_EXT_abgr 1 +#define GL_EXT_stencil_wrap 1 +#define GL_MESA_window_pos 1 +#define GL_MESA_resize_buffers 1 +#define GL_SGIS_texture_edge_clamp 1 +#define GL_INGR_blend_func_separate 1 +#define GL_ARB_multitexture 1 +#define GL_NV_texgen_reflection 1 +#define GL_PGI_misc_hints 1 +#define GL_EXT_compiled_vertex_array 1 +#define GL_EXT_clip_volume_hint 1 + + +#ifdef macintosh + #pragma enumsalwaysint reset + #if PRAGMA_IMPORT_SUPPORTED + #pragma import off + #endif +#endif + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/xc/extras/Mesa/include/GL/glx.h b/xc/extras/Mesa/include/GL/glx.h new file mode 100644 index 000000000..fdbdf3db9 --- /dev/null +++ b/xc/extras/Mesa/include/GL/glx.h @@ -0,0 +1,231 @@ +/* $Id: glx.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ + +/* + * Mesa 3-D graphics library + * Version: 3.1 + * + * Copyright (C) 1999 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + + +#ifndef GLX_H +#define GLX_H + + +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include "GL/gl.h" +#ifdef MESA +#include "GL/xmesa.h" +#endif + + +#if defined(USE_MGL_NAMESPACE) +#include "glx_mangle.h" +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + + +#define GLX_VERSION_1_1 1 + + +/* + * Tokens for glXChooseVisual and glXGetConfig: + */ +enum _GLX_CONFIGS { + GLX_USE_GL = 1, + GLX_BUFFER_SIZE = 2, + GLX_LEVEL = 3, + GLX_RGBA = 4, + GLX_DOUBLEBUFFER = 5, + GLX_STEREO = 6, + GLX_AUX_BUFFERS = 7, + GLX_RED_SIZE = 8, + GLX_GREEN_SIZE = 9, + GLX_BLUE_SIZE = 10, + GLX_ALPHA_SIZE = 11, + GLX_DEPTH_SIZE = 12, + GLX_STENCIL_SIZE = 13, + GLX_ACCUM_RED_SIZE = 14, + GLX_ACCUM_GREEN_SIZE = 15, + GLX_ACCUM_BLUE_SIZE = 16, + GLX_ACCUM_ALPHA_SIZE = 17, + + /* GLX_EXT_visual_info extension */ + GLX_X_VISUAL_TYPE_EXT = 0x22, + GLX_TRANSPARENT_TYPE_EXT = 0x23, + GLX_TRANSPARENT_INDEX_VALUE_EXT = 0x24, + GLX_TRANSPARENT_RED_VALUE_EXT = 0x25, + GLX_TRANSPARENT_GREEN_VALUE_EXT = 0x26, + GLX_TRANSPARENT_BLUE_VALUE_EXT = 0x27, + GLX_TRANSPARENT_ALPHA_VALUE_EXT = 0x28 +}; + + +/* + * Error codes returned by glXGetConfig: + */ +#define GLX_BAD_SCREEN 1 +#define GLX_BAD_ATTRIBUTE 2 +#define GLX_NO_EXTENSION 3 +#define GLX_BAD_VISUAL 4 +#define GLX_BAD_CONTEXT 5 +#define GLX_BAD_VALUE 6 +#define GLX_BAD_ENUM 7 + + +/* + * GLX 1.1 and later: + */ +#define GLX_VENDOR 1 +#define GLX_VERSION 2 +#define GLX_EXTENSIONS 3 + + +/* + * GLX_visual_info extension + */ +#define GLX_TRUE_COLOR_EXT 0x8002 +#define GLX_DIRECT_COLOR_EXT 0x8003 +#define GLX_PSEUDO_COLOR_EXT 0x8004 +#define GLX_STATIC_COLOR_EXT 0x8005 +#define GLX_GRAY_SCALE_EXT 0x8006 +#define GLX_STATIC_GRAY_EXT 0x8007 +#define GLX_NONE_EXT 0x8000 +#define GLX_TRANSPARENT_RGB_EXT 0x8008 +#define GLX_TRANSPARENT_INDEX_EXT 0x8009 + + +/* + * Compile-time extension tests + */ +#define GLX_EXT_visual_info 1 +#define GLX_MESA_pixmap_colormap 1 +#define GLX_MESA_release_buffers 1 +#define GLX_MESA_copy_sub_buffer 1 +#define GLX_MESA_set_3dfx_mode 1 +#define GLX_SGI_video_sync 1 +#define GLX_ARB_get_proc_address 1 + + + +#ifdef MESA + typedef XMesaContext GLXContext; + typedef Pixmap GLXPixmap; + typedef Drawable GLXDrawable; +#else + typedef void * GLXContext; + typedef XID GLXPixmap; + typedef XID GLXDrawable; +#endif +typedef XID GLXContextID; + + + +extern XVisualInfo* glXChooseVisual( Display *dpy, int screen, + int *attribList ); + +extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis, + GLXContext shareList, Bool direct ); + +extern void glXDestroyContext( Display *dpy, GLXContext ctx ); + +extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable, + GLXContext ctx); + +extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst, + GLuint mask ); + +extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable ); + +extern GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *visual, + Pixmap pixmap ); + +extern void glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap ); + +extern Bool glXQueryExtension( Display *dpy, int *errorb, int *event ); + +extern Bool glXQueryVersion( Display *dpy, int *maj, int *min ); + +extern Bool glXIsDirect( Display *dpy, GLXContext ctx ); + +extern int glXGetConfig( Display *dpy, XVisualInfo *visual, + int attrib, int *value ); + +extern GLXContext glXGetCurrentContext( void ); + +extern GLXDrawable glXGetCurrentDrawable( void ); + +extern void glXWaitGL( void ); + +extern void glXWaitX( void ); + +extern void glXUseXFont( Font font, int first, int count, int list ); + + + +/* GLX 1.1 and later */ +extern const char *glXQueryExtensionsString( Display *dpy, int screen ); + +extern const char *glXQueryServerString( Display *dpy, int screen, int name ); + +extern const char *glXGetClientString( Display *dpy, int name ); + + + +/* GLX_MESA_pixmap_colormap */ +extern GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual, + Pixmap pixmap, Colormap cmap ); + + +/* GLX_MESA_release_buffers */ +extern Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d ); + + +/* GLX_MESA_copy_sub_buffer */ +extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable, + int x, int y, int width, int height ); + + +/* GLX_MESA_set_3dfx_mode */ +extern GLboolean glXSet3DfxModeMESA( GLint mode ); + + +/* GLX_SGI_video_sync */ +extern int glXGetVideoSyncSGI(unsigned int *count); +extern int glXWaitVideoSyncSGI(int divisor, int remainder, + unsigned int *count); + + +/* GLX_ARB_get_proc_address */ +extern void (*glXGetProcAddressARB(const GLubyte *procName))(); + + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/xc/extras/Mesa/include/GL/xmesa.h b/xc/extras/Mesa/include/GL/xmesa.h new file mode 100644 index 000000000..d90d43e65 --- /dev/null +++ b/xc/extras/Mesa/include/GL/xmesa.h @@ -0,0 +1,394 @@ +/* $Id: xmesa.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ + +/* + * Mesa 3-D graphics library + * Version: 3.1 + * + * Copyright (C) 1999 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +/* + * $Log: xmesa.h,v $ + * Revision 1.1 1999/12/14 02:39:38 daryll + * + * Upgrade to the latest Mesa 3.2 code. + * Fixed several driver texture management bugs in the tdfx driver. + * Fix a problem with unbinding a context (performer). + * Included the Mesa header files in the X tree instead of making copies. + * + * Revision 1.1.1.1.2.1 1999/11/24 18:41:37 brianp + * bumped version to 3.1 + * + * Revision 1.1.1.1 1999/08/19 00:55:40 jtg + * Imported sources + * + * Revision 1.3 1999/02/24 22:43:27 jens + * Name changes to get XMesa to compile standalone inside XFree86 + * + * Revision 1.2 1999/02/14 03:39:09 brianp + * new copyright + * + * Revision 1.1 1998/02/13 03:17:32 brianp + * Initial revision + * + */ + + +/* + * Mesa/X11 interface. This header file serves as the documentation for + * the Mesa/X11 interface functions. + * + * Note: this interface isn't intended for user programs. It's primarily + * just for implementing the pseudo-GLX interface. + */ + + +/* Sample Usage: + +In addition to the usual X calls to select a visual, create a colormap +and create a window, you must do the following to use the X/Mesa interface: + +1. Call XMesaCreateVisual() to make an XMesaVisual from an XVisualInfo. + +2. Call XMesaCreateContext() to create an X/Mesa rendering context, given + the XMesaVisual. + +3. Call XMesaCreateWindowBuffer() to create an XMesaBuffer from an X window + and XMesaVisual. + +4. Call XMesaMakeCurrent() to bind the XMesaBuffer to an XMesaContext and + to make the context the current one. + +5. Make gl* calls to render your graphics. + +6. Use XMesaSwapBuffers() when double buffering to swap front/back buffers. + +7. Before the X window is destroyed, call XMesaDestroyBuffer(). + +8. Before exiting, call XMesaDestroyVisual and XMesaDestroyContext. + +See the demos/xdemo.c and xmesa1.c files for examples. +*/ + + + + +#ifndef XMESA_H +#define XMESA_H + + +#ifdef __cplusplus +extern "C" { +#endif + + +#ifdef XFree86Server +#include "xmesa_xf86.h" +#else +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include "xmesa_x.h" +#ifdef GLX_DIRECT_RENDERING +#include "dri_mesa.h" +#endif +#endif +#include "GL/gl.h" + +#ifdef AMIWIN +#include <pragmas/xlib_pragmas.h> +extern struct Library *XLibBase; +#endif + + +#define XMESA_MAJOR_VERSION 3 +#define XMESA_MINOR_VERSION 1 + + + +/* + * Values passed to XMesaGetString: + */ +#define XMESA_VERSION 1 +#define XMESA_EXTENSIONS 2 + + +/* + * Values passed to XMesaSetFXmode: + */ +#define XMESA_FX_WINDOW 1 +#define XMESA_FX_FULLSCREEN 2 + + + +typedef struct xmesa_context *XMesaContext; + +typedef struct xmesa_visual *XMesaVisual; + +typedef struct xmesa_buffer *XMesaBuffer; + +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) +/* + * Initialize the XMesa driver. + */ +extern GLboolean XMesaInitDriver( __DRIscreenPrivate *driScrnPriv ); + +/* + * Reset the XMesa driver when the X server resets. + */ +extern void XMesaResetDriver( __DRIscreenPrivate *driScrnPriv ); +#endif + + +/* + * Create a new X/Mesa visual. + * Input: display - X11 display + * visinfo - an XVisualInfo pointer + * rgb_flag - GL_TRUE = RGB mode, + * GL_FALSE = color index mode + * alpha_flag - alpha buffer requested? + * db_flag - GL_TRUE = double-buffered, + * GL_FALSE = single buffered + * stereo_flag - stereo visual? + * depth_size - requested bits/depth values, or zero + * stencil_size - requested bits/stencil values, or zero + * accum_size - requested bits/component values, or zero + * ximage_flag - GL_TRUE = use an XImage for back buffer, + * GL_FALSE = use an off-screen pixmap for back buffer + * Return; a new XMesaVisual or 0 if error. + */ +extern XMesaVisual XMesaCreateVisual( XMesaDisplay *display, + XMesaVisualInfo visinfo, + GLboolean rgb_flag, + GLboolean alpha_flag, + GLboolean db_flag, + GLboolean stereo_flag, + GLboolean ximage_flag, + GLint depth_size, + GLint stencil_size, + GLint accum_size, + GLint level ); + +/* + * Destroy an XMesaVisual, but not the associated XVisualInfo. + */ +extern void XMesaDestroyVisual( XMesaVisual v ); + + + +/* + * Create a new XMesaContext for rendering into an X11 window. + * + * Input: visual - an XMesaVisual + * share_list - another XMesaContext with which to share display + * lists or NULL if no sharing is wanted. + * Return: an XMesaContext or NULL if error. + */ +extern XMesaContext XMesaCreateContext( XMesaVisual v, + XMesaContext share_list +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) + , __DRIcontextPrivate *driContextPriv +#endif + ); + + +/* + * Destroy a rendering context as returned by XMesaCreateContext() + */ +extern void XMesaDestroyContext( XMesaContext c ); + + +/* + * Create an XMesaBuffer from an X window. + */ +extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, + XMesaWindow w +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) + , __DRIdrawablePrivate *driDrawPriv +#endif + ); + + + +/* + * Create an XMesaBuffer from an X pixmap. + */ +extern XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v, + XMesaPixmap p, + XMesaColormap cmap +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) + , __DRIdrawablePrivate *driDrawPriv +#endif + ); + + + +/* + * Destroy an XMesaBuffer, but not the corresponding window or pixmap. + */ +extern void XMesaDestroyBuffer( XMesaBuffer b ); + + +/* + * Return the XMesaBuffer handle which corresponds to an X drawable, if any. + * + * New in Mesa 2.3. + */ +extern XMesaBuffer XMesaFindBuffer( XMesaDisplay *dpy, + XMesaDrawable d ); + + + +/* + * Bind a buffer to a context and make the context the current one. + */ +extern GLboolean XMesaMakeCurrent( XMesaContext c, + XMesaBuffer b ); + + +/* + * Return a handle to the current context. + */ +extern XMesaContext XMesaGetCurrentContext( void ); + + +/* + * Return handle to the current buffer. + */ +extern XMesaBuffer XMesaGetCurrentBuffer( void ); + + +/* + * Swap the front and back buffers for the given buffer. No action is + * taken if the buffer is not double buffered. + */ +extern void XMesaSwapBuffers( XMesaBuffer b ); + + +/* + * Copy a sub-region of the back buffer to the front buffer. + * + * New in Mesa 2.6 + */ +extern void XMesaCopySubBuffer( XMesaBuffer b, + int x, + int y, + int width, + int height ); + + +/* + * Return a pointer to the the Pixmap or XImage being used as the back + * color buffer of an XMesaBuffer. This function is a way to get "under + * the hood" of X/Mesa so one can manipulate the back buffer directly. + * Input: b - the XMesaBuffer + * Output: pixmap - pointer to back buffer's Pixmap, or 0 + * ximage - pointer to back buffer's XImage, or NULL + * Return: GL_TRUE = context is double buffered + * GL_FALSE = context is single buffered + */ +extern GLboolean XMesaGetBackBuffer( XMesaBuffer b, + XMesaPixmap *pixmap, + XMesaImage **ximage ); + + + +/* + * Return the depth buffer associated with an XMesaBuffer. + * Input: b - the XMesa buffer handle + * Output: width, height - size of buffer in pixels + * bytesPerValue - bytes per depth value (2 or 4) + * buffer - pointer to depth buffer values + * Return: GL_TRUE or GL_FALSE to indicate success or failure. + * + * New in Mesa 2.4. + */ +extern GLboolean XMesaGetDepthBuffer( XMesaBuffer b, + GLint *width, + GLint *height, + GLint *bytesPerValue, + void **buffer ); + + + +/* + * Flush/sync a context + */ +extern void XMesaFlush( XMesaContext c ); + + + +/* + * Get an X/Mesa-specific string. + * Input: name - either XMESA_VERSION or XMESA_EXTENSIONS + */ +extern const char *XMesaGetString( XMesaContext c, int name ); + + + +/* + * Scan for XMesaBuffers whose window/pixmap has been destroyed, then free + * any memory used by that buffer. + * + * New in Mesa 2.3. + */ +extern void XMesaGarbageCollect( void ); + + + +/* + * Return a dithered pixel value. + * Input: c - XMesaContext + * x, y - window coordinate + * red, green, blue, alpha - color components in [0,1] + * Return: pixel value + * + * New in Mesa 2.3. + */ +extern unsigned long XMesaDitherColor( XMesaContext xmesa, + GLint x, + GLint y, + GLfloat red, + GLfloat green, + GLfloat blue, + GLfloat alpha ); + + + +/* + * 3Dfx Glide driver only! + * Set 3Dfx/Glide full-screen or window rendering mode. + * Input: mode - either XMESA_FX_WINDOW (window rendering mode) or + * XMESA_FX_FULLSCREEN (full-screen rendering mode) + * Return: GL_TRUE if success + * GL_FALSE if invalid mode or if not using 3Dfx driver + * + * New in Mesa 2.6. + */ +extern GLboolean XMesaSetFXmode( GLint mode ); + + + +#ifdef __cplusplus +} +#endif + + +#endif diff --git a/xc/extras/Mesa/include/GL/xmesa_x.h b/xc/extras/Mesa/include/GL/xmesa_x.h new file mode 100644 index 000000000..ee9951855 --- /dev/null +++ b/xc/extras/Mesa/include/GL/xmesa_x.h @@ -0,0 +1,92 @@ + +/************************************************************************** + +Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +**************************************************************************/ + +/* + * Authors: + * Kevin E. Martin <kevin@precisioninsight.com> + * + * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_x.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ + */ + +#ifndef _XMESA_X_H_ +#define _XMESA_X_H_ + +typedef Display XMesaDisplay; +typedef Pixmap XMesaPixmap; +typedef Colormap XMesaColormap; +typedef Drawable XMesaDrawable; +typedef Window XMesaWindow; +typedef GC XMesaGC; +typedef XVisualInfo *XMesaVisualInfo; +typedef XImage XMesaImage; +typedef XPoint XMesaPoint; +typedef XColor XMesaColor; + +#define XMesaDestroyImage XDestroyImage + +#define XMesaPutPixel XPutPixel +#define XMesaGetPixel XGetPixel + +#define XMesaSetForeground XSetForeground +#define XMesaSetBackground XSetBackground +#define XMesaSetPlaneMask XSetPlaneMask +#define XMesaSetFunction XSetFunction +#define XMesaSetDashes XSetDashes +#define XMesaSetLineAttributes XSetLineAttributes +#define XMesaSetFillStyle XSetFillStyle +#define XMesaSetTile XSetTile +#define XMesaSetStipple XSetStipple + +#define XMesaDrawPoint XDrawPoint +#define XMesaDrawPoints XDrawPoints +#define XMesaDrawLine XDrawLine +#define XMesaFillRectangle XFillRectangle +#define XMesaPutImage XPutImage +#define XMesaCopyArea XCopyArea +#define XMesaFillPolygon XFillPolygon + +#define XMesaCreatePixmap XCreatePixmap +#define XMesaFreePixmap XFreePixmap +#define XMesaFreeGC XFreeGC + +#define GET_COLORMAP_SIZE(__v) __v->visinfo->colormap_size +#define GET_REDMASK(__v) __v->visinfo->red_mask +#define GET_GREENMASK(__v) __v->visinfo->green_mask +#define GET_BLUEMASK(__v) __v->visinfo->blue_mask +#define GET_BITS_PER_PIXEL(__v) bits_per_pixel(__v->display, __v->visinfo) +#if defined(__cplusplus) || defined(c_plusplus) +#define GET_VISUAL_CLASS(__v) __v->visinfo->c_class +#else +#define GET_VISUAL_CLASS(__v) __v->visinfo->class +#endif +#define GET_VISUAL_DEPTH(__v) __v->visinfo->depth +#define GET_BLACK_PIXEL(__v) BlackPixel(__v->display, __v->visinfo->screen) +#define CHECK_BYTE_ORDER(__v) host_byte_order()==ImageByteOrder(__v->display) +#define CHECK_FOR_HPCR(__v) XInternAtom(__v->display, "_HP_RGB_SMOOTH_MAP_LIST", True) + +#endif diff --git a/xc/extras/Mesa/include/GL/xmesa_xf86.h b/xc/extras/Mesa/include/GL/xmesa_xf86.h new file mode 100644 index 000000000..5b4a5f299 --- /dev/null +++ b/xc/extras/Mesa/include/GL/xmesa_xf86.h @@ -0,0 +1,189 @@ + +/************************************************************************** + +Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +**************************************************************************/ + +/* + * Authors: + * Kevin E. Martin <kevin@precisioninsight.com> + * + * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_xf86.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ + */ + +#ifndef _XMESA_XF86_H_ +#define _XMESA_XF86_H_ + +#include "scrnintstr.h" +#include "pixmapstr.h" + +typedef struct _XMesaImageRec XMesaImage; + +typedef ScreenRec XMesaDisplay; +typedef PixmapPtr XMesaPixmap; +typedef ColormapPtr XMesaColormap; +typedef DrawablePtr XMesaDrawable; +typedef WindowPtr XMesaWindow; +typedef GCPtr XMesaGC; +typedef VisualPtr XMesaVisualInfo; +typedef DDXPointRec XMesaPoint; +typedef xColorItem XMesaColor; + +#define XMesaSetGeneric(__d,__gc,__val,__mask) \ +do { \ + CARD32 __v[1]; \ + (void) __d; \ + __v[0] = __val; \ + dixChangeGC(NullClient, __gc, __mask, __v, NULL); \ +} while (0) + +#define XMesaSetGenericPtr(__d,__gc,__pval,__mask) \ +do { \ + ChangeGCVal __v[1]; \ + (void) __d; \ + __v[0].ptr = __pval; \ + dixChangeGC(NullClient, __gc, __mask, NULL, __v); \ +} while (0) + +#define XMesaSetDashes(__d,__gc,__do,__dl,__n) \ +do { \ + (void) __d; \ + SetDashes(__gc, __do, __n, (unsigned char *)__dl); \ +} while (0) + +#define XMesaSetLineAttributes(__d,__gc,__lw,__ls,__cs,__js) \ +do { \ + CARD32 __v[4]; \ + (void) __d; \ + __v[0] = __lw; \ + __v[1] = __ls; \ + __v[2] = __cs; \ + __v[3] = __js; \ + dixChangeGC(NullClient, __gc, \ + GCLineWidth|GCLineStyle|GCCapStyle|GCJoinStyle, \ + __v, NULL); \ +} while (0) + +#define XMesaSetForeground(d,gc,v) XMesaSetGeneric(d,gc,v,GCForeground) +#define XMesaSetBackground(d,gc,v) XMesaSetGeneric(d,gc,v,GCBackground) +#define XMesaSetPlaneMask(d,gc,v) XMesaSetGeneric(d,gc,v,GCPlaneMask) +#define XMesaSetFunction(d,gc,v) XMesaSetGeneric(d,gc,v,GCFunction) +#define XMesaSetFillStyle(d,gc,v) XMesaSetGeneric(d,gc,v,GCFillStyle) + +#define XMesaSetTile(d,gc,v) XMesaSetGenericPtr(d,gc,v,GCTile) +#define XMesaSetStipple(d,gc,v) XMesaSetGenericPtr(d,gc,v,GCStipple) + +#define XMesaDrawPoint(__d,__b,__gc,__x,__y) \ +do { \ + XMesaPoint __p[1]; \ + (void) __d; \ + __p[0].x = __x; \ + __p[0].y = __y; \ + ValidateGC(__b, __gc); \ + (*gc->ops->PolyPoint)(__b, __gc, CoordModeOrigin, 1, __p); \ +} while (0) + +#define XMesaDrawPoints(__d,__b,__gc,__p,__n,__m) \ +do { \ + (void) __d; \ + ValidateGC(__b, __gc); \ + (*gc->ops->PolyPoint)(__b, __gc, __m, __n, __p); \ +} while (0) + +#define XMesaDrawLine(__d,__b,__gc,__x0,__y0,__x1,__y1) \ +do { \ + XMesaPoint __p[2]; \ + (void) __d; \ + ValidateGC(__b, __gc); \ + __p[0].x = __x0; \ + __p[0].y = __y0; \ + __p[1].x = __x1; \ + __p[1].y = __y1; \ + (*__gc->ops->Polylines)(__b, __gc, CoordModeOrigin, 2, __p); \ +} while (0) + +#define XMesaFillRectangle(__d,__b,__gc,__x,__y,__w,__h) \ +do { \ + xRectangle __r[1]; \ + (void) __d; \ + ValidateGC(__b, __gc); \ + __r[0].x = __x; \ + __r[0].y = __y; \ + __r[0].width = __w; \ + __r[0].height = __h; \ + (*__gc->ops->PolyFillRect)(__b, __gc, 1, __r); \ +} while (0) + +#define XMesaPutImage(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h) \ +do { \ + /* Assumes: Images are always in ZPixmap format */ \ + (void) __d; \ + if (__sx || __sy) /* The non-trivial case */ \ + XMesaPutImageHelper(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h); \ + ValidateGC(__b, __gc); \ + (*__gc->ops->PutImage)(__b, __gc, ((XMesaDrawable)(__b))->depth, \ + __x, __y, __w, __h, 0, ZPixmap, \ + ((XMesaImage *)(__i))->data); \ +} while (0) + +#define XMesaCopyArea(__d,__sb,__db,__gc,__sx,__sy,__w,__h,__x,__y) \ +do { \ + (void) __d; \ + ValidateGC(__db, __gc); \ + (*__gc->ops->CopyArea)((DrawablePtr)__sb, __db, __gc, \ + __sx, __sy, __w, __h, __x, __y); \ +} while (0) + +#define XMesaFillPolygon(__d,__b,__gc,__p,__n,__s,__m) \ +do { \ + (void) __d; \ + ValidateGC(__b, __gc); \ + (*__gc->ops->FillPolygon)(__b, __gc, __s, __m, __n, __p); \ +} while (0) + +/* CreatePixmap returns a PixmapPtr; so, it cannot be inside braces */ +#define XMesaCreatePixmap(__d,__b,__w,__h,__depth) \ + (*__d->CreatePixmap)(__d, __w, __h, __depth) +#define XMesaFreePixmap(__d,__b) \ + (*__d->DestroyPixmap)(__b) + +#define XMesaFreeGC(__d,__gc) \ +do { \ + (void) __d; \ + FreeScratchGC(__gc); \ +} while (0) + +#define GET_COLORMAP_SIZE(__v) __v->visinfo->ColormapEntries +#define GET_REDMASK(__v) __v->visinfo->redMask +#define GET_GREENMASK(__v) __v->visinfo->greenMask +#define GET_BLUEMASK(__v) __v->visinfo->blueMask +#define GET_BITS_PER_PIXEL(__v) __v->visinfo->bitsPerRGBValue +#define GET_VISUAL_CLASS(__v) __v->visinfo->class +#define GET_VISUAL_DEPTH(__v) __v->visinfo->nplanes +#define GET_BLACK_PIXEL(__v) __v->display->blackPixel +#define CHECK_BYTE_ORDER(__v) GL_TRUE +#define CHECK_FOR_HPCR(__v) GL_FALSE + +#endif diff --git a/xc/extras/Mesa/src/FX/fxddtex.c b/xc/extras/Mesa/src/FX/fxddtex.c index 38dbf6f1a..db0120a03 100644 --- a/xc/extras/Mesa/src/FX/fxddtex.c +++ b/xc/extras/Mesa/src/FX/fxddtex.c @@ -124,13 +124,8 @@ static tfxTexInfo *fxAllocTexObjData(fxMesaContext fxMesa) ti->sClamp=GR_TEXTURECLAMP_WRAP; ti->tClamp=GR_TEXTURECLAMP_WRAP; - if(fxMesa->haveTwoTMUs) { - ti->mmMode=GR_MIPMAP_NEAREST; - ti->LODblend=FXTRUE; - } else { - ti->mmMode=GR_MIPMAP_NEAREST_DITHER; - ti->LODblend=FXFALSE; - } + ti->mmMode=GR_MIPMAP_NEAREST; + ti->LODblend=FXFALSE; for(i=0;i<MAX_TEXTURE_LEVELS;i++) { ti->mipmapLevel[i].used=GL_FALSE; @@ -921,10 +916,10 @@ static void fxTexBuildImageMap(const struct gl_texture_image *image, if(wscale==hscale==1) { int i=0; - int lenght=h*w; + int length=h*w; unsigned short a,l; - while(i++<lenght) { + while(i++<length) { l=*data++; a=*data++; @@ -965,10 +960,10 @@ static void fxTexBuildImageMap(const struct gl_texture_image *image, if(wscale==hscale==1) { int i=0; - int lenght=h*w; + int length=h*w; unsigned short r,g,b; - while(i++<lenght) { + while(i++<length) { r=*data++; g=*data++; b=*data++; @@ -1015,10 +1010,10 @@ static void fxTexBuildImageMap(const struct gl_texture_image *image, if(wscale==hscale==1) { int i=0; - int lenght=h*w; + int length=h*w; unsigned short r,g,b,a; - while(i++<lenght) { + while(i++<length) { r=*data++; g=*data++; b=*data++; diff --git a/xc/extras/Mesa/src/FX/fxdrv.h b/xc/extras/Mesa/src/FX/fxdrv.h index 8cef3340b..08bd52043 100644 --- a/xc/extras/Mesa/src/FX/fxdrv.h +++ b/xc/extras/Mesa/src/FX/fxdrv.h @@ -469,7 +469,6 @@ struct tfxMesaContext { GLuint texBindNumber; GLint tmuSrc; GLuint lastUnitsMode; - GLuint texStart[FX_NUM_TMU]; GLuint freeTexMem[FX_NUM_TMU]; MemRange *tmPool; MemRange *tmFree[FX_NUM_TMU]; diff --git a/xc/extras/Mesa/src/FX/fxsetup.c b/xc/extras/Mesa/src/FX/fxsetup.c index b27d5c983..29e6533a4 100644 --- a/xc/extras/Mesa/src/FX/fxsetup.c +++ b/xc/extras/Mesa/src/FX/fxsetup.c @@ -70,6 +70,7 @@ static void fxSetupFog(GLcontext *ctx, GLboolean forceTableRebuild); static void fxSetupScissor(GLcontext *ctx); static void fxSetupCull(GLcontext *ctx); static void gl_print_fx_state_flags( const char *msg, GLuint flags); +static GLboolean fxMultipassBlend(struct vertex_buffer *, GLuint); static GLboolean fxMultipassTexture( struct vertex_buffer *, GLuint ); static void fxTexValidate(GLcontext *ctx, struct gl_texture_object *tObj) @@ -310,12 +311,22 @@ static void fxSetupSingleTMU_NoLock(fxMesaContext fxMesa, struct gl_texture_obje fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU_SPLIT); else { if (fxMesa->haveTwoTMUs) { +#if 0 + /* This path is disabled because we're not correctly setting up + the second TMU as the only texture unit. It is arguable if this + fallback is ever really a win, because when we use the second + TMU we have to do setup for both TMU0 and TMU1 which is extra + work. We could just flush a texture from TMU0 instead. */ if (fxMesa->freeTexMem[FX_TMU0] > FX_grTexTextureMemRequired_NoLock(GR_MIPMAPLEVELMASK_BOTH, - &(ti->info))) - fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU0); - else - fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU1); + &(ti->info))) { + fxTMMoveInTM_NoLock(fxMesa,tObj, FX_TMU0); + } else { + fxTMMoveInTM_NoLock(fxMesa,tObj, FX_TMU1); + } +#else + fxTMMoveInTM_NoLock(fxMesa, tObj, FX_TMU0); +#endif } else fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU0); } @@ -372,7 +383,8 @@ static void fxSetupSingleTMU(fxMesaContext fxMesa, struct gl_texture_object *tOb END_BOARD_LOCK(); } -static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool LODblend) +static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, + FxBool LODblend) { if (MESA_VERBOSE&VERBOSE_DRIVER) { fprintf(stderr,"fxmesa: fxSelectSingleTMUSrc(%d,%d)\n",tmu,LODblend); @@ -390,7 +402,6 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, FXFALSE,FXFALSE); - fxMesa->tmuSrc=FX_TMU_SPLIT; } else { if(tmu==FX_TMU0) { @@ -398,7 +409,6 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, FXFALSE,FXFALSE); - fxMesa->tmuSrc=FX_TMU0; } else { FX_grTexCombine_NoLock(GR_TMU1, @@ -409,8 +419,10 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool /* GR_COMBINE_FUNCTION_SCALE_OTHER doesn't work ?!? */ FX_grTexCombine_NoLock(GR_TMU0, - GR_COMBINE_FUNCTION_BLEND,GR_COMBINE_FACTOR_ONE, - GR_COMBINE_FUNCTION_BLEND,GR_COMBINE_FACTOR_ONE, + GR_COMBINE_FUNCTION_BLEND, + GR_COMBINE_FACTOR_ONE, + GR_COMBINE_FUNCTION_BLEND, + GR_COMBINE_FACTOR_ONE, FXFALSE,FXFALSE); fxMesa->tmuSrc=FX_TMU1; @@ -504,10 +516,24 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset) FXFALSE); break; case GL_BLEND: -#ifndef FX_SILENT - fprintf(stderr,"fx Driver: GL_BLEND not yet supported\n"); -#endif - /* TO DO (I think that the Voodoo Graphics isn't able to support GL_BLEND) */ + FX_grAlphaCombine_NoLock(GR_COMBINE_FUNCTION_SCALE_OTHER, + GR_COMBINE_FACTOR_LOCAL, + locala, + GR_COMBINE_OTHER_TEXTURE, + FXFALSE); + if (ifmt==GL_ALPHA) + FX_grColorCombine_NoLock(GR_COMBINE_FUNCTION_LOCAL, + GR_COMBINE_FACTOR_NONE, + localc, + GR_COMBINE_OTHER_NONE, + FXFALSE); + else + FX_grColorCombine_NoLock(GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, + GR_COMBINE_FACTOR_LOCAL, + localc, + GR_COMBINE_OTHER_TEXTURE, + FXTRUE); + ctx->Driver.MultipassFunc = fxMultipassBlend; break; case GL_REPLACE: if((ifmt==GL_RGB) || (ifmt==GL_LUMINANCE)) @@ -1584,6 +1610,57 @@ void fxDDEnable(GLcontext *ctx, GLenum cap, GLboolean state) } } +#if 0 +/* + Multipass to do GL_BLEND texture functions + Cf*(1-Ct) has already been written to the buffer during the first pass + Cc*Ct gets written during the second pass (in this function) + Everything gets reset in the third call (in this function) +*/ +static GLboolean fxMultipassBlend(struct vertex_buffer *VB, GLuint pass) +{ + GLcontext *ctx = VB->ctx; + fxMesaContext fxMesa = FX_CONTEXT(ctx); + + switch (pass) { + case 1: + /* Add Cc*Ct */ + fxMesa->restoreUnitsState=fxMesa->unitsState; + if (ctx->Depth.Mask) { + /* We don't want to check or change the depth buffers */ + switch (ctx->Depth.Func) { + case GL_NEVER: + case GL_ALWAYS: + break; + default: + fxDDDepthFunc(ctx, GL_EQUAL); + break; + } + fxDDDepthMask(ctx, FALSE); + } + /* Enable Cc*Ct mode */ + /* ??? Set the Constant Color ??? */ + fxDDEnable(ctx, GL_BLEND, GL_TRUE); + fxDDBlendFunc(ctx, ???, ???); + fxSetupTextureSingleTMU(ctx, ???); + fxSetupBlend(ctx); + fxSetupDepthTest(ctx); + break; + + case 2: + /* Reset everything back to normal */ + fxMesa->unitsState = fxMesa->restoreUnitsState; + fxMesa->setupdone &= ???; + fxSetupTextureSingleTMU(ctx, ???); + fxSetupBlend(ctx); + fxSetupDepthTest(ctx); + break; + } + + return pass==1; +} +#endif + /************************************************************************/ /******************** Fake Multitexture Support *************************/ /************************************************************************/ @@ -1693,7 +1770,7 @@ void fxSetupFXUnits( GLcontext *ctx ) fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx; GLuint newstate = fxMesa->new_state; - if (MESA_VERBOSE&VERBOSE_DRIVER) + if (MESA_VERBOSE&VERBOSE_DRIVER) gl_print_fx_state_flags("fxmesa: fxSetupFXUnits", newstate); if (newstate) { diff --git a/xc/extras/Mesa/src/FX/fxtexman.c b/xc/extras/Mesa/src/FX/fxtexman.c index 770f095ab..285045de3 100644 --- a/xc/extras/Mesa/src/FX/fxtexman.c +++ b/xc/extras/Mesa/src/FX/fxtexman.c @@ -60,24 +60,38 @@ static struct gl_texture_object *fxTMFindOldestObject(fxMesaContext fxMesa, int tmu); -#if 0 +#ifdef TEXSANITY static void fubar() { } /* Sanity Check */ -static void sanity(fxMesaContext fxMesa, int tmu) +static void sanity(fxMesaContext fxMesa) { - MemRange *tmp, *prev; - int i; + MemRange *tmp, *prev, *pos; prev=0; - tmp = fxMesa->tmFree[tmu]; - i=0; + tmp = fxMesa->tmFree[0]; + while (tmp) { + if (!tmp->startAddr && !tmp->endAddr) { + fprintf(stderr, "Textures fubar\n"); + fubar(); + } + if (tmp->startAddr>=tmp->endAddr) { + fprintf(stderr, "Node fubar\n"); + fubar(); + } + if (prev && (prev->startAddr>=tmp->startAddr || + prev->endAddr>tmp->startAddr)) { + fprintf(stderr, "Sorting fubar\n"); + fubar(); + } + prev=tmp; + tmp=tmp->next; + } + prev=0; + tmp = fxMesa->tmFree[1]; while (tmp) { - fprintf(stderr, "TMU %d Sanity %d %d-%d\n", tmu, i, - tmp->startAddr, tmp->endAddr); - i++; if (!tmp->startAddr && !tmp->endAddr) { fprintf(stderr, "Textures fubar\n"); fubar(); @@ -87,7 +101,7 @@ static void sanity(fxMesaContext fxMesa, int tmu) fubar(); } if (prev && (prev->startAddr>=tmp->startAddr || - prev->endAddr>=tmp->startAddr)) { + prev->endAddr>tmp->startAddr)) { fprintf(stderr, "Sorting fubar\n"); fubar(); } @@ -128,13 +142,12 @@ static void fxTMUInit(fxMesaContext fxMesa, int tmu) start=FX_grTexMinAddress(tmu); end=FX_grTexMaxAddress(tmu); - fxMesa->texStart[tmu]=start; if(fxMesa->verbose) { fprintf(stderr,"%s configuration:",(tmu==FX_TMU0) ? "TMU0" : "TMU1"); fprintf(stderr," Lower texture memory address (%u)\n",(unsigned int)start); fprintf(stderr," Higher texture memory address (%u)\n",(unsigned int)end); - fprintf(stderr," Splitting Texture memory in 2Mb blocks:\n"); + fprintf(stderr," Splitting Texture memory in 2b blocks:\n"); } fxMesa->freeTexMem[tmu]=end-start; @@ -182,6 +195,7 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) } fxTMDeleteRangeNode(fxMesa, tmp); } + fxMesa->freeTexMem[tmu]-=size; return result; } prev=tmp; @@ -199,12 +213,13 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) static void fxTMRemoveRange(fxMesaContext fxMesa, GLint tmu, MemRange *range) { - MemRange *tmp, *prev, *next; + MemRange *tmp, *prev; if (range->startAddr==range->endAddr) { fxTMDeleteRangeNode(fxMesa, range); return; } + fxMesa->freeTexMem[tmu]+=range->endAddr-range->startAddr; prev=0; tmp=fxMesa->tmFree[tmu]; while (tmp) { @@ -554,6 +569,7 @@ void fxTMFreeTexture(fxMesaContext fxMesa, struct gl_texture_object *tObj) } switch (ti->whichTMU) { case FX_TMU0: + case FX_TMU1: fxTMDeleteRangeNode(fxMesa, ti->tm[ti->whichTMU]); break; case FX_TMU_SPLIT: @@ -566,12 +582,13 @@ void fxTMFreeTexture(fxMesaContext fxMesa, struct gl_texture_object *tObj) void fxTMInit(fxMesaContext fxMesa) { + fxMesa->texBindNumber=0; + fxMesa->tmPool=0; + fxTMUInit(fxMesa,FX_TMU0); if(fxMesa->haveTwoTMUs) fxTMUInit(fxMesa,FX_TMU1); - - fxMesa->texBindNumber=0; } void fxTMClose(fxMesaContext fxMesa) @@ -641,7 +658,7 @@ void fxTMRestore_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj) for (i=FX_largeLodValue_NoLock(ti->info),l=ti->minLevel; i<=FX_smallLodValue_NoLock(ti->info); i++,l++) { - if (ti->mipmapLevel[l].data) + if (ti->mipmapLevel[l].data) { FX_grTexDownloadMipMapLevel_NoLock(GR_TMU0, ti->tm[FX_TMU0]->startAddr, FX_valueToLod(i), @@ -650,7 +667,6 @@ void fxTMRestore_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj) ti->info.format, GR_MIPMAPLEVELMASK_ODD, ti->mipmapLevel[l].data); - if (ti->mipmapLevel[l].data) FX_grTexDownloadMipMapLevel_NoLock(GR_TMU1, ti->tm[FX_TMU1]->startAddr, FX_valueToLod(i), @@ -659,6 +675,7 @@ void fxTMRestore_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj) ti->info.format, GR_MIPMAPLEVELMASK_EVEN, ti->mipmapLevel[l].data); + } } break; default: diff --git a/xc/extras/Mesa/src/accum.c b/xc/extras/Mesa/src/accum.c index 4393a12bc..ccd89423f 100644 --- a/xc/extras/Mesa/src/accum.c +++ b/xc/extras/Mesa/src/accum.c @@ -1,4 +1,4 @@ -/* $Id: accum.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: accum.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/accum.h b/xc/extras/Mesa/src/accum.h index 26b59be81..5f5755326 100644 --- a/xc/extras/Mesa/src/accum.h +++ b/xc/extras/Mesa/src/accum.h @@ -1,4 +1,4 @@ -/* $Id: accum.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: accum.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/all.h b/xc/extras/Mesa/src/all.h index 1e9d6f3c3..f0d5dc95b 100644 --- a/xc/extras/Mesa/src/all.h +++ b/xc/extras/Mesa/src/all.h @@ -1,4 +1,4 @@ -/* $Id: all.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: all.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alpha.c b/xc/extras/Mesa/src/alpha.c index 123879b8f..e96900ca4 100644 --- a/xc/extras/Mesa/src/alpha.c +++ b/xc/extras/Mesa/src/alpha.c @@ -1,4 +1,4 @@ -/* $Id: alpha.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alpha.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alpha.h b/xc/extras/Mesa/src/alpha.h index 8528c2f90..100411ef9 100644 --- a/xc/extras/Mesa/src/alpha.h +++ b/xc/extras/Mesa/src/alpha.h @@ -1,4 +1,4 @@ -/* $Id: alpha.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alpha.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alphabuf.c b/xc/extras/Mesa/src/alphabuf.c index 2f3956029..969df6fe7 100644 --- a/xc/extras/Mesa/src/alphabuf.c +++ b/xc/extras/Mesa/src/alphabuf.c @@ -1,4 +1,4 @@ -/* $Id: alphabuf.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alphabuf.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alphabuf.h b/xc/extras/Mesa/src/alphabuf.h index 550519efd..a6d646078 100644 --- a/xc/extras/Mesa/src/alphabuf.h +++ b/xc/extras/Mesa/src/alphabuf.h @@ -1,4 +1,4 @@ -/* $Id: alphabuf.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alphabuf.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api.h b/xc/extras/Mesa/src/api.h index 9148baa82..8aab05e6e 100644 --- a/xc/extras/Mesa/src/api.h +++ b/xc/extras/Mesa/src/api.h @@ -1,4 +1,4 @@ -/* $Id: api.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: api.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api1.c b/xc/extras/Mesa/src/api1.c index f3addc636..0f418de4d 100644 --- a/xc/extras/Mesa/src/api1.c +++ b/xc/extras/Mesa/src/api1.c @@ -1,4 +1,4 @@ -/* $Id: api1.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: api1.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api2.c b/xc/extras/Mesa/src/api2.c index 673adf633..5df01ed74 100644 --- a/xc/extras/Mesa/src/api2.c +++ b/xc/extras/Mesa/src/api2.c @@ -1,4 +1,4 @@ -/* $Id: api2.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: api2.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/apiext.c b/xc/extras/Mesa/src/apiext.c index 10e88a302..286261146 100644 --- a/xc/extras/Mesa/src/apiext.c +++ b/xc/extras/Mesa/src/apiext.c @@ -1,4 +1,4 @@ -/* $Id: apiext.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: apiext.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/attrib.c b/xc/extras/Mesa/src/attrib.c index ce9a813d7..878f9f3ec 100644 --- a/xc/extras/Mesa/src/attrib.c +++ b/xc/extras/Mesa/src/attrib.c @@ -1,4 +1,4 @@ -/* $Id: attrib.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: attrib.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -428,6 +428,7 @@ void gl_PopAttrib( GLcontext* ctx ) GLubyte oldAlphaRef = ctx->Color.AlphaRef; GLenum oldBlendSrc = ctx->Color.BlendSrcRGB; GLenum oldBlendDst = ctx->Color.BlendDstRGB; + GLenum oldLogicOp = ctx->Color.LogicOp; MEMCPY( &ctx->Color, attr->data, sizeof(struct gl_colorbuffer_attrib) ); if (ctx->Color.DrawBuffer != oldDrawBuffer) { @@ -443,6 +444,9 @@ void gl_PopAttrib( GLcontext* ctx ) ctx->Driver.BlendFunc) (*ctx->Driver.BlendFunc)( ctx, ctx->Color.BlendSrcRGB, ctx->Color.BlendDstRGB); + if (ctx->Color.LogicOp != oldLogicOp && + ctx->Driver.LogicOpcode) + ctx->Driver.LogicOpcode( ctx, ctx->Color.LogicOp ); } break; case GL_CURRENT_BIT: diff --git a/xc/extras/Mesa/src/attrib.h b/xc/extras/Mesa/src/attrib.h index 7ba62e405..2dbb604d2 100644 --- a/xc/extras/Mesa/src/attrib.h +++ b/xc/extras/Mesa/src/attrib.h @@ -1,4 +1,4 @@ -/* $Id: attrib.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: attrib.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bbox.c b/xc/extras/Mesa/src/bbox.c index c1c01a98c..e78ce26cd 100644 --- a/xc/extras/Mesa/src/bbox.c +++ b/xc/extras/Mesa/src/bbox.c @@ -1,4 +1,4 @@ -/* $Id: bbox.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bbox.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bbox.h b/xc/extras/Mesa/src/bbox.h index 53fe32e04..ed6ca802c 100644 --- a/xc/extras/Mesa/src/bbox.h +++ b/xc/extras/Mesa/src/bbox.h @@ -1,4 +1,4 @@ -/* $Id: bbox.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bbox.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bitmap.c b/xc/extras/Mesa/src/bitmap.c index df2b9d573..ea9a90e88 100644 --- a/xc/extras/Mesa/src/bitmap.c +++ b/xc/extras/Mesa/src/bitmap.c @@ -1,4 +1,4 @@ -/* $Id: bitmap.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bitmap.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bitmap.h b/xc/extras/Mesa/src/bitmap.h index 8d8c85088..234125704 100644 --- a/xc/extras/Mesa/src/bitmap.h +++ b/xc/extras/Mesa/src/bitmap.h @@ -1,4 +1,4 @@ -/* $Id: bitmap.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bitmap.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/blend.c b/xc/extras/Mesa/src/blend.c index 0d0883591..e9bf7b434 100644 --- a/xc/extras/Mesa/src/blend.c +++ b/xc/extras/Mesa/src/blend.c @@ -1,4 +1,4 @@ -/* $Id: blend.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: blend.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/blend.h b/xc/extras/Mesa/src/blend.h index 3cd3bb918..90e869bb8 100644 --- a/xc/extras/Mesa/src/blend.h +++ b/xc/extras/Mesa/src/blend.h @@ -1,4 +1,4 @@ -/* $Id: blend.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: blend.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip.c b/xc/extras/Mesa/src/clip.c index 00ea37227..60aece17b 100644 --- a/xc/extras/Mesa/src/clip.c +++ b/xc/extras/Mesa/src/clip.c @@ -1,4 +1,4 @@ -/* $Id: clip.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip.h b/xc/extras/Mesa/src/clip.h index 0f3bafaaf..4ee1c7dfd 100644 --- a/xc/extras/Mesa/src/clip.h +++ b/xc/extras/Mesa/src/clip.h @@ -1,4 +1,4 @@ -/* $Id: clip.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip_funcs.h b/xc/extras/Mesa/src/clip_funcs.h index ccdc014c5..acd24f893 100644 --- a/xc/extras/Mesa/src/clip_funcs.h +++ b/xc/extras/Mesa/src/clip_funcs.h @@ -1,4 +1,4 @@ -/* $Id: clip_funcs.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip_funcs.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip_tmp.h b/xc/extras/Mesa/src/clip_tmp.h index 1c39e3f29..9dfe8e8ad 100644 --- a/xc/extras/Mesa/src/clip_tmp.h +++ b/xc/extras/Mesa/src/clip_tmp.h @@ -1,4 +1,4 @@ -/* $Id: clip_tmp.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colortab.c b/xc/extras/Mesa/src/colortab.c index d0e72d46b..ce69fea0b 100644 --- a/xc/extras/Mesa/src/colortab.c +++ b/xc/extras/Mesa/src/colortab.c @@ -1,4 +1,4 @@ -/* $Id: colortab.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: colortab.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colortab.h b/xc/extras/Mesa/src/colortab.h index b792b5ae3..c5e4e0f17 100644 --- a/xc/extras/Mesa/src/colortab.h +++ b/xc/extras/Mesa/src/colortab.h @@ -1,4 +1,4 @@ -/* $Id: colortab.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: colortab.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/config.c b/xc/extras/Mesa/src/config.c index cb1dab9cd..cdda182da 100644 --- a/xc/extras/Mesa/src/config.c +++ b/xc/extras/Mesa/src/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: config.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/config.h b/xc/extras/Mesa/src/config.h index 9cae80135..a80ac5922 100644 --- a/xc/extras/Mesa/src/config.h +++ b/xc/extras/Mesa/src/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: config.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/context.c b/xc/extras/Mesa/src/context.c index 7a4cc0d0c..8de6040aa 100644 --- a/xc/extras/Mesa/src/context.c +++ b/xc/extras/Mesa/src/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: context.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/context.h b/xc/extras/Mesa/src/context.h index 1651acbfb..382e2a4bc 100644 --- a/xc/extras/Mesa/src/context.h +++ b/xc/extras/Mesa/src/context.h @@ -1,4 +1,4 @@ -/* $Id: context.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: context.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/copy_tmp.h b/xc/extras/Mesa/src/copy_tmp.h index bd9dfb941..c9088505c 100644 --- a/xc/extras/Mesa/src/copy_tmp.h +++ b/xc/extras/Mesa/src/copy_tmp.h @@ -1,4 +1,4 @@ -/* $Id: copy_tmp.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: copy_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/copypix.c b/xc/extras/Mesa/src/copypix.c index d0768b768..912fb6a4b 100644 --- a/xc/extras/Mesa/src/copypix.c +++ b/xc/extras/Mesa/src/copypix.c @@ -1,4 +1,4 @@ -/* $Id: copypix.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: copypix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/copypix.h b/xc/extras/Mesa/src/copypix.h index bc106a0bf..783e252dd 100644 --- a/xc/extras/Mesa/src/copypix.h +++ b/xc/extras/Mesa/src/copypix.h @@ -1,4 +1,4 @@ -/* $Id: copypix.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: copypix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/cull_tmp.h b/xc/extras/Mesa/src/cull_tmp.h index f292253c5..00a09a43b 100644 --- a/xc/extras/Mesa/src/cull_tmp.h +++ b/xc/extras/Mesa/src/cull_tmp.h @@ -1,4 +1,4 @@ -/* $Id: cull_tmp.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: cull_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/cva.c b/xc/extras/Mesa/src/cva.c index ffd1e024b..8e700c3e0 100644 --- a/xc/extras/Mesa/src/cva.c +++ b/xc/extras/Mesa/src/cva.c @@ -1,4 +1,4 @@ -/* $Id: cva.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: cva.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/cva.h b/xc/extras/Mesa/src/cva.h index fc4a00925..071e4339b 100644 --- a/xc/extras/Mesa/src/cva.h +++ b/xc/extras/Mesa/src/cva.h @@ -1,4 +1,4 @@ -/* $Id: cva.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: cva.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dd.h b/xc/extras/Mesa/src/dd.h index 2f7b92f98..92027595b 100644 --- a/xc/extras/Mesa/src/dd.h +++ b/xc/extras/Mesa/src/dd.h @@ -1,4 +1,4 @@ -/* $Id: dd.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: dd.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -659,6 +659,7 @@ struct dd_function_table { void (*Lightfv)(GLcontext *ctx, GLenum light, GLenum pname, const GLfloat *params, GLint nparams ); void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params); + void (*LogicOpcode)(GLcontext *ctx, GLenum opcode); void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode); void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h); void (*ShadeModel)(GLcontext *ctx, GLenum mode); diff --git a/xc/extras/Mesa/src/ddsample.c b/xc/extras/Mesa/src/ddsample.c index 06db5f1f4..f4af736f6 100644 --- a/xc/extras/Mesa/src/ddsample.c +++ b/xc/extras/Mesa/src/ddsample.c @@ -1,4 +1,4 @@ -/* $Id: ddsample.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: ddsample.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/debug_xform.c b/xc/extras/Mesa/src/debug_xform.c index 53dcad634..0792f7a88 100644 --- a/xc/extras/Mesa/src/debug_xform.c +++ b/xc/extras/Mesa/src/debug_xform.c @@ -1,4 +1,4 @@ -/* $Id: debug_xform.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: debug_xform.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/debug_xform.h b/xc/extras/Mesa/src/debug_xform.h index 42a79807b..f0bf4dba6 100644 --- a/xc/extras/Mesa/src/debug_xform.h +++ b/xc/extras/Mesa/src/debug_xform.h @@ -1,4 +1,4 @@ -/* $Id: debug_xform.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: debug_xform.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/depth.c b/xc/extras/Mesa/src/depth.c index 4b467e074..71de246b1 100644 --- a/xc/extras/Mesa/src/depth.c +++ b/xc/extras/Mesa/src/depth.c @@ -1,4 +1,4 @@ -/* $Id: depth.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: depth.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/depth.h b/xc/extras/Mesa/src/depth.h index bca5f3535..e23d7d99d 100644 --- a/xc/extras/Mesa/src/depth.h +++ b/xc/extras/Mesa/src/depth.h @@ -1,5 +1,5 @@ -/* $Id: depth.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: depth.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c index 33a3dc11e..c5849ddc1 100644 --- a/xc/extras/Mesa/src/dlist.c +++ b/xc/extras/Mesa/src/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: dlist.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dlist.h b/xc/extras/Mesa/src/dlist.h index a9856d6fb..6d7445285 100644 --- a/xc/extras/Mesa/src/dlist.h +++ b/xc/extras/Mesa/src/dlist.h @@ -1,4 +1,4 @@ -/* $Id: dlist.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: dlist.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dotprod_tmp.h b/xc/extras/Mesa/src/dotprod_tmp.h index 4c7c3f225..581de51c7 100644 --- a/xc/extras/Mesa/src/dotprod_tmp.h +++ b/xc/extras/Mesa/src/dotprod_tmp.h @@ -1,4 +1,4 @@ -/* $Id: dotprod_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: dotprod_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/drawpix.c b/xc/extras/Mesa/src/drawpix.c index 5959d76a2..7f76d1f17 100644 --- a/xc/extras/Mesa/src/drawpix.c +++ b/xc/extras/Mesa/src/drawpix.c @@ -1,4 +1,4 @@ -/* $Id: drawpix.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: drawpix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/drawpix.h b/xc/extras/Mesa/src/drawpix.h index 1d080ffbf..4d4c74c83 100644 --- a/xc/extras/Mesa/src/drawpix.h +++ b/xc/extras/Mesa/src/drawpix.h @@ -1,4 +1,4 @@ -/* $Id: drawpix.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: drawpix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enable.c b/xc/extras/Mesa/src/enable.c index 8ae55aa3b..84065cb5c 100644 --- a/xc/extras/Mesa/src/enable.c +++ b/xc/extras/Mesa/src/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enable.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enable.h b/xc/extras/Mesa/src/enable.h index 16330369c..cd3875436 100644 --- a/xc/extras/Mesa/src/enable.h +++ b/xc/extras/Mesa/src/enable.h @@ -1,4 +1,4 @@ -/* $Id: enable.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enable.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enums.c b/xc/extras/Mesa/src/enums.c index 7059d72da..7a3466ec3 100644 --- a/xc/extras/Mesa/src/enums.c +++ b/xc/extras/Mesa/src/enums.c @@ -1,4 +1,4 @@ -/* $Id: enums.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enums.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enums.h b/xc/extras/Mesa/src/enums.h index 2c07cdf83..41017d7be 100644 --- a/xc/extras/Mesa/src/enums.h +++ b/xc/extras/Mesa/src/enums.h @@ -1,4 +1,4 @@ -/* $Id: enums.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enums.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/eval.c b/xc/extras/Mesa/src/eval.c index 5e8220d6c..b4a83045b 100644 --- a/xc/extras/Mesa/src/eval.c +++ b/xc/extras/Mesa/src/eval.c @@ -1,4 +1,4 @@ -/* $Id: eval.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: eval.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/eval.h b/xc/extras/Mesa/src/eval.h index 893e3fd96..d7b0e6c3a 100644 --- a/xc/extras/Mesa/src/eval.h +++ b/xc/extras/Mesa/src/eval.h @@ -1,4 +1,4 @@ -/* $Id: eval.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: eval.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/extensions.c b/xc/extras/Mesa/src/extensions.c index 4a0d5db40..812b0b225 100644 --- a/xc/extras/Mesa/src/extensions.c +++ b/xc/extras/Mesa/src/extensions.c @@ -1,4 +1,4 @@ -/* $Id: extensions.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: extensions.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -61,7 +61,7 @@ static struct { int enabled; const char *name; } default_extensions[] = { { DEFAULT_ON, "GL_EXT_texture3D" }, { ALWAYS_ENABLED, "GL_MESA_window_pos" }, { ALWAYS_ENABLED, "GL_MESA_resize_buffers" }, - { ALWAYS_ENABLED, "GL_EXT_shared_texture_palette" }, + { DEFAULT_ON, "GL_EXT_shared_texture_palette" }, { ALWAYS_ENABLED, "GL_EXT_rescale_normal" }, { ALWAYS_ENABLED, "GL_EXT_abgr" }, { ALWAYS_ENABLED, "GL_SGIS_texture_edge_clamp" }, @@ -71,8 +71,13 @@ static struct { int enabled; const char *name; } default_extensions[] = { { ALWAYS_ENABLED, "GL_NV_texgen_reflection" }, { DEFAULT_ON, "GL_PGI_misc_hints" }, { DEFAULT_ON, "GL_EXT_compiled_vertex_array" }, - { DEFAULT_OFF, "GL_EXT_vertex_array_set" }, { DEFAULT_ON, "GL_EXT_clip_volume_hint" }, + + /* These obviously won't make it before 3.3: + */ + { DEFAULT_OFF, "GL_EXT_vertex_array_set" }, + { DEFAULT_OFF, "GL_EXT_texture_env" }, + { DEFAULT_OFF, "GL_EXT_fog_coord" }, }; @@ -235,43 +240,409 @@ void (*gl_get_proc_address( const GLubyte *procName ))() gl_function address; }; static struct proc procTable[] = { + /* OpenGL 1.0 functions */ + { "glAccum", (gl_function) glAccum }, + { "glAlphaFunc", (gl_function) glAlphaFunc }, + { "glBegin", (gl_function) glBegin }, + { "glBitmap", (gl_function) glBitmap }, + { "glAccum", (gl_function) glAccum }, + { "glAlphaFunc", (gl_function) glAlphaFunc }, + { "glBegin", (gl_function) glBegin }, + { "glBitmap", (gl_function) glBitmap }, + { "glBlendFunc", (gl_function) glBlendFunc }, + { "glCallList", (gl_function) glCallList }, + { "glCallLists", (gl_function) glCallLists }, + { "glClear", (gl_function) glClear }, + { "glClearAccum", (gl_function) glClearAccum }, + { "glClearColor", (gl_function) glClearColor }, + { "glClearDepth", (gl_function) glClearDepth }, + { "glClearIndex", (gl_function) glClearIndex }, + { "glClearStencil", (gl_function) glClearStencil }, + { "glClipPlane", (gl_function) glClipPlane }, + { "glColor3b", (gl_function) glColor3b }, + { "glColor3bv", (gl_function) glColor3bv }, + { "glColor3d", (gl_function) glColor3d }, + { "glColor3dv", (gl_function) glColor3dv }, + { "glColor3f", (gl_function) glColor3f }, + { "glColor3fv", (gl_function) glColor3fv }, + { "glColor3i", (gl_function) glColor3i }, + { "glColor3iv", (gl_function) glColor3iv }, + { "glColor3s", (gl_function) glColor3s }, + { "glColor3sv", (gl_function) glColor3sv }, + { "glColor3ub", (gl_function) glColor3ub }, + { "glColor3ubv", (gl_function) glColor3ubv }, + { "glColor3ui", (gl_function) glColor3ui }, + { "glColor3uiv", (gl_function) glColor3uiv }, + { "glColor3us", (gl_function) glColor3us }, + { "glColor3usv", (gl_function) glColor3usv }, + { "glColor4b", (gl_function) glColor4b }, + { "glColor4bv", (gl_function) glColor4bv }, + { "glColor4d", (gl_function) glColor4d }, + { "glColor4dv", (gl_function) glColor4dv }, + { "glColor4f", (gl_function) glColor4f }, + { "glColor4fv", (gl_function) glColor4fv }, + { "glColor4i", (gl_function) glColor4i }, + { "glColor4iv", (gl_function) glColor4iv }, + { "glColor4s", (gl_function) glColor4s }, + { "glColor4sv", (gl_function) glColor4sv }, + { "glColor4ub", (gl_function) glColor4ub }, + { "glColor4ubv", (gl_function) glColor4ubv }, + { "glColor4ui", (gl_function) glColor4ui }, + { "glColor4uiv", (gl_function) glColor4uiv }, + { "glColor4us", (gl_function) glColor4us }, + { "glColor4usv", (gl_function) glColor4usv }, + { "glColorMask", (gl_function) glColorMask }, + { "glColorMaterial", (gl_function) glColorMaterial }, + { "glCopyPixels", (gl_function) glCopyPixels }, + { "glCullFace", (gl_function) glCullFace }, + { "glDeleteLists", (gl_function) glDeleteLists }, + { "glDepthFunc", (gl_function) glDepthFunc }, + { "glDepthMask", (gl_function) glDepthMask }, + { "glDepthRange", (gl_function) glDepthRange }, + { "glDisable", (gl_function) glDisable }, + { "glDrawBuffer", (gl_function) glDrawBuffer }, + { "glDrawPixels", (gl_function) glDrawPixels }, + { "glEdgeFlag", (gl_function) glEdgeFlag }, + { "glEdgeFlagv", (gl_function) glEdgeFlagv }, + { "glEnable", (gl_function) glEnable }, + { "glEnd", (gl_function) glEnd }, + { "glEndList", (gl_function) glEndList }, + { "glEvalCoord1d", (gl_function) glEvalCoord1d }, + { "glEvalCoord1dv", (gl_function) glEvalCoord1dv }, + { "glEvalCoord1f", (gl_function) glEvalCoord1f }, + { "glEvalCoord1fv", (gl_function) glEvalCoord1fv }, + { "glEvalCoord2d", (gl_function) glEvalCoord2d }, + { "glEvalCoord2dv", (gl_function) glEvalCoord2dv }, + { "glEvalCoord2f", (gl_function) glEvalCoord2f }, + { "glEvalCoord2fv", (gl_function) glEvalCoord2fv }, + { "glEvalMesh1", (gl_function) glEvalMesh1 }, + { "glEvalMesh2", (gl_function) glEvalMesh2 }, + { "glEvalPoint1", (gl_function) glEvalPoint1 }, + { "glEvalPoint2", (gl_function) glEvalPoint2 }, + { "glFeedbackBuffer", (gl_function) glFeedbackBuffer }, + { "glFinish", (gl_function) glFinish }, + { "glFlush", (gl_function) glFlush }, + { "glFogf", (gl_function) glFogf }, + { "glFogfv", (gl_function) glFogfv }, + { "glFogi", (gl_function) glFogi }, + { "glFogiv", (gl_function) glFogiv }, + { "glFrontFace", (gl_function) glFrontFace }, + { "glFrustum", (gl_function) glFrustum }, + { "glGenLists", (gl_function) glGenLists }, + { "glGetBooleanv", (gl_function) glGetBooleanv }, + { "glGetClipPlane", (gl_function) glGetClipPlane }, + { "glGetDoublev", (gl_function) glGetDoublev }, + { "glGetError", (gl_function) glGetError }, + { "glGetFloatv", (gl_function) glGetFloatv }, + { "glGetIntegerv", (gl_function) glGetIntegerv }, + { "glGetLightfv", (gl_function) glGetLightfv }, + { "glGetLightiv", (gl_function) glGetLightiv }, + { "glGetMapdv", (gl_function) glGetMapdv }, + { "glGetMapfv", (gl_function) glGetMapfv }, + { "glGetMapiv", (gl_function) glGetMapiv }, + { "glGetMaterialfv", (gl_function) glGetMaterialfv }, + { "glGetMaterialiv", (gl_function) glGetMaterialiv }, + { "glGetPixelMapfv", (gl_function) glGetPixelMapfv }, + { "glGetPixelMapuiv", (gl_function) glGetPixelMapuiv }, + { "glGetPixelMapusv", (gl_function) glGetPixelMapusv }, + { "glGetPolygonStipple", (gl_function) glGetPolygonStipple }, + { "glGetString", (gl_function) glGetString }, + { "glGetTexEnvfv", (gl_function) glGetTexEnvfv }, + { "glGetTexEnviv", (gl_function) glGetTexEnviv }, + { "glGetTexGendv", (gl_function) glGetTexGendv }, + { "glGetTexGenfv", (gl_function) glGetTexGenfv }, + { "glGetTexGeniv", (gl_function) glGetTexGeniv }, + { "glGetTexImage", (gl_function) glGetTexImage }, + { "glGetTexLevelParameterfv", (gl_function) glGetTexLevelParameterfv }, + { "glGetTexLevelParameteriv", (gl_function) glGetTexLevelParameteriv }, + { "glGetTexParameterfv", (gl_function) glGetTexParameterfv }, + { "glGetTexParameteriv", (gl_function) glGetTexParameteriv }, + { "glHint", (gl_function) glHint }, + { "glIndexMask", (gl_function) glIndexMask }, + { "glIndexd", (gl_function) glIndexd }, + { "glIndexdv", (gl_function) glIndexdv }, + { "glIndexf", (gl_function) glIndexf }, + { "glIndexfv", (gl_function) glIndexfv }, + { "glIndexi", (gl_function) glIndexi }, + { "glIndexiv", (gl_function) glIndexiv }, + { "glIndexs", (gl_function) glIndexs }, + { "glIndexsv", (gl_function) glIndexsv }, + { "glInitNames", (gl_function) glInitNames }, + { "glIsEnabled", (gl_function) glIsEnabled }, + { "glIsList", (gl_function) glIsList }, + { "glLightModelf", (gl_function) glLightModelf }, + { "glLightModelfv", (gl_function) glLightModelfv }, + { "glLightModeli", (gl_function) glLightModeli }, + { "glLightModeliv", (gl_function) glLightModeliv }, + { "glLightf", (gl_function) glLightf }, + { "glLightfv", (gl_function) glLightfv }, + { "glLighti", (gl_function) glLighti }, + { "glLightiv", (gl_function) glLightiv }, + { "glLineStipple", (gl_function) glLineStipple }, + { "glLineWidth", (gl_function) glLineWidth }, + { "glListBase", (gl_function) glListBase }, + { "glLoadIdentity", (gl_function) glLoadIdentity }, + { "glLoadMatrixd", (gl_function) glLoadMatrixd }, + { "glLoadMatrixf", (gl_function) glLoadMatrixf }, + { "glLoadName", (gl_function) glLoadName }, + { "glLogicOp", (gl_function) glLogicOp }, + { "glMap1d", (gl_function) glMap1d }, + { "glMap1f", (gl_function) glMap1f }, + { "glMap2d", (gl_function) glMap2d }, + { "glMap2f", (gl_function) glMap2f }, + { "glMapGrid1d", (gl_function) glMapGrid1d }, + { "glMapGrid1f", (gl_function) glMapGrid1f }, + { "glMapGrid2d", (gl_function) glMapGrid2d }, + { "glMapGrid2f", (gl_function) glMapGrid2f }, + { "glMaterialf", (gl_function) glMaterialf }, + { "glMaterialfv", (gl_function) glMaterialfv }, + { "glMateriali", (gl_function) glMateriali }, + { "glMaterialiv", (gl_function) glMaterialiv }, + { "glMatrixMode", (gl_function) glMatrixMode }, + { "glMultMatrixd", (gl_function) glMultMatrixd }, + { "glMultMatrixf", (gl_function) glMultMatrixf }, + { "glNewList", (gl_function) glNewList }, + { "glNormal3b", (gl_function) glNormal3b }, + { "glNormal3bv", (gl_function) glNormal3bv }, + { "glNormal3d", (gl_function) glNormal3d }, + { "glNormal3dv", (gl_function) glNormal3dv }, + { "glNormal3f", (gl_function) glNormal3f }, + { "glNormal3fv", (gl_function) glNormal3fv }, + { "glNormal3i", (gl_function) glNormal3i }, + { "glNormal3iv", (gl_function) glNormal3iv }, + { "glNormal3s", (gl_function) glNormal3s }, + { "glNormal3sv", (gl_function) glNormal3sv }, + { "glOrtho", (gl_function) glOrtho }, + { "glPassThrough", (gl_function) glPassThrough }, + { "glPixelMapfv", (gl_function) glPixelMapfv }, + { "glPixelMapuiv", (gl_function) glPixelMapuiv }, + { "glPixelMapusv", (gl_function) glPixelMapusv }, + { "glPixelStoref", (gl_function) glPixelStoref }, + { "glPixelStorei", (gl_function) glPixelStorei }, + { "glPixelTransferf", (gl_function) glPixelTransferf }, + { "glPixelTransferi", (gl_function) glPixelTransferi }, + { "glPixelZoom", (gl_function) glPixelZoom }, + { "glPointSize", (gl_function) glPointSize }, + { "glPolygonMode", (gl_function) glPolygonMode }, + { "glPolygonOffset", (gl_function) glPolygonOffset }, + { "glPolygonStipple", (gl_function) glPolygonStipple }, + { "glPopAttrib", (gl_function) glPopAttrib }, + { "glPopMatrix", (gl_function) glPopMatrix }, + { "glPopName", (gl_function) glPopName }, + { "glPushAttrib", (gl_function) glPushAttrib }, + { "glPushMatrix", (gl_function) glPushMatrix }, + { "glPushName", (gl_function) glPushName }, + { "glRasterPos2d", (gl_function) glRasterPos2d }, + { "glRasterPos2dv", (gl_function) glRasterPos2dv }, + { "glRasterPos2f", (gl_function) glRasterPos2f }, + { "glRasterPos2fv", (gl_function) glRasterPos2fv }, + { "glRasterPos2i", (gl_function) glRasterPos2i }, + { "glRasterPos2iv", (gl_function) glRasterPos2iv }, + { "glRasterPos2s", (gl_function) glRasterPos2s }, + { "glRasterPos2sv", (gl_function) glRasterPos2sv }, + { "glRasterPos3d", (gl_function) glRasterPos3d }, + { "glRasterPos3dv", (gl_function) glRasterPos3dv }, + { "glRasterPos3f", (gl_function) glRasterPos3f }, + { "glRasterPos3fv", (gl_function) glRasterPos3fv }, + { "glRasterPos3i", (gl_function) glRasterPos3i }, + { "glRasterPos3iv", (gl_function) glRasterPos3iv }, + { "glRasterPos3s", (gl_function) glRasterPos3s }, + { "glRasterPos3sv", (gl_function) glRasterPos3sv }, + { "glRasterPos4d", (gl_function) glRasterPos4d }, + { "glRasterPos4dv", (gl_function) glRasterPos4dv }, + { "glRasterPos4f", (gl_function) glRasterPos4f }, + { "glRasterPos4fv", (gl_function) glRasterPos4fv }, + { "glRasterPos4i", (gl_function) glRasterPos4i }, + { "glRasterPos4iv", (gl_function) glRasterPos4iv }, + { "glRasterPos4s", (gl_function) glRasterPos4s }, + { "glRasterPos4sv", (gl_function) glRasterPos4sv }, + { "glReadBuffer", (gl_function) glReadBuffer }, + { "glReadPixels", (gl_function) glReadPixels }, + { "glRectd", (gl_function) glRectd }, + { "glRectdv", (gl_function) glRectdv }, + { "glRectf", (gl_function) glRectf }, + { "glRectfv", (gl_function) glRectfv }, + { "glRecti", (gl_function) glRecti }, + { "glRectiv", (gl_function) glRectiv }, + { "glRects", (gl_function) glRects }, + { "glRectsv", (gl_function) glRectsv }, + { "glRenderMode", (gl_function) glRenderMode }, + { "glRotated", (gl_function) glRotated }, + { "glRotatef", (gl_function) glRotatef }, + { "glScaled", (gl_function) glScaled }, + { "glScalef", (gl_function) glScalef }, + { "glScissor", (gl_function) glScissor }, + { "glSelectBuffer", (gl_function) glSelectBuffer }, + { "glShadeModel", (gl_function) glShadeModel }, + { "glStencilFunc", (gl_function) glStencilFunc }, + { "glStencilMask", (gl_function) glStencilMask }, + { "glStencilOp", (gl_function) glStencilOp }, + { "glTexCoord1d", (gl_function) glTexCoord1d }, + { "glTexCoord1dv", (gl_function) glTexCoord1dv }, + { "glTexCoord1f", (gl_function) glTexCoord1f }, + { "glTexCoord1fv", (gl_function) glTexCoord1fv }, + { "glTexCoord1i", (gl_function) glTexCoord1i }, + { "glTexCoord1iv", (gl_function) glTexCoord1iv }, + { "glTexCoord1s", (gl_function) glTexCoord1s }, + { "glTexCoord1sv", (gl_function) glTexCoord1sv }, + { "glTexCoord2d", (gl_function) glTexCoord2d }, + { "glTexCoord2dv", (gl_function) glTexCoord2dv }, + { "glTexCoord2f", (gl_function) glTexCoord2f }, + { "glTexCoord2fv", (gl_function) glTexCoord2fv }, + { "glTexCoord2i", (gl_function) glTexCoord2i }, + { "glTexCoord2iv", (gl_function) glTexCoord2iv }, + { "glTexCoord2s", (gl_function) glTexCoord2s }, + { "glTexCoord2sv", (gl_function) glTexCoord2sv }, + { "glTexCoord3d", (gl_function) glTexCoord3d }, + { "glTexCoord3dv", (gl_function) glTexCoord3dv }, + { "glTexCoord3f", (gl_function) glTexCoord3f }, + { "glTexCoord3fv", (gl_function) glTexCoord3fv }, + { "glTexCoord3i", (gl_function) glTexCoord3i }, + { "glTexCoord3iv", (gl_function) glTexCoord3iv }, + { "glTexCoord3s", (gl_function) glTexCoord3s }, + { "glTexCoord3sv", (gl_function) glTexCoord3sv }, + { "glTexCoord4d", (gl_function) glTexCoord4d }, + { "glTexCoord4dv", (gl_function) glTexCoord4dv }, + { "glTexCoord4f", (gl_function) glTexCoord4f }, + { "glTexCoord4fv", (gl_function) glTexCoord4fv }, + { "glTexCoord4i", (gl_function) glTexCoord4i }, + { "glTexCoord4iv", (gl_function) glTexCoord4iv }, + { "glTexCoord4s", (gl_function) glTexCoord4s }, + { "glTexCoord4sv", (gl_function) glTexCoord4sv }, + { "glTexEnvf", (gl_function) glTexEnvf }, + { "glTexEnvfv", (gl_function) glTexEnvfv }, + { "glTexEnvi", (gl_function) glTexEnvi }, + { "glTexEnviv", (gl_function) glTexEnviv }, + { "glTexGend", (gl_function) glTexGend }, + { "glTexGendv", (gl_function) glTexGendv }, + { "glTexGenf", (gl_function) glTexGenf }, + { "glTexGenfv", (gl_function) glTexGenfv }, + { "glTexGeni", (gl_function) glTexGeni }, + { "glTexGeniv", (gl_function) glTexGeniv }, + { "glTexImage1D", (gl_function) glTexImage1D }, + { "glTexImage2D", (gl_function) glTexImage2D }, + { "glTexParameterf", (gl_function) glTexParameterf }, + { "glTexParameterfv", (gl_function) glTexParameterfv }, + { "glTexParameteri", (gl_function) glTexParameteri }, + { "glTexParameteriv", (gl_function) glTexParameteriv }, + { "glTranslated", (gl_function) glTranslated }, + { "glTranslatef", (gl_function) glTranslatef }, + { "glVertex2d", (gl_function) glVertex2d }, + { "glVertex2dv", (gl_function) glVertex2dv }, + { "glVertex2f", (gl_function) glVertex2f }, + { "glVertex2fv", (gl_function) glVertex2fv }, + { "glVertex2i", (gl_function) glVertex2i }, + { "glVertex2iv", (gl_function) glVertex2iv }, + { "glVertex2s", (gl_function) glVertex2s }, + { "glVertex2sv", (gl_function) glVertex2sv }, + { "glVertex3d", (gl_function) glVertex3d }, + { "glVertex3dv", (gl_function) glVertex3dv }, + { "glVertex3f", (gl_function) glVertex3f }, + { "glVertex3fv", (gl_function) glVertex3fv }, + { "glVertex3i", (gl_function) glVertex3i }, + { "glVertex3iv", (gl_function) glVertex3iv }, + { "glVertex3s", (gl_function) glVertex3s }, + { "glVertex3sv", (gl_function) glVertex3sv }, + { "glVertex4d", (gl_function) glVertex4d }, + { "glVertex4dv", (gl_function) glVertex4dv }, + { "glVertex4f", (gl_function) glVertex4f }, + { "glVertex4fv", (gl_function) glVertex4fv }, + { "glVertex4i", (gl_function) glVertex4i }, + { "glVertex4iv", (gl_function) glVertex4iv }, + { "glVertex4s", (gl_function) glVertex4s }, + { "glVertex4sv", (gl_function) glVertex4sv }, + { "glViewport", (gl_function) glViewport }, + /* OpenGL 1.1 functions */ - { "glEnableClientState", (gl_function) glEnableClientState }, - { "glDisableClientState", (gl_function) glDisableClientState }, - { "glPushClientAttrib", (gl_function) glPushClientAttrib }, - { "glPopClientAttrib", (gl_function) glPopClientAttrib }, - { "glIndexub", (gl_function) glIndexub }, - { "glIndexubv", (gl_function) glIndexubv }, - { "glVertexPointer", (gl_function) glVertexPointer }, - { "glNormalPointer", (gl_function) glNormalPointer }, - { "glColorPointer", (gl_function) glColorPointer }, - { "glIndexPointer", (gl_function) glIndexPointer }, - { "glTexCoordPointer", (gl_function) glTexCoordPointer }, - { "glEdgeFlagPointer", (gl_function) glEdgeFlagPointer }, - { "glGetPointerv", (gl_function) glGetPointerv }, + { "glAreTexturesResident", (gl_function) glAreTexturesResident }, { "glArrayElement", (gl_function) glArrayElement }, + { "glBindTexture", (gl_function) glBindTexture }, + { "glColorPointer", (gl_function) glColorPointer }, + { "glCopyTexImage1D", (gl_function) glCopyTexImage1D }, + { "glCopyTexImage2D", (gl_function) glCopyTexImage2D }, + { "glCopyTexSubImage1D", (gl_function) glCopyTexSubImage1D }, + { "glCopyTexSubImage2D", (gl_function) glCopyTexSubImage2D }, + { "glDeleteTextures", (gl_function) glDeleteTextures }, + { "glDisableClientState", (gl_function) glDisableClientState }, { "glDrawArrays", (gl_function) glDrawArrays }, { "glDrawElements", (gl_function) glDrawElements }, - { "glInterleavedArrays", (gl_function) glInterleavedArrays }, + { "glEdgeFlagPointer", (gl_function) glEdgeFlagPointer }, + { "glEnableClientState", (gl_function) glEnableClientState }, { "glGenTextures", (gl_function) glGenTextures }, - { "glDeleteTextures", (gl_function) glDeleteTextures }, - { "glBindTexture", (gl_function) glBindTexture }, - { "glPrioritizeTextures", (gl_function) glPrioritizeTextures }, - { "glAreTexturesResident", (gl_function) glAreTexturesResident }, + { "glGetPointerv", (gl_function) glGetPointerv }, + { "glIndexPointer", (gl_function) glIndexPointer }, + { "glIndexub", (gl_function) glIndexub }, + { "glIndexubv", (gl_function) glIndexubv }, + { "glInterleavedArrays", (gl_function) glInterleavedArrays }, { "glIsTexture", (gl_function) glIsTexture }, + { "glNormalPointer", (gl_function) glNormalPointer }, + { "glPopClientAttrib", (gl_function) glPopClientAttrib }, + { "glPrioritizeTextures", (gl_function) glPrioritizeTextures }, + { "glPushClientAttrib", (gl_function) glPushClientAttrib }, + { "glTexCoordPointer", (gl_function) glTexCoordPointer }, { "glTexSubImage1D", (gl_function) glTexSubImage1D }, { "glTexSubImage2D", (gl_function) glTexSubImage2D }, - { "glCopyTexImage1D", (gl_function) glCopyTexImage1D }, - { "glCopyTexImage2D", (gl_function) glCopyTexImage2D }, - { "glCopyTexSubImage1D", (gl_function) glCopyTexSubImage1D }, - { "glCopyTexSubImage2D", (gl_function) glCopyTexSubImage2D }, + { "glVertexPointer", (gl_function) glVertexPointer }, /* OpenGL 1.2 functions */ + { "glCopyTexSubImage3D", (gl_function) glCopyTexSubImage3D }, { "glDrawRangeElements", (gl_function) glDrawRangeElements }, { "glTexImage3D", (gl_function) glTexImage3D }, { "glTexSubImage3D", (gl_function) glTexSubImage3D }, - { "glCopyTexSubImage3D", (gl_function) glCopyTexSubImage3D }, - /* NOTE: 1.2 imaging subset functions not implemented in Mesa */ + + /* ARB_imaging functions */ + { "glBlendColor", (gl_function) glBlendColor }, + { "glBlendEquation", (gl_function) glBlendEquation }, + { "glColorSubTable", (gl_function) glColorSubTable }, + { "glColorTable", (gl_function) glColorTable }, + { "glColorTableParameterfv", (gl_function) glColorTableParameterfv }, + { "glColorTableParameteriv", (gl_function) glColorTableParameteriv }, + { "glConvolutionFilter1D", (gl_function) glConvolutionFilter1D }, + { "glConvolutionFilter2D", (gl_function) glConvolutionFilter2D }, + { "glConvolutionParameterf", (gl_function) glConvolutionParameterf }, + { "glConvolutionParameterfv", (gl_function) glConvolutionParameterfv }, + { "glConvolutionParameteri", (gl_function) glConvolutionParameteri }, + { "glConvolutionParameteriv", (gl_function) glConvolutionParameteriv }, + { "glCopyColorSubTable", (gl_function) glCopyColorSubTable }, + { "glCopyColorTable", (gl_function) glCopyColorTable }, + { "glCopyConvolutionFilter1D", (gl_function) glCopyConvolutionFilter1D }, + { "glCopyConvolutionFilter2D", (gl_function) glCopyConvolutionFilter2D }, + { "glGetColorTable", (gl_function) glGetColorTable }, + { "glGetColorTableParameterfv", (gl_function) glGetColorTableParameterfv }, + { "glGetColorTableParameteriv", (gl_function) glGetColorTableParameteriv }, + { "glGetConvolutionFilter", (gl_function) glGetConvolutionFilter }, + { "glGetConvolutionParameterfv", (gl_function) glGetConvolutionParameterfv }, + { "glGetConvolutionParameteriv", (gl_function) glGetConvolutionParameteriv }, + { "glGetHistogram", (gl_function) glGetHistogram }, + { "glGetHistogramParameterfv", (gl_function) glGetHistogramParameterfv }, + { "glGetHistogramParameteriv", (gl_function) glGetHistogramParameteriv }, + { "glGetMinmax", (gl_function) glGetMinmax }, + { "glGetMinmaxParameterfv", (gl_function) glGetMinmaxParameterfv }, + { "glGetMinmaxParameteriv", (gl_function) glGetMinmaxParameteriv }, + { "glGetSeparableFilter", (gl_function) glGetSeparableFilter }, + { "glHistogram", (gl_function) glHistogram }, + { "glMinmax", (gl_function) glMinmax }, + { "glResetHistogram", (gl_function) glResetHistogram }, + { "glResetMinmax", (gl_function) glResetMinmax }, + { "glSeparableFilter2D", (gl_function) glSeparableFilter2D }, + + /* GL_EXT_paletted_texture */ + { "glColorTableEXT", (gl_function) glColorTableEXT }, + { "glColorSubTableEXT", (gl_function) glColorSubTableEXT }, + { "glGetColorTableEXT", (gl_function) glGetColorTableEXT }, + { "glGetColorTableParameterfvEXT", (gl_function) glGetColorTableParameterfvEXT }, + { "glGetColorTableParameterivEXT", (gl_function) glGetColorTableParameterivEXT }, + + /* GL_EXT_compiled_vertex_array */ + { "glLockArraysEXT", (gl_function) glLockArraysEXT }, + { "glUnlockArraysEXT", (gl_function) glUnlockArraysEXT }, + + /* GL_EXT_point_parameters */ + { "glPointParameterfEXT", (gl_function) glPointParameterfEXT }, + { "glPointParameterfvEXT", (gl_function) glPointParameterfvEXT }, + + /* GL_EXT_polygon_offset */ + { "glPolygonOffsetEXT", (gl_function) glPolygonOffsetEXT }, /* GL_EXT_blend_minmax */ { "glBlendEquationEXT", (gl_function) glBlendEquationEXT }, @@ -279,9 +650,6 @@ void (*gl_get_proc_address( const GLubyte *procName ))() /* GL_EXT_blend_color */ { "glBlendColorEXT", (gl_function) glBlendColorEXT }, - /* GL_EXT_polygon_offset */ - { "glPolygonOffsetEXT", (gl_function) glPolygonOffsetEXT }, - /* GL_EXT_vertex_arrays */ { "glVertexPointerEXT", (gl_function) glVertexPointerEXT }, { "glNormalPointerEXT", (gl_function) glNormalPointerEXT }, @@ -306,13 +674,6 @@ void (*gl_get_proc_address( const GLubyte *procName ))() { "glTexSubImage3DEXT", (gl_function) glTexSubImage3DEXT }, { "glCopyTexSubImage3DEXT", (gl_function) glCopyTexSubImage3DEXT }, - /* GL_EXT_paletted_texture */ - { "glColorTableEXT", (gl_function) glColorTableEXT }, - { "glColorSubTableEXT", (gl_function) glColorSubTableEXT }, - { "glGetColorTableEXT", (gl_function) glGetColorTableEXT }, - { "glGetColorTableParameterfvEXT", (gl_function) glGetColorTableParameterfvEXT }, - { "glGetColorTableParameterivEXT", (gl_function) glGetColorTableParameterivEXT }, - /* GL_ARB_multitexture */ { "glActiveTextureARB", (gl_function) glActiveTextureARB }, { "glClientActiveTextureARB", (gl_function) glClientActiveTextureARB }, @@ -349,10 +710,6 @@ void (*gl_get_proc_address( const GLubyte *procName ))() { "glMultiTexCoord4sARB", (gl_function) glMultiTexCoord4sARB }, { "glMultiTexCoord4svARB", (gl_function) glMultiTexCoord4svARB }, - /* GL_EXT_point_parameters */ - { "glPointParameterfEXT", (gl_function) glPointParameterfEXT }, - { "glPointParameterfvEXT", (gl_function) glPointParameterfvEXT }, - /* GL_INGR_blend_func_separate */ { "glBlendFuncSeparateINGR", (gl_function) glBlendFuncSeparateINGR }, diff --git a/xc/extras/Mesa/src/extensions.h b/xc/extras/Mesa/src/extensions.h index a25156c0a..cea505c1a 100644 --- a/xc/extras/Mesa/src/extensions.h +++ b/xc/extras/Mesa/src/extensions.h @@ -1,4 +1,4 @@ -/* $Id: extensions.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: extensions.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/feedback.c b/xc/extras/Mesa/src/feedback.c index abf19b5b7..ff39a4be0 100644 --- a/xc/extras/Mesa/src/feedback.c +++ b/xc/extras/Mesa/src/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: feedback.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/feedback.h b/xc/extras/Mesa/src/feedback.h index 6369e5cf8..70929dc9f 100644 --- a/xc/extras/Mesa/src/feedback.h +++ b/xc/extras/Mesa/src/feedback.h @@ -1,4 +1,4 @@ -/* $Id: feedback.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: feedback.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fixed.h b/xc/extras/Mesa/src/fixed.h index 385493b4c..d23183c2a 100644 --- a/xc/extras/Mesa/src/fixed.h +++ b/xc/extras/Mesa/src/fixed.h @@ -1,4 +1,4 @@ -/* $Id: fixed.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fixed.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c index cce3fbeed..85cdb8134 100644 --- a/xc/extras/Mesa/src/fog.c +++ b/xc/extras/Mesa/src/fog.c @@ -1,4 +1,4 @@ -/* $Id: fog.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fog.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog.h b/xc/extras/Mesa/src/fog.h index b7fd91777..24dbf57c0 100644 --- a/xc/extras/Mesa/src/fog.h +++ b/xc/extras/Mesa/src/fog.h @@ -1,4 +1,4 @@ -/* $Id: fog.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fog.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog_tmp.h b/xc/extras/Mesa/src/fog_tmp.h index 0d5c5db62..9fbb0e106 100644 --- a/xc/extras/Mesa/src/fog_tmp.h +++ b/xc/extras/Mesa/src/fog_tmp.h @@ -1,4 +1,4 @@ -/* $Id: fog_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fog_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/general_clip.h b/xc/extras/Mesa/src/general_clip.h index 349abf2de..995842608 100644 --- a/xc/extras/Mesa/src/general_clip.h +++ b/xc/extras/Mesa/src/general_clip.h @@ -1,4 +1,4 @@ -/* $Id: general_clip.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: general_clip.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/get.c b/xc/extras/Mesa/src/get.c index 153e32a87..2d1c55598 100644 --- a/xc/extras/Mesa/src/get.c +++ b/xc/extras/Mesa/src/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: get.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/get.h b/xc/extras/Mesa/src/get.h index e87955334..7738a2183 100644 --- a/xc/extras/Mesa/src/get.h +++ b/xc/extras/Mesa/src/get.h @@ -1,4 +1,4 @@ -/* $Id: get.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: get.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glmisc.c b/xc/extras/Mesa/src/glmisc.c index 5c2517ef7..0e0e81e2b 100644 --- a/xc/extras/Mesa/src/glmisc.c +++ b/xc/extras/Mesa/src/glmisc.c @@ -1,4 +1,4 @@ -/* $Id: glmisc.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: glmisc.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glmisc.h b/xc/extras/Mesa/src/glmisc.h index fa3f2d213..ef57f3c20 100644 --- a/xc/extras/Mesa/src/glmisc.h +++ b/xc/extras/Mesa/src/glmisc.h @@ -1,4 +1,4 @@ -/* $Id: glmisc.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: glmisc.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hash.c b/xc/extras/Mesa/src/hash.c index 90373b5c2..99f52dbc6 100644 --- a/xc/extras/Mesa/src/hash.c +++ b/xc/extras/Mesa/src/hash.c @@ -1,4 +1,4 @@ -/* $Id: hash.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: hash.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hash.h b/xc/extras/Mesa/src/hash.h index 164f3cadc..de1ad408d 100644 --- a/xc/extras/Mesa/src/hash.h +++ b/xc/extras/Mesa/src/hash.h @@ -1,4 +1,4 @@ -/* $Id: hash.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: hash.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/highpc.c b/xc/extras/Mesa/src/highpc.c index b3fb4ca1d..e856847dc 100644 --- a/xc/extras/Mesa/src/highpc.c +++ b/xc/extras/Mesa/src/highpc.c @@ -1,4 +1,4 @@ -/* $Id: highpc.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: highpc.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/image.c b/xc/extras/Mesa/src/image.c index d95c881df..b6e3198c8 100644 --- a/xc/extras/Mesa/src/image.c +++ b/xc/extras/Mesa/src/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: image.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/image.h b/xc/extras/Mesa/src/image.h index e5efd04fa..a47bab970 100644 --- a/xc/extras/Mesa/src/image.h +++ b/xc/extras/Mesa/src/image.h @@ -1,4 +1,4 @@ -/* $Id: image.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: image.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/indirect_tmp.h b/xc/extras/Mesa/src/indirect_tmp.h index 066986ced..89c085cb6 100644 --- a/xc/extras/Mesa/src/indirect_tmp.h +++ b/xc/extras/Mesa/src/indirect_tmp.h @@ -1,4 +1,4 @@ -/* $Id: indirect_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: indirect_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/interp_tmp.h b/xc/extras/Mesa/src/interp_tmp.h index ee4137efa..d8321950d 100644 --- a/xc/extras/Mesa/src/interp_tmp.h +++ b/xc/extras/Mesa/src/interp_tmp.h @@ -1,4 +1,4 @@ -/* $Id: interp_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: interp_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/light.c b/xc/extras/Mesa/src/light.c index a23291df0..0e7631968 100644 --- a/xc/extras/Mesa/src/light.c +++ b/xc/extras/Mesa/src/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: light.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/light.h b/xc/extras/Mesa/src/light.h index 9725da290..ef2999670 100644 --- a/xc/extras/Mesa/src/light.h +++ b/xc/extras/Mesa/src/light.h @@ -1,4 +1,4 @@ -/* $Id: light.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: light.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lines.c b/xc/extras/Mesa/src/lines.c index e34164d0e..4abeede62 100644 --- a/xc/extras/Mesa/src/lines.c +++ b/xc/extras/Mesa/src/lines.c @@ -1,4 +1,4 @@ -/* $Id: lines.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lines.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lines.h b/xc/extras/Mesa/src/lines.h index 42cb513ea..570e5ff0c 100644 --- a/xc/extras/Mesa/src/lines.h +++ b/xc/extras/Mesa/src/lines.h @@ -1,4 +1,4 @@ -/* $Id: lines.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lines.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/linetemp.h b/xc/extras/Mesa/src/linetemp.h index c0a53f9a8..83d6b1615 100644 --- a/xc/extras/Mesa/src/linetemp.h +++ b/xc/extras/Mesa/src/linetemp.h @@ -1,4 +1,4 @@ -/* $Id: linetemp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: linetemp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lnaatemp.h b/xc/extras/Mesa/src/lnaatemp.h index 251a240d2..1fab71128 100644 --- a/xc/extras/Mesa/src/lnaatemp.h +++ b/xc/extras/Mesa/src/lnaatemp.h @@ -1,4 +1,4 @@ -/* $Id: lnaatemp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lnaatemp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/logic.c b/xc/extras/Mesa/src/logic.c index 20f524fe9..dcf4e73fd 100644 --- a/xc/extras/Mesa/src/logic.c +++ b/xc/extras/Mesa/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: logic.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -74,6 +74,9 @@ void gl_LogicOp( GLcontext *ctx, GLenum opcode ) gl_error( ctx, GL_INVALID_ENUM, "glLogicOp" ); return; } + + if (ctx->Driver.LogicOpcode) + ctx->Driver.LogicOpcode( ctx, opcode ); } diff --git a/xc/extras/Mesa/src/logic.h b/xc/extras/Mesa/src/logic.h index 425804d8b..415c127b0 100644 --- a/xc/extras/Mesa/src/logic.h +++ b/xc/extras/Mesa/src/logic.h @@ -1,4 +1,4 @@ -/* $Id: logic.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: logic.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lowpc.c b/xc/extras/Mesa/src/lowpc.c index c333b9aeb..39d84a45e 100644 --- a/xc/extras/Mesa/src/lowpc.c +++ b/xc/extras/Mesa/src/lowpc.c @@ -1,4 +1,4 @@ -/* $Id: lowpc.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lowpc.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/macros.h b/xc/extras/Mesa/src/macros.h index ddf1fca80..fa7ff081e 100644 --- a/xc/extras/Mesa/src/macros.h +++ b/xc/extras/Mesa/src/macros.h @@ -1,4 +1,4 @@ -/* $Id: macros.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: macros.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/masking.c b/xc/extras/Mesa/src/masking.c index e707c82b6..33bb282bd 100644 --- a/xc/extras/Mesa/src/masking.c +++ b/xc/extras/Mesa/src/masking.c @@ -1,4 +1,4 @@ -/* $Id: masking.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: masking.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/masking.h b/xc/extras/Mesa/src/masking.h index a0c455b46..a340c1ef4 100644 --- a/xc/extras/Mesa/src/masking.h +++ b/xc/extras/Mesa/src/masking.h @@ -1,4 +1,4 @@ -/* $Id: masking.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: masking.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/matrix.c b/xc/extras/Mesa/src/matrix.c index 837528764..3cf98c415 100644 --- a/xc/extras/Mesa/src/matrix.c +++ b/xc/extras/Mesa/src/matrix.c @@ -1,4 +1,4 @@ -/* $Id: matrix.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: matrix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/matrix.h b/xc/extras/Mesa/src/matrix.h index 77dcd64e8..158ce53b0 100644 --- a/xc/extras/Mesa/src/matrix.h +++ b/xc/extras/Mesa/src/matrix.h @@ -1,4 +1,4 @@ -/* $Id: matrix.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: matrix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mmath.c b/xc/extras/Mesa/src/mmath.c index e47fc371d..537655494 100644 --- a/xc/extras/Mesa/src/mmath.c +++ b/xc/extras/Mesa/src/mmath.c @@ -1,4 +1,4 @@ -/* $Id: mmath.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mmath.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h index 5b27b0f3c..44037716b 100644 --- a/xc/extras/Mesa/src/mmath.h +++ b/xc/extras/Mesa/src/mmath.h @@ -1,4 +1,4 @@ -/* $Id: mmath.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mmath.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mthreads.c b/xc/extras/Mesa/src/mthreads.c index 8c101d707..f038e0599 100644 --- a/xc/extras/Mesa/src/mthreads.c +++ b/xc/extras/Mesa/src/mthreads.c @@ -1,4 +1,4 @@ -/* $Id: mthreads.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mthreads.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mthreads.h b/xc/extras/Mesa/src/mthreads.h index 3a5d997dd..aeddf2efa 100644 --- a/xc/extras/Mesa/src/mthreads.h +++ b/xc/extras/Mesa/src/mthreads.h @@ -1,4 +1,4 @@ -/* $Id: mthreads.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mthreads.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/norm_tmp.h b/xc/extras/Mesa/src/norm_tmp.h index 3ac9926f0..48c926e4a 100644 --- a/xc/extras/Mesa/src/norm_tmp.h +++ b/xc/extras/Mesa/src/norm_tmp.h @@ -1,4 +1,4 @@ -/* $Id: norm_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: norm_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pb.c b/xc/extras/Mesa/src/pb.c index d956b8555..ae7736f3d 100644 --- a/xc/extras/Mesa/src/pb.c +++ b/xc/extras/Mesa/src/pb.c @@ -1,4 +1,4 @@ -/* $Id: pb.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pb.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pb.h b/xc/extras/Mesa/src/pb.h index 84ad6a969..4d2b65de0 100644 --- a/xc/extras/Mesa/src/pb.h +++ b/xc/extras/Mesa/src/pb.h @@ -1,4 +1,4 @@ -/* $Id: pb.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pb.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pipeline.c b/xc/extras/Mesa/src/pipeline.c index 46d389056..3d0d5ef1e 100644 --- a/xc/extras/Mesa/src/pipeline.c +++ b/xc/extras/Mesa/src/pipeline.c @@ -1,4 +1,4 @@ -/* $Id: pipeline.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pipeline.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -54,7 +54,7 @@ #ifndef MESA_VERBOSE int MESA_VERBOSE = 0 /* | VERBOSE_PIPELINE */ - | VERBOSE_IMMEDIATE +/* | VERBOSE_IMMEDIATE */ /* | VERBOSE_VARRAY */ /* | VERBOSE_TEXTURE */ /* | VERBOSE_API */ @@ -62,6 +62,7 @@ int MESA_VERBOSE = 0 /* | VERBOSE_STATE */ /* | VERBOSE_CULL */ /* | VERBOSE_DISPLAY_LIST */ +/* | VERBOSE_LIGHTING */ ; #endif diff --git a/xc/extras/Mesa/src/pipeline.h b/xc/extras/Mesa/src/pipeline.h index b385b8688..15478195e 100644 --- a/xc/extras/Mesa/src/pipeline.h +++ b/xc/extras/Mesa/src/pipeline.h @@ -1,4 +1,4 @@ -/* $Id: pipeline.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pipeline.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pixel.c b/xc/extras/Mesa/src/pixel.c index 0e3771a24..f06e40677 100644 --- a/xc/extras/Mesa/src/pixel.c +++ b/xc/extras/Mesa/src/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pixel.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pixel.h b/xc/extras/Mesa/src/pixel.h index b658bb37b..b6c6e116a 100644 --- a/xc/extras/Mesa/src/pixel.h +++ b/xc/extras/Mesa/src/pixel.h @@ -1,4 +1,4 @@ -/* $Id: pixel.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pixel.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pointers.c b/xc/extras/Mesa/src/pointers.c index e71268dfe..ef72b7a84 100644 --- a/xc/extras/Mesa/src/pointers.c +++ b/xc/extras/Mesa/src/pointers.c @@ -1,4 +1,4 @@ -/* $Id: pointers.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pointers.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pointers.h b/xc/extras/Mesa/src/pointers.h index b3ed6f533..c34da6aa4 100644 --- a/xc/extras/Mesa/src/pointers.h +++ b/xc/extras/Mesa/src/pointers.h @@ -1,4 +1,4 @@ -/* $Id: pointers.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pointers.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/points.c b/xc/extras/Mesa/src/points.c index ebe00f15e..4334be44c 100644 --- a/xc/extras/Mesa/src/points.c +++ b/xc/extras/Mesa/src/points.c @@ -1,4 +1,4 @@ -/* $Id: points.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: points.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/points.h b/xc/extras/Mesa/src/points.h index 8ef94f4fb..0232471ce 100644 --- a/xc/extras/Mesa/src/points.h +++ b/xc/extras/Mesa/src/points.h @@ -1,4 +1,4 @@ -/* $Id: points.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: points.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/polygon.c b/xc/extras/Mesa/src/polygon.c index 205d8dd44..1a48d82b2 100644 --- a/xc/extras/Mesa/src/polygon.c +++ b/xc/extras/Mesa/src/polygon.c @@ -1,4 +1,4 @@ -/* $Id: polygon.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: polygon.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/polygon.h b/xc/extras/Mesa/src/polygon.h index 9b2fba6e4..d26628ef4 100644 --- a/xc/extras/Mesa/src/polygon.h +++ b/xc/extras/Mesa/src/polygon.h @@ -1,4 +1,4 @@ -/* $Id: polygon.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: polygon.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/quads.c b/xc/extras/Mesa/src/quads.c index e23bfd479..9d1c2142d 100644 --- a/xc/extras/Mesa/src/quads.c +++ b/xc/extras/Mesa/src/quads.c @@ -1,4 +1,4 @@ -/* $Id: quads.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: quads.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/quads.h b/xc/extras/Mesa/src/quads.h index 71781ac95..fc0474c63 100644 --- a/xc/extras/Mesa/src/quads.h +++ b/xc/extras/Mesa/src/quads.h @@ -1,4 +1,4 @@ -/* $Id: quads.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: quads.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rastpos.c b/xc/extras/Mesa/src/rastpos.c index a68009feb..fd8f58431 100644 --- a/xc/extras/Mesa/src/rastpos.c +++ b/xc/extras/Mesa/src/rastpos.c @@ -1,4 +1,4 @@ -/* $Id: rastpos.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rastpos.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rastpos.h b/xc/extras/Mesa/src/rastpos.h index 98b4c4678..061c303ef 100644 --- a/xc/extras/Mesa/src/rastpos.h +++ b/xc/extras/Mesa/src/rastpos.h @@ -1,4 +1,4 @@ -/* $Id: rastpos.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rastpos.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/readpix.c b/xc/extras/Mesa/src/readpix.c index 9809e81a2..1d676d1aa 100644 --- a/xc/extras/Mesa/src/readpix.c +++ b/xc/extras/Mesa/src/readpix.c @@ -1,4 +1,4 @@ -/* $Id: readpix.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: readpix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/readpix.h b/xc/extras/Mesa/src/readpix.h index 6e5fed2a1..ec1d8e9ad 100644 --- a/xc/extras/Mesa/src/readpix.h +++ b/xc/extras/Mesa/src/readpix.h @@ -1,4 +1,4 @@ -/* $Id: readpix.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: readpix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rect.c b/xc/extras/Mesa/src/rect.c index a79f22a10..41e9058a5 100644 --- a/xc/extras/Mesa/src/rect.c +++ b/xc/extras/Mesa/src/rect.c @@ -1,4 +1,4 @@ -/* $Id: rect.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rect.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rect.h b/xc/extras/Mesa/src/rect.h index 63d2b20f3..a0345e22a 100644 --- a/xc/extras/Mesa/src/rect.h +++ b/xc/extras/Mesa/src/rect.h @@ -1,4 +1,4 @@ -/* $Id: rect.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rect.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/render_tmp.h b/xc/extras/Mesa/src/render_tmp.h index f550e018f..90ebad1e7 100644 --- a/xc/extras/Mesa/src/render_tmp.h +++ b/xc/extras/Mesa/src/render_tmp.h @@ -1,4 +1,4 @@ -/* $Id: render_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: render_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/scissor.c b/xc/extras/Mesa/src/scissor.c index 19865fd38..161e4deaa 100644 --- a/xc/extras/Mesa/src/scissor.c +++ b/xc/extras/Mesa/src/scissor.c @@ -1,4 +1,4 @@ -/* $Id: scissor.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: scissor.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/scissor.h b/xc/extras/Mesa/src/scissor.h index 95b50ad92..f537d2758 100644 --- a/xc/extras/Mesa/src/scissor.h +++ b/xc/extras/Mesa/src/scissor.h @@ -1,4 +1,4 @@ -/* $Id: scissor.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: scissor.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/shade.c b/xc/extras/Mesa/src/shade.c index fdcfbf943..b853efd02 100644 --- a/xc/extras/Mesa/src/shade.c +++ b/xc/extras/Mesa/src/shade.c @@ -1,4 +1,4 @@ -/* $Id: shade.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: shade.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/shade.h b/xc/extras/Mesa/src/shade.h index d68d72bda..c5f4ddcdd 100644 --- a/xc/extras/Mesa/src/shade.h +++ b/xc/extras/Mesa/src/shade.h @@ -1,4 +1,4 @@ -/* $Id: shade.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: shade.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/shade_tmp.h b/xc/extras/Mesa/src/shade_tmp.h index 26c6b3612..62fba0f63 100644 --- a/xc/extras/Mesa/src/shade_tmp.h +++ b/xc/extras/Mesa/src/shade_tmp.h @@ -1,4 +1,4 @@ -/* $Id: shade_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: shade_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -554,8 +554,7 @@ static void TAG(shade_fast_rgba)( struct vertex_buffer *VB ) COPY_3V(sum[0], base[0]); if (NR_SIDES == 2) COPY_3V(sum[1], base[1]); - if (0) -/* if (ctx->Light.ShadeModel == GL_SMOOTH) */ + if (MESA_VERBOSE&VERBOSE_LIGHTING) fprintf(stderr, "light normal %d/%d, %f %f %f\n", j, VB->Start, normal[0], normal[1], normal[2]); diff --git a/xc/extras/Mesa/src/simple_list.h b/xc/extras/Mesa/src/simple_list.h index 5bb00846a..828853035 100644 --- a/xc/extras/Mesa/src/simple_list.h +++ b/xc/extras/Mesa/src/simple_list.h @@ -1,4 +1,4 @@ -/* $Id: simple_list.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: simple_list.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/span.c b/xc/extras/Mesa/src/span.c index 022b7c3c7..ef10bb3a9 100644 --- a/xc/extras/Mesa/src/span.c +++ b/xc/extras/Mesa/src/span.c @@ -1,4 +1,4 @@ -/* $Id: span.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: span.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/span.h b/xc/extras/Mesa/src/span.h index be731a435..9a6116f67 100644 --- a/xc/extras/Mesa/src/span.h +++ b/xc/extras/Mesa/src/span.h @@ -1,4 +1,4 @@ -/* $Id: span.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: span.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stages.c b/xc/extras/Mesa/src/stages.c index 737b0e13a..04d51a187 100644 --- a/xc/extras/Mesa/src/stages.c +++ b/xc/extras/Mesa/src/stages.c @@ -1,4 +1,4 @@ -/* $Id: stages.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stages.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -709,7 +709,7 @@ CONST struct gl_pipeline_stage gl_default_pipeline[] = { PIPE_OP_NORM_XFORM, PIPE_PRECALC|PIPE_IMMEDIATE, 0, - NEW_LIGHTING|NEW_FOG|NEW_TEXTURING, /* state change (recheck) */ + NEW_LIGHTING|NEW_FOG|NEW_TEXTURING|NEW_NORMAL_TRANSFORM, /* state change (recheck) */ NEW_NORMAL_TRANSFORM, /* cva state change (recalc) */ 0, 0, DYN_STATE, @@ -788,8 +788,8 @@ CONST struct gl_pipeline_stage gl_default_pipeline[] = { PIPE_OP_RAST_SETUP_0|PIPE_OP_RAST_SETUP_1, PIPE_PRECALC|PIPE_IMMEDIATE, 0, - NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON, - NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON, + NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON|NEW_TEXTURE_ENV, + NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON|NEW_TEXTURE_ENV, 0, 0, DYN_STATE, check_full_setup, diff --git a/xc/extras/Mesa/src/stages.h b/xc/extras/Mesa/src/stages.h index 6e3ec4744..ca47647ac 100644 --- a/xc/extras/Mesa/src/stages.h +++ b/xc/extras/Mesa/src/stages.h @@ -1,4 +1,4 @@ -/* $Id: stages.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stages.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stencil.c b/xc/extras/Mesa/src/stencil.c index d7d942721..bf65801df 100644 --- a/xc/extras/Mesa/src/stencil.c +++ b/xc/extras/Mesa/src/stencil.c @@ -1,4 +1,4 @@ -/* $Id: stencil.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stencil.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stencil.h b/xc/extras/Mesa/src/stencil.h index ccb6b9810..375a65723 100644 --- a/xc/extras/Mesa/src/stencil.h +++ b/xc/extras/Mesa/src/stencil.h @@ -1,4 +1,4 @@ -/* $Id: stencil.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stencil.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texgen_tmp.h b/xc/extras/Mesa/src/texgen_tmp.h index e96da6569..fed7ce0b9 100644 --- a/xc/extras/Mesa/src/texgen_tmp.h +++ b/xc/extras/Mesa/src/texgen_tmp.h @@ -1,4 +1,4 @@ -/* $Id: texgen_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texgen_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/teximage.c b/xc/extras/Mesa/src/teximage.c index 4e965b790..a1637b8e0 100644 --- a/xc/extras/Mesa/src/teximage.c +++ b/xc/extras/Mesa/src/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: teximage.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/teximage.h b/xc/extras/Mesa/src/teximage.h index bd9fb02e0..c5cd58bbf 100644 --- a/xc/extras/Mesa/src/teximage.h +++ b/xc/extras/Mesa/src/teximage.h @@ -1,4 +1,4 @@ -/* $Id: teximage.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: teximage.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texobj.c b/xc/extras/Mesa/src/texobj.c index 484ad8ded..f9e9e6d2b 100644 --- a/xc/extras/Mesa/src/texobj.c +++ b/xc/extras/Mesa/src/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texobj.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texobj.h b/xc/extras/Mesa/src/texobj.h index f87fbc3c7..e06354a08 100644 --- a/xc/extras/Mesa/src/texobj.h +++ b/xc/extras/Mesa/src/texobj.h @@ -1,4 +1,4 @@ -/* $Id: texobj.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texobj.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstate.c b/xc/extras/Mesa/src/texstate.c index ac85cb68f..9369fae39 100644 --- a/xc/extras/Mesa/src/texstate.c +++ b/xc/extras/Mesa/src/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texstate.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstate.h b/xc/extras/Mesa/src/texstate.h index dd65245da..39c506e85 100644 --- a/xc/extras/Mesa/src/texstate.h +++ b/xc/extras/Mesa/src/texstate.h @@ -1,4 +1,4 @@ -/* $Id: texstate.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texstate.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texture.c b/xc/extras/Mesa/src/texture.c index 0d686da89..a20e091b6 100644 --- a/xc/extras/Mesa/src/texture.c +++ b/xc/extras/Mesa/src/texture.c @@ -1,4 +1,4 @@ -/* $Id: texture.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texture.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texture.h b/xc/extras/Mesa/src/texture.h index 481c73950..25a1aa9d7 100644 --- a/xc/extras/Mesa/src/texture.h +++ b/xc/extras/Mesa/src/texture.h @@ -1,4 +1,4 @@ -/* $Id: texture.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texture.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/trans_tmp.h b/xc/extras/Mesa/src/trans_tmp.h index a75cf8234..28a43c9d9 100644 --- a/xc/extras/Mesa/src/trans_tmp.h +++ b/xc/extras/Mesa/src/trans_tmp.h @@ -1,4 +1,4 @@ -/* $Id: trans_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: trans_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/translate.c b/xc/extras/Mesa/src/translate.c index 3cf841dc8..97b4f4ad4 100644 --- a/xc/extras/Mesa/src/translate.c +++ b/xc/extras/Mesa/src/translate.c @@ -1,4 +1,4 @@ -/* $Id: translate.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: translate.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/translate.h b/xc/extras/Mesa/src/translate.h index d3f99df41..46df91afd 100644 --- a/xc/extras/Mesa/src/translate.h +++ b/xc/extras/Mesa/src/translate.h @@ -1,4 +1,4 @@ -/* $Id: translate.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: translate.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/triangle.c b/xc/extras/Mesa/src/triangle.c index d51d460ab..11f084929 100644 --- a/xc/extras/Mesa/src/triangle.c +++ b/xc/extras/Mesa/src/triangle.c @@ -1,4 +1,4 @@ -/* $Id: triangle.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: triangle.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/triangle.h b/xc/extras/Mesa/src/triangle.h index 9c13529af..19da2ceeb 100644 --- a/xc/extras/Mesa/src/triangle.h +++ b/xc/extras/Mesa/src/triangle.h @@ -1,4 +1,4 @@ -/* $Id: triangle.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: triangle.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tritemp.h b/xc/extras/Mesa/src/tritemp.h index 84df60add..4f46ba02f 100644 --- a/xc/extras/Mesa/src/tritemp.h +++ b/xc/extras/Mesa/src/tritemp.h @@ -1,4 +1,4 @@ -/* $Id: tritemp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: tritemp.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/types.h b/xc/extras/Mesa/src/types.h index f0ffa2443..ff9f93d2c 100644 --- a/xc/extras/Mesa/src/types.h +++ b/xc/extras/Mesa/src/types.h @@ -1,5 +1,5 @@ /* -*- mode: C; tab-width:8; c-basic-offset:8 -*- */ -/* $Id: types.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: types.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -2089,7 +2089,8 @@ enum _verbose { VERBOSE_API = 0x40, VERBOSE_TRIANGLE_CHECKS = 0x80, VERBOSE_CULL = 0x100, - VERBOSE_DISPLAY_LIST = 0x200 + VERBOSE_DISPLAY_LIST = 0x200, + VERBOSE_LIGHTING = 0x400, }; diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c index 5aaa07aad..b73c89e61 100644 --- a/xc/extras/Mesa/src/varray.c +++ b/xc/extras/Mesa/src/varray.c @@ -1,4 +1,4 @@ -/* $Id: varray.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: varray.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/varray.h b/xc/extras/Mesa/src/varray.h index 391b3e471..a04adb309 100644 --- a/xc/extras/Mesa/src/varray.h +++ b/xc/extras/Mesa/src/varray.h @@ -1,4 +1,4 @@ -/* $Id: varray.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: varray.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vb.c b/xc/extras/Mesa/src/vb.c index a370e7e23..932bcf243 100644 --- a/xc/extras/Mesa/src/vb.c +++ b/xc/extras/Mesa/src/vb.c @@ -1,4 +1,4 @@ -/* $Id: vb.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vb.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vb.h b/xc/extras/Mesa/src/vb.h index cb05d6d7d..f7d73d4d7 100644 --- a/xc/extras/Mesa/src/vb.h +++ b/xc/extras/Mesa/src/vb.h @@ -1,4 +1,4 @@ -/* $Id: vb.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vb.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbcull.c b/xc/extras/Mesa/src/vbcull.c index 97e2c970e..605dbf8f2 100644 --- a/xc/extras/Mesa/src/vbcull.c +++ b/xc/extras/Mesa/src/vbcull.c @@ -1,4 +1,4 @@ -/* $Id: vbcull.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbcull.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbcull.h b/xc/extras/Mesa/src/vbcull.h index 0b4a18fac..0ac1e00c3 100644 --- a/xc/extras/Mesa/src/vbcull.h +++ b/xc/extras/Mesa/src/vbcull.h @@ -1,4 +1,4 @@ -/* $Id: vbcull.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbcull.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbfill.c b/xc/extras/Mesa/src/vbfill.c index 8e8e72563..af8801b4d 100644 --- a/xc/extras/Mesa/src/vbfill.c +++ b/xc/extras/Mesa/src/vbfill.c @@ -1,4 +1,4 @@ -/* $Id: vbfill.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbfill.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbfill.h b/xc/extras/Mesa/src/vbfill.h index 9a71438f9..0b837eaf6 100644 --- a/xc/extras/Mesa/src/vbfill.h +++ b/xc/extras/Mesa/src/vbfill.h @@ -1,4 +1,4 @@ -/* $Id: vbfill.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbfill.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbindirect.c b/xc/extras/Mesa/src/vbindirect.c index 169f9eee8..f0f693946 100644 --- a/xc/extras/Mesa/src/vbindirect.c +++ b/xc/extras/Mesa/src/vbindirect.c @@ -1,4 +1,4 @@ -/* $Id: vbindirect.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbindirect.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbindirect.h b/xc/extras/Mesa/src/vbindirect.h index 182040bc0..c361c1091 100644 --- a/xc/extras/Mesa/src/vbindirect.h +++ b/xc/extras/Mesa/src/vbindirect.h @@ -1,4 +1,4 @@ -/* $Id: vbindirect.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbindirect.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbrender.c b/xc/extras/Mesa/src/vbrender.c index 7f028af26..ef7cdca4c 100644 --- a/xc/extras/Mesa/src/vbrender.c +++ b/xc/extras/Mesa/src/vbrender.c @@ -1,4 +1,4 @@ -/* $Id: vbrender.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbrender.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -450,7 +450,7 @@ do { \ GLuint vlist[VB_SIZE]; \ GLubyte *eflag = VB->EdgeFlagPtr->data; \ GLuint *stipplecounter = &VB->ctx->StippleCounter; \ - (void) vlist; (void) eflag; + (void) vlist; (void) eflag; (void) stipplecounter; #define TAG(x) x##_cull #define INIT(x) FLUSH_PRIM(x) @@ -489,7 +489,7 @@ do { \ GLcontext *ctx = VB->ctx; \ GLubyte *eflag = VB->EdgeFlagPtr->data; \ GLuint *stipplecounter = &VB->ctx->StippleCounter; \ - (void) eflag; + (void) eflag; (void) stipplecounter; #define INIT(x) FLUSH_PRIM(x); #define RESET_STIPPLE *stipplecounter = 0 @@ -527,7 +527,7 @@ do { \ GLcontext *ctx = VB->ctx; \ GLubyte *eflag = VB->EdgeFlagPtr->data; \ GLuint *stipplecounter = &VB->ctx->StippleCounter; \ - (void) eflag; + (void) eflag; (void) stipplecounter; #define INIT(x) FLUSH_PRIM(x); #define TAG(x) x##_clipped diff --git a/xc/extras/Mesa/src/vbrender.h b/xc/extras/Mesa/src/vbrender.h index e2d53b874..37f9297d4 100644 --- a/xc/extras/Mesa/src/vbrender.h +++ b/xc/extras/Mesa/src/vbrender.h @@ -1,4 +1,4 @@ -/* $Id: vbrender.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbrender.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbxform.c b/xc/extras/Mesa/src/vbxform.c index 7e5eb332c..6bd11e5f5 100644 --- a/xc/extras/Mesa/src/vbxform.c +++ b/xc/extras/Mesa/src/vbxform.c @@ -1,4 +1,4 @@ -/* $Id: vbxform.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbxform.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -540,10 +540,8 @@ void gl_fixup_input( GLcontext *ctx, struct immediate *IM ) if (MESA_VERBOSE&VERBOSE_IMMEDIATE) gl_print_vert_flags("copy from current", copy); - if (copy & VERT_NORM) { - IM->Flag[start] |= VERT_NORM; + if (copy & VERT_NORM) COPY_3V( IM->Normal[start], ctx->Current.Normal ); - } if (copy & VERT_RGBA) COPY_4UBV( IM->Color[start], ctx->Current.ByteColor); @@ -604,10 +602,17 @@ void gl_fixup_input( GLcontext *ctx, struct immediate *IM ) } if (fixup & VERT_NORM) { - if (IM->OrFlag & VERT_NORM) + /* Only eval cannot use the Flag member to find valid normals: + */ + if (IM->OrFlag & VERT_EVAL_ANY) fixup_3f( IM->Normal, IM->Flag, start, VERT_NORM ); - else if (!(IM->Flag[IM->LastData] & VERT_NORM)) - find_last_3f( IM->Normal, IM->Flag, VERT_NORM, IM->LastData ); + else { + /* Copy-to-current requires a valid normal in the last slot: + */ + if ((IM->OrFlag & VERT_NORM) && + !(IM->Flag[IM->LastData] & VERT_NORM)) + find_last_3f( IM->Normal, IM->Flag, VERT_NORM, IM->LastData ); + } } } diff --git a/xc/extras/Mesa/src/vbxform.h b/xc/extras/Mesa/src/vbxform.h index 4496ab4b7..d69f9f7ce 100644 --- a/xc/extras/Mesa/src/vbxform.h +++ b/xc/extras/Mesa/src/vbxform.h @@ -1,4 +1,4 @@ -/* $Id: vbxform.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbxform.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vector.c b/xc/extras/Mesa/src/vector.c index 26fcc7f90..9edbe37b7 100644 --- a/xc/extras/Mesa/src/vector.c +++ b/xc/extras/Mesa/src/vector.c @@ -1,4 +1,4 @@ -/* $Id: vector.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vector.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vector.h b/xc/extras/Mesa/src/vector.h index a9315bf5f..4b0dc0171 100644 --- a/xc/extras/Mesa/src/vector.h +++ b/xc/extras/Mesa/src/vector.h @@ -1,4 +1,4 @@ -/* $Id: vector.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vector.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vertices.c b/xc/extras/Mesa/src/vertices.c index 26596dff8..45786b658 100644 --- a/xc/extras/Mesa/src/vertices.c +++ b/xc/extras/Mesa/src/vertices.c @@ -1,4 +1,4 @@ -/* $Id: vertices.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vertices.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vertices.h b/xc/extras/Mesa/src/vertices.h index 4bc835d40..8c1299393 100644 --- a/xc/extras/Mesa/src/vertices.h +++ b/xc/extras/Mesa/src/vertices.h @@ -1,4 +1,4 @@ -/* $Id: vertices.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vertices.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/winpos.c b/xc/extras/Mesa/src/winpos.c index 7ca152e8a..4a3d7b62f 100644 --- a/xc/extras/Mesa/src/winpos.c +++ b/xc/extras/Mesa/src/winpos.c @@ -1,4 +1,4 @@ -/* $Id: winpos.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: winpos.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/winpos.h b/xc/extras/Mesa/src/winpos.h index fd2b1fe79..d9293511b 100644 --- a/xc/extras/Mesa/src/winpos.h +++ b/xc/extras/Mesa/src/winpos.h @@ -1,4 +1,4 @@ -/* $Id: winpos.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: winpos.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/xform.c b/xc/extras/Mesa/src/xform.c index 99f413231..83328db0b 100644 --- a/xc/extras/Mesa/src/xform.c +++ b/xc/extras/Mesa/src/xform.c @@ -1,4 +1,4 @@ -/* $Id: xform.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: xform.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/xform.h b/xc/extras/Mesa/src/xform.h index 26110f5c6..3e74e2826 100644 --- a/xc/extras/Mesa/src/xform.h +++ b/xc/extras/Mesa/src/xform.h @@ -1,4 +1,4 @@ -/* $Id: xform.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: xform.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/xform_tmp.h b/xc/extras/Mesa/src/xform_tmp.h index 9fad0f286..57d9f9345 100644 --- a/xc/extras/Mesa/src/xform_tmp.h +++ b/xc/extras/Mesa/src/xform_tmp.h @@ -1,4 +1,4 @@ -/* $Id: xform_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: xform_tmp.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/zoom.c b/xc/extras/Mesa/src/zoom.c index 6ff309d3b..ea732e215 100644 --- a/xc/extras/Mesa/src/zoom.c +++ b/xc/extras/Mesa/src/zoom.c @@ -1,4 +1,4 @@ -/* $Id: zoom.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: zoom.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/zoom.h b/xc/extras/Mesa/src/zoom.h index b4ae3a464..bb6761481 100644 --- a/xc/extras/Mesa/src/zoom.h +++ b/xc/extras/Mesa/src/zoom.h @@ -1,4 +1,4 @@ -/* $Id: zoom.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: zoom.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* |