Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[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 88f9964cb5b21e6056a7e62d6410737f54bcbbfe..50760d88af752790f457ef2643b49f665a4f583c 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.4 2001/05/03 22:13:32 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,32 +28,17 @@
 #define S_FOG_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 
-extern void
-_mesa_fog_rgba_pixels( const GLcontext *ctx,
-                       GLuint n, const GLfloat fog[],
-                       GLchan rgba[][4] );
-
-extern void
-_mesa_fog_ci_pixels( const GLcontext *ctx,
-                     GLuint n, const GLfloat fog[], GLuint indx[] );
-
-extern void
-_mesa_win_fog_coords_from_z( const GLcontext *ctx,
-                            GLuint n,
-                            const GLdepth z[],
-                            GLfloat 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, SWspan *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, SWspan *span );
 
 
 #endif