mesa: Fix GL_LUMINANCE handling for textures in glGetTexImage

[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 b6a339a0adb5fa2eec65027b222d07d78bf7078c..0a3adfca5ff665ad52276f858c3e6ffb5e760e9b 100644 (file)
--- a/src/mesa/swrast/s_logic.h
+++ b/src/mesa/swrast/s_logic.h
@@ -1,10 +1,8 @@
-/* $Id: s_logic.h,v 1.2 2000/11/22 07:32:18 joukj Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.2
  *
- * Copyright (C) 1999-2000  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,31 +27,14 @@
 #define S_LOGIC_H
 
 
-#include "mtypes.h"
-#include "swrast.h"
-
-
-extern void
-_mesa_logicop_ci_span( GLcontext *ctx,
-                       GLuint n, GLint x, GLint y, GLuint index[],
-                       const GLubyte mask[] );
-
-
-extern void
-_mesa_logicop_ci_pixels( GLcontext *ctx,
-                         GLuint n, const GLint x[], const GLint y[],
-                         GLuint index[], const GLubyte mask[] );
-
-
-extern void
-_mesa_logicop_rgba_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-                         GLchan rgba[][4], const GLubyte mask[] );
+#include "s_span.h"
 
+struct gl_context;
+struct gl_renderbuffer;
 
 extern void
-_mesa_logicop_rgba_pixels( GLcontext *ctx,
-                           GLuint n, const GLint x[], const GLint y[],
-                           GLchan rgba[][4], const GLubyte mask[] );
+_swrast_logicop_rgba_span(struct gl_context *ctx, struct gl_renderbuffer *rb,
+                          SWspan *span);
 
 
 #endif