Merge branch 'origin'

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

diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index 2fdac07f5e7d39db45584bdaadcdde7caa521a4b..a14d19cdb397d15ea5234068334257b143933a0b 100644 (file)
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -1,10 +1,18 @@
-/* $Id: fog.h,v 1.11 2000/11/22 07:32:17 joukj Exp $ */
+/**
+ * \file fog.h
+ * Fog operations.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * 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"),
@@ -32,21 +40,27 @@
 #include "mtypes.h"
 
 
+#if _HAVE_FULL_GL
 
-extern void
+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
+
+/** No-op */
+#define _mesa_init_fog( c ) ((void)0)
+
+#endif
 
 #endif