Committing in .

 Modified Files:
 	Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
 	Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
 	Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
 	Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
 	Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
 	Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
 	Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
 	Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
 	Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
 	Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
 	Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
 	Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
 	Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
 	Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
 	Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
 	Mesa/src/extensions.c Mesa/src/extensions.h
 	Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
 	Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
 	Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
 	Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
 	Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
 	Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
 	Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
 	Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
 	Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
 	Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
 	Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
 	Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
 	Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
 	Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
 	Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
 	Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
 	Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
 	Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
 	Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
 	Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
 	Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
 	Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
 	Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
 	Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
 	Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
 	Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
 	Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
 	Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
 	Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
 	Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
 	Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
 	Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
 	Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
 	Mesa/src/swrast_setup/ss_context.h
 	Mesa/src/swrast_setup/ss_triangle.c
 	Mesa/src/swrast_setup/ss_triangle.h
 	Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
 	Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
 	Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
 	Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
 	Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
 	Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
 	Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
 	Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
 	Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
 	Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
 	Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
 	Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
 	Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
 	Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
 	Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
 	Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
 	Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
 	Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
 	Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
 	Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
 	Mesa/src/tnl/tnl.h
 Added Files:
 	Mesa/src/mtypes.h
 Removed Files:
 	Mesa/src/types.h

 Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.

----------------------------------------------------------------------

1 files changed, 29 insertions, 29 deletions

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 85f9ef08919..6192adb2638 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,21 +1,21 @@
-/* $Id: s_context.c,v 1.5 2000/11/19 23:10:26 brianp Exp $ */
+/* $Id: s_context.c,v 1.6 2000/11/22 07:32:18 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
- * 
+ *
  * 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
@@ -28,7 +28,7 @@
  */
 
 #include "glheader.h"
-#include "types.h"
+#include "mtypes.h"
 #include "mem.h"
 
 #include "s_pb.h"
@@ -48,7 +48,7 @@
  * Recompute the value of swrast->_RasterMask, etc. according to
  * the current context.
  */
-static void 
+static void
 _swrast_update_rasterflags( GLcontext *ctx )
 {
    GLuint RasterMask = 0;
@@ -147,9 +147,9 @@ _swrast_update_polygon( GLcontext *ctx )
 static void
 _swrast_update_hint( GLcontext *ctx )
 {
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);   
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
    swrast->_PreferPixelFog = (!swrast->AllowVertexFog ||
-			      (ctx->Hint.Fog == GL_NICEST && 
+			      (ctx->Hint.Fog == GL_NICEST &&
 			       swrast->AllowPixelFog));
 }
 
@@ -185,11 +185,11 @@ _swrast_update_hint( GLcontext *ctx )
 
 
 
-/* Stub for swrast->Triangle to select a true triangle function 
+/* Stub for swrast->Triangle to select a true triangle function
  * after a state change.
  */
 static void
-_swrast_validate_quad( GLcontext *ctx, 
+_swrast_validate_quad( GLcontext *ctx,
 		       const SWvertex *v0, const SWvertex *v1,
                        const SWvertex *v2, const SWvertex *v3 )
 {
@@ -202,7 +202,7 @@ _swrast_validate_quad( GLcontext *ctx,
 }
 
 static void
-_swrast_validate_triangle( GLcontext *ctx, 
+_swrast_validate_triangle( GLcontext *ctx,
 			   const SWvertex *v0,
                            const SWvertex *v1,
                            const SWvertex *v2 )
@@ -237,10 +237,10 @@ _swrast_validate_point( GLcontext *ctx, const SWvertex *v0 )
    swrast->Point( ctx, v0 );
 }
 
-static void 
+static void
 _swrast_validate_blend_func( GLcontext *ctx, GLuint n,
 			     const GLubyte mask[],
-			     GLchan src[][4], 
+			     GLchan src[][4],
 			     CONST GLchan dst[][4] )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@ -252,7 +252,7 @@ _swrast_validate_blend_func( GLcontext *ctx, GLuint n,
 }
 
 
-static void 
+static void
 _swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
 				 const struct gl_texture_object *tObj,
 				 GLuint n,
@@ -265,7 +265,7 @@ _swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
    _swrast_validate_derived( ctx );
    _swrast_choose_texture_sample_func( ctx, texUnit, tObj );
 
-   swrast->TextureSample[texUnit]( ctx, texUnit, tObj, n, s, t, u, 
+   swrast->TextureSample[texUnit]( ctx, texUnit, tObj, n, s, t, u,
 				   lambda, rgba );
 }
 
@@ -285,14 +285,14 @@ _swrast_invalidate_state( GLcontext *ctx, GLuint new_state )
    swrast->NewState |= new_state;
 
    /* After 10 statechanges without any swrast functions being called,
-    * put the module to sleep. 
+    * put the module to sleep.
     */
    if (++swrast->StateChanges > 10) {
       swrast->InvalidateState = _swrast_sleep;
       swrast->NewState = ~0;
       new_state = ~0;
    }
-   
+
    if (new_state & swrast->invalidate_triangle)
       swrast->Triangle = _swrast_validate_triangle;
 
@@ -307,8 +307,8 @@ _swrast_invalidate_state( GLcontext *ctx, GLuint new_state )
 
    if (new_state & _SWRAST_NEW_BLEND_FUNC)
       swrast->BlendFunc = _swrast_validate_blend_func;
-   
-   if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC) 
+
+   if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC)
       for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++)
 	 swrast->TextureSample[i] = _swrast_validate_texture_sample;
 }
