mesa: Add "OR COPYRIGHT HOLDERS" to license text disclaiming liability.

[mesa.git] / src / mesa / x86 / mmx.h

diff --git a/src/mesa/x86/mmx.h b/src/mesa/x86/mmx.h
index 205677e19b51c2e4cd5cec029f286ef9871f026d..334be6ea030c241ba808035f4512284dbfc4841d 100644 (file)
--- a/src/mesa/x86/mmx.h
+++ b/src/mesa/x86/mmx.h
@@ -1,10 +1,8 @@
-/* $Id: mmx.h,v 1.7 2002/04/19 10:33:34 jrfonseca 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"),
@@ -19,7 +17,7 @@
  * 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
+ * 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,12 +26,34 @@
 #ifndef ASM_MMX_H
 #define ASM_MMX_H
 
+#include "main/compiler.h"
+#include "main/glheader.h"
+
+struct gl_context;
+
+extern void _ASMAPI
+_mesa_mmx_blend_transparency( struct gl_context *ctx, GLuint n, const GLubyte mask[],
+                              GLvoid *rgba, const GLvoid *dest,
+                              GLenum chanType );
+
+extern void _ASMAPI
+_mesa_mmx_blend_add( struct gl_context *ctx, GLuint n, const GLubyte mask[],
+                     GLvoid *rgba, const GLvoid *dest,
+                     GLenum chanType );
+
+extern void _ASMAPI
+_mesa_mmx_blend_min( struct gl_context *ctx, GLuint n, const GLubyte mask[],
+                     GLvoid *rgba, const GLvoid *dest,
+                     GLenum chanType );
+
 extern void _ASMAPI
-_mesa_mmx_blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[],
-                              GLubyte rgba[][4], const GLubyte dest[][4] );
+_mesa_mmx_blend_max( struct gl_context *ctx, GLuint n, const GLubyte mask[],
+                     GLvoid *rgba, const GLvoid *dest,
+                     GLenum chanType );
 
 extern void _ASMAPI
-_mesa_mmx_blend_modulate( GLcontext *ctx, GLuint n, const GLubyte mask[],
-                          GLubyte rgba[][4], const GLubyte dest[][4] );
+_mesa_mmx_blend_modulate( struct gl_context *ctx, GLuint n, const GLubyte mask[],
+                          GLvoid *rgba, const GLvoid *dest,
+                          GLenum chanType );
 
 #endif