summaryrefslogtreecommitdiff
path: root/xc/extras/Mesa/src/alpha.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/extras/Mesa/src/alpha.c')
-rw-r--r--xc/extras/Mesa/src/alpha.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/xc/extras/Mesa/src/alpha.c b/xc/extras/Mesa/src/alpha.c
index 1eaa4133d..f8758ea4d 100644
--- a/xc/extras/Mesa/src/alpha.c
+++ b/xc/extras/Mesa/src/alpha.c
@@ -1,10 +1,9 @@
-/* $Id: alpha.c,v 1.1.1.1 2000/01/06 13:26:42 faith Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.1
+ * Version: 3.3
*
- * Copyright (C) 1999 Brian Paul All Rights Reserved.
+ * 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"),
@@ -23,17 +22,12 @@
* 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.
*/
-/* $XFree86: xc/extras/Mesa/src/alpha.c,v 1.1 1999/12/14 01:31:18 robin Exp $ */
-
#ifdef PC_HEADER
#include "all.h"
#else
-#ifndef XFree86Server
-#else
-#include "GL/xf86glx.h"
-#endif
+#include "glheader.h"
#include "alpha.h"
#include "context.h"
#include "types.h"
@@ -43,8 +37,10 @@
-void gl_AlphaFunc( GLcontext* ctx, GLenum func, GLclampf ref )
+void
+_mesa_AlphaFunc( GLenum func, GLclampf ref )
{
+ GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glAlphaFunc");
switch (func) {
@@ -75,7 +71,6 @@ void gl_AlphaFunc( GLcontext* ctx, GLenum func, GLclampf ref )
-
/*
* Apply the alpha test to a span of pixels.
* In: rgba - array of pixels
@@ -84,8 +79,9 @@ void gl_AlphaFunc( GLcontext* ctx, GLenum func, GLclampf ref )
* Return: 0 = all pixels in the span failed the alpha test.
* 1 = one or more pixels passed the alpha test.
*/
-GLint gl_alpha_test( const GLcontext* ctx,
- GLuint n, CONST GLubyte rgba[][4], GLubyte mask[] )
+GLint
+_mesa_alpha_test( const GLcontext *ctx,
+ GLuint n, CONST GLubyte rgba[][4], GLubyte mask[] )
{
GLuint i;
GLubyte ref = ctx->Color.AlphaRef;