OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean-up of header includes (Daryll)

Browse Source
This commit is contained in:
Brian Paul
1999-11-08 07:36:43 +00:00
parent 787250cc01
commit 327c69127c
22 changed files with 34 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/main/accum.c
View File

@@ -1,4 +1,4 @@
/* $Id: accum.c,v 1.9 1999/11/03 19:27:41 brianp Exp $ */ /* $Id: accum.c,v 1.10 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
#include "masking.h" #include "masking.h"
#include "span.h" #include "span.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

6
src/mesa/main/attrib.c
View File

@@ -1,4 +1,4 @@
/* $Id: attrib.c,v 1.8 1999/10/13 18:42:49 brianp Exp $ */ /* $Id: attrib.c,v 1.9 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -45,10 +45,6 @@
#include "simple_list.h" #include "simple_list.h"
#include "texstate.h" #include "texstate.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#undef MISC_H
#include "GL/xf86glx.h"
#endif
#endif #endif

7
src/mesa/main/blend.c
View File

@@ -1,4 +1,4 @@
/* $Id: blend.c,v 1.5 1999/10/21 12:26:21 brianp Exp $ */ /* $Id: blend.c,v 1.6 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -29,8 +29,8 @@
#ifdef PC_HEADER #ifdef PC_HEADER
#include "all.h" #include "all.h"
#else #else
#include <stdio.h>
#ifndef XFree86Server #ifndef XFree86Server
#include <stdio.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#else #else
@@ -44,9 +44,6 @@
#include "pb.h" #include "pb.h"
#include "span.h" #include "span.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/clip.c
View File

@@ -1,4 +1,4 @@
/* $Id: clip.c,v 1.3 1999/10/08 09:27:10 keithw Exp $ */ /* $Id: clip.c,v 1.4 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -45,9 +45,6 @@
#include "types.h" #include "types.h"
#include "vb.h" #include "vb.h"
#include "xform.h" #include "xform.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/colortab.c
View File

@@ -1,4 +1,4 @@
/* $Id: colortab.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* $Id: colortab.c,v 1.3 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -38,9 +38,6 @@
#include "colortab.h" #include "colortab.h"
#include "context.h" #include "context.h"
#include "macros.h" #include "macros.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/context.c
View File

@@ -1,4 +1,4 @@
/* $Id: context.c,v 1.17 1999/10/30 08:22:45 brianp Exp $ */ /* $Id: context.c,v 1.18 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -92,9 +92,6 @@
#include "vbxform.h" #include "vbxform.h"
#include "vertices.h" #include "vertices.h"
#include "xform.h" #include "xform.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/depth.c
View File

@@ -1,4 +1,4 @@
/* $Id: depth.c,v 1.7 1999/10/13 18:42:50 brianp Exp $ */ /* $Id: depth.c,v 1.8 1999/11/08 07:36:43 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -47,9 +47,6 @@
#include "depth.h" #include "depth.h"
#include "macros.h" #include "macros.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

6
src/mesa/main/dlist.c
View File

@@ -1,4 +1,4 @@
/* $Id: dlist.c,v 1.13 1999/11/03 17:27:05 brianp Exp $ */ /* $Id: dlist.c,v 1.14 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -87,10 +87,6 @@
#include "vbxform.h" #include "vbxform.h"
#include "winpos.h" #include "winpos.h"
#include "xform.h" #include "xform.h"
#ifdef XFree86Server
#undef MISC_H
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/drawpix.c
View File

@@ -1,4 +1,4 @@
/* $Id: drawpix.c,v 1.4 1999/10/19 20:33:57 brianp Exp $ */ /* $Id: drawpix.c,v 1.5 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -49,9 +49,6 @@
#include "stencil.h" #include "stencil.h"
#include "types.h" #include "types.h"
#include "zoom.h" #include "zoom.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/enable.c
View File

@@ -1,4 +1,4 @@
/* $Id: enable.c,v 1.7 1999/10/20 22:16:45 brianp Exp $ */ /* $Id: enable.c,v 1.8 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -47,9 +47,6 @@
#include "vbfill.h" #include "vbfill.h"
#include "xform.h" #include "xform.h"
#include "enums.h" #include "enums.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

10
src/mesa/main/enums.c
View File

@@ -1,4 +1,4 @@
/* $Id: enums.c,v 1.3 1999/10/13 18:42:50 brianp Exp $ */ /* $Id: enums.c,v 1.4 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -24,12 +24,16 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#ifndef XFree86Server
#include <stdlib.h>
#include <string.h>
#else
#include "GL/xf86glx.h"
#endif
#include "GL/gl.h" #include "GL/gl.h"
#include "enums.h" #include "enums.h"
#include "macros.h" #include "macros.h"
#include <stdlib.h>
#include <string.h>
typedef struct { typedef struct {

6
src/mesa/main/extensions.c
View File

@@ -1,4 +1,4 @@
/* $Id: extensions.c,v 1.9 1999/10/16 11:30:31 brianp Exp $ */ /* $Id: extensions.c,v 1.10 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -25,7 +25,11 @@
*/ */
#ifndef XFree86Server
#include <stdlib.h> #include <stdlib.h>
#else
#include "GL/xf86glx.h"
#endif
#include "context.h" #include "context.h"
#include "extensions.h" #include "extensions.h"
#include "simple_list.h" #include "simple_list.h"

