1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image...

[mesa.git] / src / mesa / swrast / s_depth.h

diff --git a/src/mesa/swrast/s_depth.h b/src/mesa/swrast/s_depth.h
index 9cc8e94524a6ac49ec339523b9f028a5935e29d3..d1ed050efd69d847055f7d4a15c776dd2e98b955 100644 (file)
--- a/src/mesa/swrast/s_depth.h
+++ b/src/mesa/swrast/s_depth.h
@@ -1,10 +1,8 @@
-/* $Id: s_depth.h,v 1.8 2003/03/25 02:23:45 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -33,32 +31,26 @@
 #include "s_context.h"
 
 
-extern GLvoid *
-_swrast_zbuffer_address(GLcontext *ctx, GLint x, GLint y);
-
-
-
 extern GLuint
-_swrast_depth_test_span( GLcontext *ctx, struct sw_span *span);
-
+_swrast_depth_test_span( GLcontext *ctx, SWspan *span);
 
 
-extern void
-_swrast_read_depth_span( GLcontext *ctx,
-                       GLint n, GLint x, GLint y, GLdepth depth[] );
+extern GLboolean
+_swrast_depth_bounds_test( GLcontext *ctx, SWspan *span );
 
 
 extern void
-_swrast_read_depth_span_float( GLcontext *ctx, GLint n, GLint x, GLint y,
-                             GLfloat depth[] );
+_swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb,
+                               GLint n, GLint x, GLint y, GLfloat depth[] );
 
 
 extern void
-_swrast_alloc_depth_buffer( GLframebuffer *buffer );
+_swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
+                              GLint n, GLint x, GLint y, GLuint depth[] );
 
 
 extern void
-_swrast_clear_depth_buffer( GLcontext *ctx );
+_swrast_clear_depth_buffer( GLcontext *ctx, struct gl_renderbuffer *rb );
 
 
 #endif