swrast: use ASSIGN_4V() macro

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

diff --git a/src/mesa/swrast/s_blend.h b/src/mesa/swrast/s_blend.h
index 144880606851ecdf08e3c84675db71c3a87ce74e..8d5a81635d5d80b884110b98e29c179db9a31abf 100644 (file)
--- a/src/mesa/swrast/s_blend.h
+++ b/src/mesa/swrast/s_blend.h
@@ -1,10 +1,8 @@
-/* $Id: s_blend.h,v 1.4 2001/03/12 00:48:41 gareth Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2001  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"),
@@ -29,23 +27,15 @@
 #define S_BLEND_H
 
 
-#include "mtypes.h"
-#include "swrast.h"
-
+#include "s_context.h"
 
 
 extern void
-_mesa_blend_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                  GLchan rgba[][4], const GLubyte mask[] );
+_swrast_blend_span(GLcontext *ctx, struct gl_renderbuffer *rb, SWspan *span);
 
 
 extern void
-_mesa_blend_pixels( GLcontext *ctx,
-                    GLuint n, const GLint x[], const GLint y[],
-                    GLchan rgba[][4], const GLubyte mask[] );
-
-extern void
-_swrast_choose_blend_func( GLcontext *ctx );
+_swrast_choose_blend_func(GLcontext *ctx, GLenum chanType);
 
 
 #endif