summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/accum.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/accum.c')
-rw-r--r--src/mesa/main/accum.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 68e567bdf1e..1e8cce0ec34 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -1,4 +1,4 @@
-/* $Id: accum.c,v 1.10 1999/11/08 07:36:43 brianp Exp $ */
+/* $Id: accum.c,v 1.11 1999/11/11 01:22:25 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -25,22 +25,13 @@
*/
-/* $XFree86: xc/lib/GL/mesa/src/accum.c,v 1.3 1999/04/04 00:20:17 dawes Exp $ */
-
#ifdef PC_HEADER
#include "all.h"
#else
-#ifndef XFree86Server
-#include <assert.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#else
-#include "GL/xf86glx.h"
-#endif
+#include "glheader.h"
#include "accum.h"
#include "context.h"
-#include "macros.h"
+#include "mem.h"
#include "masking.h"
#include "span.h"
#include "types.h"
@@ -101,9 +92,10 @@ void gl_alloc_accum_buffer( GLcontext *ctx )
-void gl_ClearAccum( GLcontext *ctx,
- GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
+void
+_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
+ GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glAccum");
ctx->Accum.ClearColor[0] = CLAMP( red, -1.0, 1.0 );
@@ -139,8 +131,10 @@ static void rescale_accum( GLcontext *ctx )
-void gl_Accum( GLcontext *ctx, GLenum op, GLfloat value )
+void
+_mesa_Accum( GLenum op, GLfloat value )
{
+ GET_CURRENT_CONTEXT(ctx);
GLuint xpos, ypos, width, height, width4;
GLfloat acc_scale;
GLubyte rgba[MAX_WIDTH][4];