mesa: Prefix main includes with dir to avoid conflicts.

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

diff --git a/src/mesa/swrast/s_masking.h b/src/mesa/swrast/s_masking.h
index 965e9f2180989935065483568f6556228da9cb4b..688c07c7ae747528a0f60cba3507dd001bde57c8 100644 (file)
--- a/src/mesa/swrast/s_masking.h
+++ b/src/mesa/swrast/s_masking.h
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.5.2
  *
- * 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"),
@@ -28,34 +27,17 @@
 #define S_MASKING_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast.h"
 
 
-/*
- * Implement glColorMask for a span of RGBA pixels.
- */
-extern void
-_swrast_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
-                      GLchan rgba[][4] );
-
-
 extern void
-_swrast_mask_rgba_array( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                       GLchan rgba[][4] );
-
-
-/*
- * Implement glIndexMask for a span of CI pixels.
- */
-extern void
-_swrast_mask_index_span( GLcontext *ctx, const struct sw_span *span,
-                       GLuint index[] );
+_swrast_mask_rgba_span(GLcontext *ctx, struct gl_renderbuffer *rb,
+                       SWspan *span);
 
 
 extern void
-_swrast_mask_index_array( GLcontext *ctx,
-                        GLuint n, GLint x, GLint y, GLuint index[] );
-
+_swrast_mask_ci_span(GLcontext *ctx, struct gl_renderbuffer *rb,
+                     SWspan *span);
 
 #endif