swrast: Reduce header file inclusion in s_fog.h.

[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 e254f8dd51de8fef7d58a1d830f8168fd36593d7..a496746d106851592c91d4c53e41d27a191f62f5 100644 (file)
--- a/src/mesa/swrast/s_fog.h
+++ b/src/mesa/swrast/s_fog.h
@@ -1,10 +1,9 @@
-/* $Id: s_fog.h,v 1.8 2002/02/02 21:40:33 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * 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"),
@@ -29,41 +28,14 @@
 #define S_FOG_H
 
 
-#include "mtypes.h"
-#include "swrast.h"
+#include "main/mtypes.h"
+#include "s_span.h"
 
 
 extern GLfloat
-_mesa_z_to_fogfactor(GLcontext *ctx, GLfloat z);
-
-
-extern void
-_mesa_fog_rgba_pixels( const GLcontext *ctx, struct sw_span *span,
-                      GLchan rgba[][4]);
-extern void
-_mesa_fog_rgba_pixels_with_array( const GLcontext *ctx, struct sw_span *span,
-                                 const GLfloat fog[], GLchan rgba[][4] );
-
-
-extern void
-_mesa_fog_ci_pixels( const GLcontext *ctx, struct sw_span *span,
-                    GLuint indx[]);
-extern void
-_mesa_fog_ci_pixels_with_array( const GLcontext *ctx, struct sw_span *span,
-                               const GLfloat fog[], GLuint index[] );
-
-extern void
-_mesa_win_fog_coords_from_z( const GLcontext *ctx,
-                            GLuint n,
-                            const GLdepth z[],
-                            GLfloat fogcoord[] );
-
-extern void
-_mesa_depth_fog_rgba_pixels( const GLcontext *ctx, struct sw_span *span,
-                            GLchan rgba[][4] );
+_swrast_z_to_fogfactor(GLcontext *ctx, GLfloat z);
 
 extern void
-_mesa_depth_fog_ci_pixels( const GLcontext *ctx, struct sw_span *span,
-                          GLuint index[] );
+_swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span );
 
 #endif