From 485f04074151686fa24d40e3eeb83029d3d8c425 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 8 Oct 1999 09:27:09 +0000 Subject: Fixed includes & added a few hooks for the DRI. --- src/mesa/main/Makefile.DJ | 11 ++++-- src/mesa/main/Makefile.X11 | 4 +- src/mesa/main/accum.c | 8 +++- src/mesa/main/attrib.c | 8 +++- src/mesa/main/blend.c | 8 +++- src/mesa/main/clip.c | 7 +++- src/mesa/main/colortab.c | 6 ++- src/mesa/main/context.c | 8 +++- src/mesa/main/depth.c | 8 +++- src/mesa/main/depth.h | 3 +- src/mesa/main/dlist.c | 10 ++++- src/mesa/main/drawpix.c | 6 ++- src/mesa/main/enable.c | 10 ++++- src/mesa/main/eval.c | 94 ++++++++++++++++++++++++---------------------- src/mesa/main/extensions.c | 16 ++++---- src/mesa/main/extensions.h | 6 +-- src/mesa/main/feedback.c | 6 ++- src/mesa/main/fog.c | 8 +++- src/mesa/main/get.c | 11 ++++-- src/mesa/main/hash.c | 7 ++-- src/mesa/main/image.c | 6 ++- src/mesa/main/light.c | 10 +++-- src/mesa/main/lines.c | 6 ++- src/mesa/main/macros.h | 9 +++-- src/mesa/main/matrix.c | 8 +++- src/mesa/main/matrix.h | 6 ++- src/mesa/main/pixel.c | 6 ++- src/mesa/main/points.c | 13 +++++-- src/mesa/main/polygon.c | 8 +++- src/mesa/main/rastpos.c | 14 ++++--- src/mesa/main/stencil.c | 8 +++- src/mesa/main/teximage.c | 8 +++- src/mesa/main/texobj.c | 11 +++--- src/mesa/main/texstate.c | 9 +++-- src/mesa/main/varray.c | 11 +++++- src/mesa/main/varray.h | 7 +++- 36 files changed, 260 insertions(+), 125 deletions(-) (limited to 'src/mesa/main') diff --git a/src/mesa/main/Makefile.DJ b/src/mesa/main/Makefile.DJ index 27c3556ab9..73ffcf17c4 100644 --- a/src/mesa/main/Makefile.DJ +++ b/src/mesa/main/Makefile.DJ @@ -1,4 +1,4 @@ -# $Id: Makefile.DJ,v 1.1 1999/08/19 00:55:41 jtg Exp $ +# $Id: Makefile.DJ,v 1.2 1999/10/08 09:27:09 keithw Exp $ # Makefile for core library for MS-DOS using djgpp @@ -22,8 +22,11 @@ # $Log: Makefile.DJ,v $ -# Revision 1.1 1999/08/19 00:55:41 jtg -# Initial revision +# Revision 1.2 1999/10/08 09:27:09 keithw +# Fixed includes & added a few hooks for the DRI. +# +# Revision 1.1.1.1 1999/08/19 00:55:41 jtg +# Imported sources # # Revision 1.1 1999/01/01 14:35:09 brianp # Initial revision @@ -48,7 +51,7 @@ CORE_SOURCES = accum.c alpha.c alphabuf.c api1.c api2.c apiext.c attrib.c \ bitmap.c blend.c clip.c colortab.c context.c copypix.c depth.c \ dlist.c drawpix.c enable.c eval.c feedback.c fog.c \ get.c hash.c image.c light.c lines.c logic.c masking.c matrix.c \ - misc.c mmath.c mthreads.c pb.c pixel.c points.c pointers.c polygon.c \ + glmisc.c mmath.c mthreads.c pb.c pixel.c points.c pointers.c polygon.c \ quads.c rastpos.c readpix.c rect.c scissor.c shade.c span.c \ stencil.c teximage.c texobj.c texstate.c texture.c triangle.c \ varray.c winpos.c vb.c vbfill.c vbrender.c vbxform.c xform.c \ diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index 8fb680dad4..da5dc4549e 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.5 1999/09/17 12:07:10 brianp Exp $ +# $Id: Makefile.X11,v 1.6 1999/10/08 09:27:09 keithw Exp $ # Mesa 3-D graphics library # Version: 3.1 @@ -46,6 +46,7 @@ CORE_SOURCES = \ feedback.c \ fog.c \ get.c \ + glmisc.c \ hash.c \ image.c \ light.c \ @@ -53,7 +54,6 @@ CORE_SOURCES = \ logic.c \ masking.c \ matrix.c \ - misc.c \ mmath.c \ mthreads.c \ pb.c \ diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index 2043075838..2e4f7c8027 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -1,4 +1,4 @@ -/* $Id: accum.c,v 1.2 1999/08/19 11:54:28 brianp Exp $ */ +/* $Id: accum.c,v 1.3 1999/10/08 09:27:09 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,14 +25,18 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/accum.c,v 1.3 1999/04/04 00:20:17 dawes Exp $ */ #ifdef PC_HEADER #include "all.h" #else -#include +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "accum.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 80aee7b8c0..e0aeec8232 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1,4 +1,4 @@ -/* $Id: attrib.c,v 1.4 1999/09/19 23:43:02 keithw Exp $ */ +/* $Id: attrib.c,v 1.5 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,15 +31,19 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "attrib.h" #include "context.h" +#include "glmisc.h" #include "enable.h" #include "enums.h" #include "macros.h" -#include "misc.h" #include "simple_list.h" #include "texstate.h" #include "types.h" diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 6bf3581b8f..7e1037089f 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -1,4 +1,4 @@ -/* $Id: blend.c,v 1.3 1999/09/30 11:18:21 keithw Exp $ */ +/* $Id: blend.c,v 1.4 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -29,9 +29,13 @@ #ifdef PC_HEADER #include "all.h" #else +#include +#ifndef XFree86Server #include #include -#include +#else +#include "GL/xf86glx.h" +#endif #include "alphabuf.h" #include "blend.h" #include "context.h" diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c index 02b97aefa9..85cbd066ff 100644 --- a/src/mesa/main/clip.c +++ b/src/mesa/main/clip.c @@ -1,4 +1,4 @@ -/* $Id: clip.c,v 1.2 1999/09/18 20:41:22 keithw Exp $ */ +/* $Id: clip.c,v 1.3 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,9 +31,12 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include -#include +#else +#include "GL/xf86glx.h" +#endif #include "clip.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index 22d785ba51..7d167e1bea 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -1,4 +1,4 @@ -/* $Id: colortab.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: colortab.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -23,6 +23,7 @@ * 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. */ +/* $XFree86: xc/lib/GL/mesa/src/colortab.c,v 1.2 1999/04/04 00:20:21 dawes Exp $ */ @@ -31,6 +32,9 @@ #ifdef PC_HEADER #include "all.h" #else +#ifdef XFree86Server +#include "GL/xf86glx.h" +#endif #include "colortab.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d7f751dba5..47cba24ee5 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.9 1999/09/19 23:43:02 keithw Exp $ */ +/* $Id: context.c,v 1.10 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,6 +25,8 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/context.c,v 1.4 1999/04/04 00:20:21 dawes Exp $ */ + /* * If multi-threading is enabled (-DTHREADS) then each thread has it's * own rendering context. A thread obtains the pointer to its GLcontext @@ -38,11 +40,15 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "accum.h" #include "alphabuf.h" #include "api.h" diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c index 7fac718492..0dfab9aded 100644 --- a/src/mesa/main/depth.c +++ b/src/mesa/main/depth.c @@ -1,4 +1,4 @@ -/* $Id: depth.c,v 1.3 1999/09/19 23:43:02 keithw Exp $ */ +/* $Id: depth.c,v 1.4 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,6 +25,8 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/depth.c,v 1.3 1999/04/04 00:20:22 dawes Exp $ */ + /* * Depth buffer functions */ @@ -33,9 +35,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enums.h" #include "depth.h" diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h index 559afc64fb..86706ee214 100644 --- a/src/mesa/main/depth.h +++ b/src/mesa/main/depth.h @@ -1,4 +1,5 @@ -/* $Id: depth.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ + +/* $Id: depth.h,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 60547dc591..b1a4ed05e0 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.5 1999/09/20 14:30:22 keithw Exp $ */ +/* $Id: dlist.c,v 1.6 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,13 +25,19 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/dlist.c,v 1.3 1999/04/04 00:20:22 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "accum.h" #include "api.h" #include "alpha.h" @@ -52,6 +58,7 @@ #include "feedback.h" #include "fog.h" #include "get.h" +#include "glmisc.h" #include "hash.h" #include "image.h" #include "light.h" @@ -61,7 +68,6 @@ #include "macros.h" #include "masking.h" #include "matrix.h" -#include "misc.h" #include "pipeline.h" #include "pixel.h" #include "points.h" diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index edf524409a..02016d1515 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -1,4 +1,4 @@ -/* $Id: drawpix.c,v 1.2 1999/09/18 20:41:22 keithw Exp $ */ +/* $Id: drawpix.c,v 1.3 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,9 +31,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "drawpix.h" #include "feedback.h" diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index ac916d6a41..9de6fe578b 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.5 1999/09/18 20:41:23 keithw Exp $ */ +/* $Id: enable.c,v 1.6 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,11 +25,17 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/enable.c,v 1.3 1999/04/04 00:20:23 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else -#include +#ifndef XFree86Server #include +#include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enable.h" #include "light.h" diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index 74604a21c4..4d5b067ebe 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -1,4 +1,4 @@ -/* $Id: eval.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: eval.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -44,9 +44,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "eval.h" #include "macros.h" @@ -1988,7 +1992,7 @@ void gl_GetMapiv( GLcontext* ctx, GLenum target, GLenum query, GLint *v ) -void eval_points1( GLfloat outcoord[][4], +static void eval_points1( GLfloat outcoord[][4], GLfloat coord[][4], const GLuint *flags, GLfloat du, GLfloat u1 ) @@ -2003,7 +2007,7 @@ void eval_points1( GLfloat outcoord[][4], } } -void eval_points2( GLfloat outcoord[][4], +static void eval_points2( GLfloat outcoord[][4], GLfloat coord[][4], const GLuint *flags, GLfloat du, GLfloat u1, @@ -2030,11 +2034,11 @@ static const GLubyte dirty_flags[5] = { }; -GLvector4f *eval1_4f( GLvector4f *dest, - GLfloat coord[][4], - const GLuint *flags, - GLuint dimension, - struct gl_1d_map *map ) +static GLvector4f *eval1_4f( GLvector4f *dest, + GLfloat coord[][4], + const GLuint *flags, + GLuint dimension, + struct gl_1d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2055,10 +2059,10 @@ GLvector4f *eval1_4f( GLvector4f *dest, } -GLvector1ui *eval1_1ui( GLvector1ui *dest, - GLfloat coord[][4], - const GLuint *flags, - struct gl_1d_map *map ) +static GLvector1ui *eval1_1ui( GLvector1ui *dest, + GLfloat coord[][4], + const GLuint *flags, + struct gl_1d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2077,7 +2081,7 @@ GLvector1ui *eval1_1ui( GLvector1ui *dest, return dest; } -GLvector3f *eval1_norm( GLvector3f *dest, +static GLvector3f *eval1_norm( GLvector3f *dest, GLfloat coord[][4], GLuint *flags, /* not const */ struct gl_1d_map *map ) @@ -2098,7 +2102,7 @@ GLvector3f *eval1_norm( GLvector3f *dest, return dest; } -GLvector4ub *eval1_color( GLvector4ub *dest, +static GLvector4ub *eval1_color( GLvector4ub *dest, GLfloat coord[][4], GLuint *flags, /* not const */ struct gl_1d_map *map ) @@ -2124,12 +2128,12 @@ GLvector4ub *eval1_color( GLvector4ub *dest, -GLvector4f *eval2_obj_norm( GLvector4f *obj_ptr, - GLvector3f *norm_ptr, - GLfloat coord[][4], - GLuint *flags, - GLuint dimension, - struct gl_2d_map *map ) +static GLvector4f *eval2_obj_norm( GLvector4f *obj_ptr, + GLvector3f *norm_ptr, + GLfloat coord[][4], + GLuint *flags, + GLuint dimension, + struct gl_2d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2161,11 +2165,11 @@ GLvector4f *eval2_obj_norm( GLvector4f *obj_ptr, } -GLvector4f *eval2_4f( GLvector4f *dest, - GLfloat coord[][4], - const GLuint *flags, - GLuint dimension, - struct gl_2d_map *map ) +static GLvector4f *eval2_4f( GLvector4f *dest, + GLfloat coord[][4], + const GLuint *flags, + GLuint dimension, + struct gl_2d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2189,10 +2193,10 @@ GLvector4f *eval2_4f( GLvector4f *dest, } -GLvector3f *eval2_norm( GLvector3f *dest, - GLfloat coord[][4], - GLuint *flags, - struct gl_2d_map *map ) +static GLvector3f *eval2_norm( GLvector3f *dest, + GLfloat coord[][4], + GLuint *flags, + struct gl_2d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2215,10 +2219,10 @@ GLvector3f *eval2_norm( GLvector3f *dest, } -GLvector1ui *eval2_1ui( GLvector1ui *dest, - GLfloat coord[][4], - const GLuint *flags, - struct gl_2d_map *map ) +static GLvector1ui *eval2_1ui( GLvector1ui *dest, + GLfloat coord[][4], + const GLuint *flags, + struct gl_2d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2244,10 +2248,10 @@ GLvector1ui *eval2_1ui( GLvector1ui *dest, -GLvector4ub *eval2_color( GLvector4ub *dest, - GLfloat coord[][4], - GLuint *flags, - struct gl_2d_map *map ) +static GLvector4ub *eval2_color( GLvector4ub *dest, + GLfloat coord[][4], + GLuint *flags, + struct gl_2d_map *map ) { const GLfloat u1 = map->u1; const GLfloat du = map->du; @@ -2272,8 +2276,8 @@ GLvector4ub *eval2_color( GLvector4ub *dest, } -GLvector4f *copy_4f( GLvector4f *out, CONST GLvector4f *in, - const GLuint *flags) +static GLvector4f *copy_4f( GLvector4f *out, CONST GLvector4f *in, + const GLuint *flags) { GLfloat (*to)[4] = out->data; GLfloat (*from)[4] = in->data; @@ -2286,8 +2290,8 @@ GLvector4f *copy_4f( GLvector4f *out, CONST GLvector4f *in, return out; } -GLvector3f *copy_3f( GLvector3f *out, CONST GLvector3f *in, - const GLuint *flags) +static GLvector3f *copy_3f( GLvector3f *out, CONST GLvector3f *in, + const GLuint *flags) { GLfloat (*to)[3] = out->data; GLfloat (*from)[3] = in->data; @@ -2300,8 +2304,8 @@ GLvector3f *copy_3f( GLvector3f *out, CONST GLvector3f *in, return out; } -GLvector4ub *copy_4ub( GLvector4ub *out, CONST GLvector4ub *in, - const GLuint *flags ) +static GLvector4ub *copy_4ub( GLvector4ub *out, CONST GLvector4ub *in, + const GLuint *flags ) { GLubyte (*to)[4] = out->data; GLubyte (*from)[4] = in->data; @@ -2314,8 +2318,8 @@ GLvector4ub *copy_4ub( GLvector4ub *out, CONST GLvector4ub *in, return out; } -GLvector1ui *copy_1ui( GLvector1ui *out, CONST GLvector1ui *in, - const GLuint *flags ) +static GLvector1ui *copy_1ui( GLvector1ui *out, CONST GLvector1ui *in, + const GLuint *flags ) { GLuint *to = out->data; CONST GLuint *from = in->data; diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 3130caccf8..803b650ce6 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -1,4 +1,4 @@ -/* $Id: extensions.c,v 1.4 1999/09/16 16:47:35 brianp Exp $ */ +/* $Id: extensions.c,v 1.5 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -46,10 +46,11 @@ struct extension { static struct { int enabled; const char *name; } default_extensions[] = { { ALWAYS_ENABLED, "GL_EXT_blend_color" }, - { ALWAYS_ENABLED, "GL_EXT_blend_minmax" }, - { ALWAYS_ENABLED, "GL_EXT_blend_logic_op" }, - { ALWAYS_ENABLED, "GL_EXT_blend_subtract" }, - { ALWAYS_ENABLED, "GL_EXT_paletted_texture" }, + { DEFAULT_OFF, "ARB_imaging" }, + { DEFAULT_ON, "GL_EXT_blend_minmax" }, + { DEFAULT_ON, "GL_EXT_blend_logic_op" }, + { DEFAULT_ON, "GL_EXT_blend_subtract" }, + { DEFAULT_ON, "GL_EXT_paletted_texture" }, { DEFAULT_ON, "GL_EXT_point_parameters" }, { ALWAYS_ENABLED, "GL_EXT_polygon_offset" }, { ALWAYS_ENABLED, "GL_EXT_vertex_array" }, @@ -62,7 +63,7 @@ static struct { int enabled; const char *name; } default_extensions[] = { { ALWAYS_ENABLED, "GL_EXT_abgr" }, { ALWAYS_ENABLED, "GL_SGIS_texture_edge_clamp" }, { ALWAYS_ENABLED, "GL_EXT_stencil_wrap" }, - { ALWAYS_ENABLED, "GL_INGR_blend_func_separate" }, + { DEFAULT_ON, "GL_INGR_blend_func_separate" }, { DEFAULT_ON, "GL_ARB_multitexture" }, { ALWAYS_ENABLED, "GL_NV_texgen_reflection" }, { DEFAULT_ON, "GL_PGI_misc_hints" }, @@ -140,6 +141,7 @@ void gl_extensions_dtr( GLcontext *ctx ) if (ctx->Extensions.ext_list) { foreach_s( i, nexti, ctx->Extensions.ext_list ) { + remove_from_list( i ); free( i ); } @@ -205,7 +207,7 @@ const char *gl_extensions_get_string( GLcontext *ctx ) * Also, this function does not yet do per-context function searches. * Not applicable to Mesa at this time. */ -GLfunction gl_GetProcAddress( GLcontext *ctx, const GLubyte *procName ) +void (* gl_GetProcAddress( GLcontext *ctx, const GLubyte *procName ))() { struct proc { const char *name; diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h index 7663f43c20..ded2bae797 100644 --- a/src/mesa/main/extensions.h +++ b/src/mesa/main/extensions.h @@ -1,4 +1,4 @@ -/* $Id: extensions.h,v 1.3 1999/09/11 11:48:11 brianp Exp $ */ +/* $Id: extensions.h,v 1.4 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -38,7 +38,7 @@ /* Return 0 on success. */ extern int gl_extensions_add( struct gl_context *ctx, int state, - const char *name, void (*notify)() ); + const char *name, void (*notify)( void ) ); extern int gl_extensions_enable( struct gl_context *ctx, const char *name ); extern int gl_extensions_disable( struct gl_context *ctx, const char *name ); @@ -46,7 +46,7 @@ extern void gl_extensions_dtr( struct gl_context *ctx ); extern void gl_extensions_ctr( struct gl_context *ctx ); extern const char *gl_extensions_get_string( struct gl_context *ctx ); -extern GLfunction gl_GetProcAddress( GLcontext *ctx, const GLubyte *procName ); +extern void (*gl_GetProcAddress( GLcontext *ctx, const GLubyte *procName ))( void ); #endif diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index 0fb09d0756..ae5943c6da 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.3 1999/09/19 02:03:19 tjump Exp $ */ +/* $Id: feedback.c,v 1.4 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,8 +31,12 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enums.h" #include "feedback.h" diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c index 1579c8c47c..26da3f7f14 100644 --- a/src/mesa/main/fog.c +++ b/src/mesa/main/fog.c @@ -1,4 +1,4 @@ -/* $Id: fog.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: fog.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,11 +25,17 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/fog.c,v 1.4 1999/04/04 00:20:24 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "fog.h" #include "macros.h" diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 1fb3e6e11a..90df613cd1 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.3 1999/09/16 15:46:05 brianp Exp $ */ +/* $Id: get.c,v 1.4 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,12 +25,18 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/get.c,v 1.3 1999/04/04 00:20:25 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enable.h" #include "enums.h" @@ -40,9 +46,6 @@ #include "mmath.h" #include "types.h" #include "vb.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index 3d533c82e8..ce5fdee931 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -1,4 +1,4 @@ -/* $Id: hash.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: hash.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,13 +31,14 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include -#include "hash.h" -#ifdef XFree86Server +#else #include "GL/xf86glx.h" #endif +#include "hash.h" #endif diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index bac0c661ff..acdce62eaa 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.2 1999/09/15 13:56:44 brianp Exp $ */ +/* $Id: image.c,v 1.3 1999/10/08 09:27:10 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -29,9 +29,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "image.h" #include "macros.h" diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index 715084bee6..a9a125b6af 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.3 1999/09/30 11:18:22 keithw Exp $ */ +/* $Id: light.c,v 1.4 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,10 +31,15 @@ #ifdef PC_HEADER #include "all.h" #else +#include +#ifndef XFree86Server #include #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include #include "context.h" #include "enums.h" @@ -46,9 +51,6 @@ #include "types.h" #include "vb.h" #include "xform.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c index cee566e49a..505bf46382 100644 --- a/src/mesa/main/lines.c +++ b/src/mesa/main/lines.c @@ -1,4 +1,4 @@ -/* $Id: lines.c,v 1.2 1999/09/18 20:41:23 keithw Exp $ */ +/* $Id: lines.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,7 +31,11 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "depth.h" #include "feedback.h" diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 61e8974836..e47b85ff8b 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -1,4 +1,4 @@ -/* $Id: macros.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: macros.h,v 1.2 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -36,9 +36,12 @@ #ifndef MACROS_H #define MACROS_H - +#if defined( XFree86LOADER ) && defined( XFree86Server ) +#include +#else #include #include +#endif #ifdef DEBUG @@ -49,7 +52,7 @@ #endif -#if defined(__GNUC__) || defined(__MWERKS__) +#if defined(__GNUC__) #define INLINE __inline__ #elif defined(__MSC__) #define INLINE __inline diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index b15b72181d..154a038b92 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -1,4 +1,4 @@ -/* $Id: matrix.c,v 1.4 1999/09/19 23:06:40 keithw Exp $ */ +/* $Id: matrix.c,v 1.5 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -43,10 +43,14 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enums.h" #include "macros.h" @@ -298,7 +302,7 @@ static GLboolean invert_matrix_general( GLmatrix *mat ) /* Adapted from graphics gems II. */ -GLboolean invert_matrix_3d_general( GLmatrix *mat ) +static GLboolean invert_matrix_3d_general( GLmatrix *mat ) { const GLfloat *in = mat->m; GLfloat *out = mat->inv; diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h index f89993e316..fcc630f62a 100644 --- a/src/mesa/main/matrix.h +++ b/src/mesa/main/matrix.h @@ -1,4 +1,4 @@ -/* $Id: matrix.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: matrix.h,v 1.2 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -111,5 +111,9 @@ extern void gl_matrix_mul( GLmatrix *dest, extern void gl_matrix_analyze( GLmatrix *mat ); +extern void gl_MultMatrixd( GLcontext *ctx, const GLdouble *m ); +extern GLboolean gl_matrix_invert( GLmatrix *mat ); +extern void gl_print_matrix( const GLmatrix *m ); + #endif diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 316c357af1..90257b7f3d 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: pixel.c,v 1.2 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -36,9 +36,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "macros.h" #include "pixel.h" diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 6690b2a102..43c4b88b5b 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -1,4 +1,4 @@ -/* $Id: points.c,v 1.2 1999/09/18 20:41:23 keithw Exp $ */ +/* $Id: points.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -23,6 +23,7 @@ * 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. */ +/* $XFree86: xc/lib/GL/mesa/src/points.c,v 1.4 1999/04/04 00:20:29 dawes Exp $ */ @@ -31,18 +32,22 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server +#include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "feedback.h" #include "macros.h" +#include "mmath.h" #include "pb.h" +#include "points.h" #include "span.h" #include "texstate.h" #include "types.h" #include "vb.h" #include "mmath.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index 00876febf2..00fe2f1e39 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -1,4 +1,4 @@ -/* $Id: polygon.c,v 1.3 1999/09/20 14:30:22 keithw Exp $ */ +/* $Id: polygon.c,v 1.4 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,13 +25,19 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/polygon.c,v 1.3 1999/04/04 00:20:29 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "image.h" #include "enums.h" diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 000af375ba..217cfc0ce5 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -1,4 +1,4 @@ -/* $Id: rastpos.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: rastpos.c,v 1.2 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -31,22 +31,24 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include +#include +#else +#include "GL/xf86glx.h" +#endif #include "clip.h" +#include "context.h" #include "feedback.h" #include "light.h" #include "macros.h" #include "matrix.h" #include "mmath.h" +#include "rastpos.h" #include "shade.h" #include "types.h" #include "xform.h" -#include "context.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" #endif -#endif - /* diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index 8bcced1fe7..95dbfbfbd1 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -1,4 +1,4 @@ -/* $Id: stencil.c,v 1.3 1999/09/19 02:03:19 tjump Exp $ */ +/* $Id: stencil.c,v 1.4 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,11 +25,17 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/stencil.c,v 1.3 1999/04/04 00:20:32 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "macros.h" #include "pb.h" diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index f2f301e398..aa3fbbb15e 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */ +/* $Id: teximage.c,v 1.2 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -25,13 +25,19 @@ */ +/* $XFree86: xc/lib/GL/mesa/src/teximage.c,v 1.3 1999/04/04 00:20:32 dawes Exp $ */ + #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "image.h" #include "macros.h" diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index d94618d340..0d2f5dd9f2 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.2 1999/09/30 11:18:22 keithw Exp $ */ +/* $Id: texobj.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +23,7 @@ * 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. */ - +/* $XFree86: xc/lib/GL/mesa/src/texobj.c,v 1.3 1999/04/04 00:20:32 dawes Exp $ */ @@ -31,9 +31,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enums.h" #include "hash.h" @@ -42,9 +46,6 @@ #include "texstate.h" #include "texobj.h" #include "types.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 1b19a389cf..0a828ce028 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.2 1999/09/07 22:31:30 brianp Exp $ */ +/* $Id: texstate.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -29,8 +29,12 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "enums.h" #include "macros.h" @@ -40,9 +44,6 @@ #include "texture.h" #include "types.h" #include "xform.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#endif #endif diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index fb8510ec24..f11ce2df69 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1,4 +1,4 @@ -/* $Id: varray.c,v 1.3 1999/09/07 22:31:30 brianp Exp $ */ +/* $Id: varray.c,v 1.4 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -27,9 +27,13 @@ #ifdef PC_HEADER #include "all.h" #else +#ifndef XFree86Server #include #include #include +#else +#include "GL/xf86glx.h" +#endif #include "context.h" #include "api.h" #include "cva.h" @@ -55,6 +59,11 @@ #endif #endif +#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) && !defined(GLX_USE_DLOPEN) +#define NEED_MESA_FUNCS_WRAPPED +#include "mesa_api.h" +#endif + void GLAPIENTRY glVertexPointer(CTX_ARG GLint size, GLenum type, GLsizei stride, const GLvoid *ptr ) diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 6e1fd75678..3085c42cd6 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -1,4 +1,4 @@ -/* $Id: varray.h,v 1.2 1999/09/09 23:48:02 brianp Exp $ */ +/* $Id: varray.h,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -60,6 +60,10 @@ extern void gl_EdgeFlagPointer( GLcontext *ctx, GLsizei stride, const GLboolean *ptr ); +extern void gl_GetPointerv( GLcontext *ctx, GLenum pname, GLvoid **params ); + + + extern void gl_DrawArrays( GLcontext *ctx, GLenum mode, GLint first, GLsizei count ); @@ -89,7 +93,6 @@ extern void gl_DrawRangeElements( GLcontext *ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices ); - extern void gl_save_DrawRangeElements( GLcontext *ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices ); -- cgit v1.2.3