fixed conformance problems in min/max and histogram result packing

[mesa.git] / src / mesa / main / blend.h

diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index 8396880eae8ac301f0d2522aa35cc296f605f42e..186cee857de043adebd08f6fe949aa5fcdcb751b 100644 (file)
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -1,21 +1,21 @@
-/* $Id: blend.h,v 1.2 1999/11/11 01:22:25 brianp Exp $ */
+/* $Id: blend.h,v 1.7 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2000  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * 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
@@ -29,36 +29,23 @@
 #define BLEND_H
 
 
-#include "types.h"
-
-
-
-extern void
-gl_blend_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
-               GLubyte rgba[][4], const GLubyte mask[] );
-
-
-extern void
-gl_blend_pixels( GLcontext *ctx,
-                 GLuint n, const GLint x[], const GLint y[],
-                 GLubyte rgba[][4], const GLubyte mask[] );
-
+#include "mtypes.h"
 
 extern void
 _mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
 
 
 extern void
-_mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB,
-                             GLenum sfactorA, GLenum dfactorA );
+_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
+                            GLenum sfactorA, GLenum dfactorA );
 
 
 extern void
-_mesa_BlendEquationEXT( GLenum mode );
+_mesa_BlendEquation( GLenum mode );
 
 
 extern void
-_mesa_BlendColorEXT(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 
 
 #endif