5
src/mesa/main/feedback.c
View File

@@ -1,4 +1,4 @@
/* $Id: feedback.c,v 1.4 1999/10/08 09:27:10 keithw Exp $ */ /* $Id: feedback.c,v 1.5 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
#include "mmath.h" #include "mmath.h"
#include "types.h" #include "types.h"
#include "triangle.h" #include "triangle.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/fog.c
View File

@@ -1,4 +1,4 @@
/* $Id: fog.c,v 1.2 1999/10/08 09:27:10 keithw Exp $ */ /* $Id: fog.c,v 1.3 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -41,9 +41,6 @@
#include "macros.h" #include "macros.h"
#include "mmath.h" #include "mmath.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/image.c
View File

@@ -1,4 +1,4 @@
/* $Id: image.c,v 1.12 1999/11/03 18:24:05 brianp Exp $ */ /* $Id: image.c,v 1.13 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -42,9 +42,6 @@
#include "mmath.h" #include "mmath.h"
#include "pixel.h" #include "pixel.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

4
src/mesa/main/light.c
View File

@@ -1,4 +1,4 @@
/* $Id: light.c,v 1.6 1999/10/19 20:32:40 brianp Exp $ */ /* $Id: light.c,v 1.7 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -37,10 +37,10 @@
#include <float.h> #include <float.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#else #else
#include "GL/xf86glx.h" #include "GL/xf86glx.h"
#endif #endif
#include <stdio.h>
#include "context.h" #include "context.h"
#include "enums.h" #include "enums.h"
#include "light.h" #include "light.h"

5
src/mesa/main/lines.c
View File

@@ -1,4 +1,4 @@
/* $Id: lines.c,v 1.3 1999/10/08 09:27:11 keithw Exp $ */ /* $Id: lines.c,v 1.4 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -46,9 +46,6 @@
#include "texstate.h" #include "texstate.h"
#include "types.h" #include "types.h"
#include "vb.h" #include "vb.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/matrix.c
View File

@@ -1,4 +1,4 @@
/* $Id: matrix.c,v 1.7 1999/10/13 18:42:50 brianp Exp $ */ /* $Id: matrix.c,v 1.8 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -57,9 +57,6 @@
#include "matrix.h" #include "matrix.h"
#include "mmath.h" #include "mmath.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/pixel.c
View File

@@ -1,4 +1,4 @@
/* $Id: pixel.c,v 1.3 1999/10/30 08:20:57 brianp Exp $ */ /* $Id: pixel.c,v 1.4 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -47,9 +47,6 @@
#include "macros.h" #include "macros.h"
#include "pixel.h" #include "pixel.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/polygon.c
View File

@@ -1,4 +1,4 @@
/* $Id: polygon.c,v 1.4 1999/10/08 09:27:11 keithw Exp $ */ /* $Id: polygon.c,v 1.5 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
#include "macros.h" #include "macros.h"
#include "polygon.h" #include "polygon.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/teximage.c
View File

@@ -1,4 +1,4 @@
/* $Id: teximage.c,v 1.10 1999/11/05 06:43:11 brianp Exp $ */ /* $Id: teximage.c,v 1.11 1999/11/08 07:36:44 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -44,9 +44,6 @@
#include "teximage.h" #include "teximage.h"
#include "texstate.h" #include "texstate.h"
#include "types.h" #include "types.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif

5
src/mesa/main/varray.c
View File

@@ -1,4 +1,4 @@
/* $Id: varray.c,v 1.7 1999/11/05 06:43:11 brianp Exp $ */ /* $Id: varray.c,v 1.8 1999/11/08 07:36:45 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -54,9 +54,6 @@
#include "vbindirect.h" #include "vbindirect.h"
#include "vbxform.h" #include "vbxform.h"
#include "xform.h" #include "xform.h"
#ifdef XFree86Server
#include "GL/xf86glx.h"
#endif
#endif #endif
#if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) && !defined(GLX_USE_DLOPEN) #if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) && !defined(GLX_USE_DLOPEN)