swrast: Rename blend_func->swrast_blend_func

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

diff --git a/src/mesa/swrast/s_logic.h b/src/mesa/swrast/s_logic.h
index 19ec9c3246fff675b225054b82b43199fbe86b42..bcb4b74a0c95c130ba208a1831d7687d84e798cb 100644 (file)
--- a/src/mesa/swrast/s_logic.h
+++ b/src/mesa/swrast/s_logic.h
@@ -1,9 +1,7 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  4.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"),
@@ -18,9 +16,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.
  */
 
 
@@ -28,18 +27,14 @@
 #define S_LOGIC_H
 
 
-#include "mtypes.h"
-#include "swrast.h"
-
-
-extern void
-_swrast_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
-                       GLuint index[] );
+#include "s_span.h"
 
+struct gl_context;
+struct gl_renderbuffer;
 
 extern void
-_swrast_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
-                         GLchan rgba[][4] );
+_swrast_logicop_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,
+                          SWspan *span);
 
 
 #endif