@@ -320,13 +320,13 @@ _swrast_validate_derived( GLcontext *ctx )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
 
-   if (swrast->NewState) 
+   if (swrast->NewState)
    {
-      if (swrast->NewState & _SWRAST_NEW_RASTERMASK) 
+      if (swrast->NewState & _SWRAST_NEW_RASTERMASK)
  	 _swrast_update_rasterflags( ctx );
 
       if (swrast->NewState & _NEW_TEXTURE)
-	 swrast->_MultiTextureEnabled = (ctx->Texture._ReallyEnabled & 
+	 swrast->_MultiTextureEnabled = (ctx->Texture._ReallyEnabled &
 					 ~ENABLE_TEX0);
 
       if (swrast->NewState & _NEW_POLYGON)
@@ -346,7 +346,7 @@ _swrast_validate_derived( GLcontext *ctx )
 /* Public entrypoints:  See also s_accum.c, s_bitmap.c, etc.
  */
 void
-_swrast_Quad( GLcontext *ctx, 
+_swrast_Quad( GLcontext *ctx,
 	      const SWvertex *v0, const SWvertex *v1,
               const SWvertex *v2, const SWvertex *v3 )
 {
@@ -385,14 +385,14 @@ _swrast_get_stipple_counter_ref( GLcontext *ctx )
    return &SWRAST_CONTEXT(ctx)->StippleCounter;
 }
 
-void 
+void
 _swrast_allow_vertex_fog( GLcontext *ctx, GLboolean value )
 {
    SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
    SWRAST_CONTEXT(ctx)->AllowVertexFog = value;
 }
 
-void 
+void
 _swrast_allow_pixel_fog( GLcontext *ctx, GLboolean value )
 {
    SWRAST_CONTEXT(ctx)->InvalidateState( ctx, _NEW_HINT );
@@ -415,7 +415,7 @@ _swrast_CreateContext( GLcontext *ctx )
    }
 
    swrast->NewState = ~0;
-   
+
    swrast->choose_point = _swrast_choose_point;
    swrast->choose_line = _swrast_choose_line;
    swrast->choose_triangle = _swrast_choose_triangle;
@@ -443,7 +443,7 @@ _swrast_CreateContext( GLcontext *ctx )
 
    for (i = 0 ; i < MAX_TEXTURE_UNITS ; i++)
       swrast->TextureSample[i] = _swrast_validate_texture_sample;
-   
+
    ctx->swrast_context = swrast;
    return GL_TRUE;
 }
@@ -455,7 +455,7 @@ _swrast_DestroyContext( GLcontext *ctx )
 
    FREE( swrast->PB );
    FREE( swrast );
-   
+
    ctx->swrast_context = 0;
 }