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, 24 insertions, 24 deletions

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 2439655143e..8db7f013040 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.46 2000/11/19 23:10:25 brianp Exp $ */
+/* $Id: state.c,v 1.47 2000/11/22 07:32:17 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -76,7 +76,7 @@
 #include "texobj.h"
 #include "texstate.h"
 #include "texture.h"
-#include "types.h"
+#include "mtypes.h"
 #include "varray.h"
 #include "winpos.h"
 
@@ -725,7 +725,7 @@ update_polygon( GLcontext *ctx )
       ctx->_TriangleCaps |= DD_TRI_OFFSET;
 }
 
-static void 
+static void
 calculate_model_project_matrix( GLcontext *ctx )
 {
    if (!ctx->_NeedEyeCoords) {
@@ -756,13 +756,13 @@ update_modelview_scale( GLcontext *ctx )
 }
 
 
-/* Bring uptodate any state that relies on _NeedEyeCoords.  
+/* Bring uptodate any state that relies on _NeedEyeCoords.
  */
 static void
 update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords )
-{   
+{
    /* Check if the truth-value interpretations of the bitfields have
-    * changed: 
+    * changed:
     */
    if ((oldneedeyecoords == 0) != (ctx->_NeedEyeCoords == 0)) {
       /* Recalculate all state that depends on _NeedEyeCoords.
@@ -780,12 +780,12 @@ update_tnl_spaces( GLcontext *ctx, GLuint oldneedeyecoords )
       /* Recalculate that same state if and only if it has been
        * invalidated by other statechanges.
        */
-      if (new_state & _NEW_MODELVIEW) 
+      if (new_state & _NEW_MODELVIEW)
 	 update_modelview_scale(ctx);
 
-      if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION)) 
+      if (new_state & (_NEW_MODELVIEW|_NEW_PROJECTION))
 	 calculate_model_project_matrix(ctx);
-	    
+	
       if (new_state & (_NEW_LIGHT|_NEW_MODELVIEW))
 	 gl_compute_light_positions( ctx );
    }
@@ -825,7 +825,7 @@ static void
 update_projection( GLcontext *ctx )
 {
    _math_matrix_analyze( &ctx->ProjectionMatrix );
-      
+
    /* Recompute clip plane positions in clipspace.  This is also done
     * in _mesa_ClipPlane().
     */
@@ -860,7 +860,7 @@ update_image_transfer_state(GLcontext *ctx)
 
    if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset)
       mask |= IMAGE_SHIFT_OFFSET_BIT;
-   
+
    if (ctx->Pixel.MapColorFlag)
       mask |= IMAGE_MAP_COLOR_BIT;
 
@@ -910,7 +910,7 @@ update_image_transfer_state(GLcontext *ctx)
  * state references this value, and must be treated with care to
  * ensure that updates are done correctly.  All state dependent on
  * _NeedEyeCoords is calculated from within _mesa_update_tnl_spaces(),
- * and from nowhere else.  
+ * and from nowhere else.
  */
 void gl_update_state( GLcontext *ctx )
 {
@@ -920,18 +920,18 @@ void gl_update_state( GLcontext *ctx )
    if (MESA_VERBOSE & VERBOSE_STATE)
       gl_print_state("", new_state);
 
-   if (new_state & _NEW_MODELVIEW) 
+   if (new_state & _NEW_MODELVIEW)
       _math_matrix_analyze( &ctx->ModelView );
 
-   if (new_state & _NEW_PROJECTION) 
+   if (new_state & _NEW_PROJECTION)
       update_projection( ctx );
 
-   if (new_state & _NEW_TEXTURE_MATRIX) 
+   if (new_state & _NEW_TEXTURE_MATRIX)
       _mesa_update_texture_matrices( ctx );
 
-   if (new_state & _NEW_COLOR_MATRIX) 
+   if (new_state & _NEW_COLOR_MATRIX)
       _math_matrix_analyze( &ctx->ColorMatrix );
-   
+
    /* References ColorMatrix.type (derived above).
     */
    if (new_state & (_NEW_PIXEL|_NEW_COLOR_MATRIX))
@@ -939,18 +939,18 @@ void gl_update_state( GLcontext *ctx )
 
    /* Contributes to NeedEyeCoords, NeedNormals.
     */
-   if (new_state & _NEW_TEXTURE) 
+   if (new_state & _NEW_TEXTURE)
       _mesa_update_texture_state( ctx );
 
-   if (new_state & (_NEW_BUFFERS|_NEW_SCISSOR)) 
+   if (new_state & (_NEW_BUFFERS|_NEW_SCISSOR))
       update_drawbuffer( ctx );
 
-   if (new_state & _NEW_POLYGON) 
+   if (new_state & _NEW_POLYGON)
       update_polygon( ctx );
 
    /* Contributes to NeedEyeCoords, NeedNormals.
     */
-   if (new_state & _NEW_LIGHT) 
+   if (new_state & _NEW_LIGHT)
       gl_update_lighting( ctx );
 
    /* We can light in object space if the modelview matrix preserves
@@ -968,15 +968,15 @@ void gl_update_state( GLcontext *ctx )
     * If the truth value of either has changed, update for the new
     * lighting space and recompute the positions of lights and the
     * normal transform.
-    * 
+    *
     * If the lighting space hasn't changed, may still need to recompute
-    * light positions & normal transforms for other reasons.  
+    * light positions & normal transforms for other reasons.
     */
    if (new_state & (_NEW_MODELVIEW |
 		    _NEW_PROJECTION |
 		    _TNL_NEW_NORMAL_TRANSFORM |
 		    _NEW_LIGHT |
-		    _TNL_NEW_NEED_EYE_COORDS)) 
+		    _TNL_NEW_NEED_EYE_COORDS))
       update_tnl_spaces( ctx, oldneedeyecoords );
 
    /*