replace malloc macros in imports.h with u_memory.h versions

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

diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h
index d61d3b121ba8127f9df32801fcb033d5108ec710..478249f157c8fe013a85e6d38557446f87689ee0 100644 (file)
--- a/src/mesa/main/depth.h
+++ b/src/mesa/main/depth.h
@@ -5,7 +5,6 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
@@ -22,9 +21,10 @@
  * 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
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -32,16 +32,22 @@
 #define DEPTH_H
 
 
-#include "mtypes.h"
+#include "glheader.h"
 
+struct gl_context;
 
-#if _HAVE_FULL_GL
 
 extern void GLAPIENTRY
 _mesa_ClearDepth( GLclampd depth );
 
 extern void GLAPIENTRY
-_mesa_DepthFunc( GLenum func );
+_mesa_ClearDepthf( GLclampf depth );
+
+void GLAPIENTRY
+_mesa_DepthFunc_no_error(GLenum func);
+
+extern void GLAPIENTRY
+_mesa_DepthFunc(GLenum func);
 
 extern void GLAPIENTRY
 _mesa_DepthMask( GLboolean flag );
@@ -52,11 +58,4 @@ _mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );
 extern void 
 _mesa_init_depth( struct gl_context * ctx );
 
-#else
-
-/** No-op */
-#define _mesa_init_depth( c ) ((void)0)
-
-#endif
-
 #endif