Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / main / fog.h

diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index 92a2bc5d33d79b58a4b4111885122601ffc869c4..a14d19cdb397d15ea5234068334257b143933a0b 100644 (file)
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -1,21 +1,29 @@
-/* $Id: fog.h,v 1.3 2000/02/02 22:21:39 brianp Exp $ */
+/**
+ * \file fog.h
+ * Fog operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  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,41 +37,30 @@
 #define FOG_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
-extern void
-_mesa_Fogf(GLenum pname, GLfloat param);
+#if _HAVE_FULL_GL
 
+extern void GLAPIENTRY
+_mesa_Fogf(GLenum pname, GLfloat param);
 
-extern void
+extern void GLAPIENTRY
 _mesa_Fogi(GLenum pname, GLint param );
 
-
-extern void
+extern void GLAPIENTRY
 _mesa_Fogfv(GLenum pname, const GLfloat *params );
 
-
-extern void
+extern void GLAPIENTRY
 _mesa_Fogiv(GLenum pname, const GLint *params );
 
+extern void _mesa_init_fog( GLcontext * ctx );
 
+#else
 
-extern void
-_mesa_fog_vertices( struct vertex_buffer *VB );
-
-extern void
-_mesa_fog_rgba_pixels( const GLcontext *ctx,
-                       GLuint n, const GLdepth z[],
-                       GLubyte rgba[][4] );
-
-extern void
-_mesa_fog_ci_pixels( const GLcontext *ctx,
-                     GLuint n, const GLdepth z[], GLuint indx[] );
-
-
-extern void
-_mesa_init_fog( void );
+/** No-op */
+#define _mesa_init_fog( c ) ((void)0)
 
+#endif
 
 #endif