update a couple MESA_FORMAT_Zxxx occurances

[mesa.git] / src / mesa / swrast / s_fog.h

diff --git a/src/mesa/swrast/s_fog.h b/src/mesa/swrast/s_fog.h
index e550412ece9f91dc89a96e06e77cf4b8c8a2cd80..f5744b1d952507b6011cdf56feea12820225b7e1 100644 (file)
--- a/src/mesa/swrast/s_fog.h
+++ b/src/mesa/swrast/s_fog.h
@@ -1,21 +1,20 @@
-/* $Id: s_fog.h,v 1.1 2000/10/31 18:00:04 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  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
@@ -29,35 +28,18 @@
 #define S_FOG_H
 
 
-#include "types.h"
+#include "mtypes.h"
 #include "swrast.h"
 
 
-
-
-extern void
-_mesa_fog_rgba_pixels( const GLcontext *ctx,
-                       GLuint n, const GLfixed fog[],
-                       GLchan rgba[][4] );
-
-extern void
-_mesa_fog_ci_pixels( const GLcontext *ctx,
-                     GLuint n, const GLfixed fog[], GLuint indx[] );
-
-extern void
-_mesa_win_fog_coords_from_z( const GLcontext *ctx,
-                            GLuint n, 
-                            const GLdepth z[], 
-                            GLfixed fogcoord[] );
+extern GLfloat
+_swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z);
 
 extern void
-_mesa_depth_fog_rgba_pixels( const GLcontext *ctx,
-                            GLuint n, const GLdepth z[], GLchan rgba[][4] );
+_swrast_fog_rgba_span( const GLcontext *ctx, struct sw_span *span );
 
 extern void
-_mesa_depth_fog_ci_pixels( const GLcontext *ctx,
-                          GLuint n, const GLdepth z[], GLuint index[] );
-
+_swrast_fog_ci_span( const GLcontext *ctx, struct sw_span *span );
 
 
 #endif