-/* $Id: accum.c,v 1.33 2000/12/26 05:09:27 keithw Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 5.1
*
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 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"),
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-
-#ifdef PC_HEADER
-#include "all.h"
-#else
#include "glheader.h"
#include "accum.h"
#include "context.h"
+#include "imports.h"
#include "macros.h"
-#include "mem.h"
#include "state.h"
#include "mtypes.h"
-#include "swrast/swrast.h"
-#endif
-
-
-void
+void GLAPIENTRY
_mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
{
GLfloat tmp[4];
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
- tmp[0] = CLAMP( red, -1.0, 1.0 );
- tmp[1] = CLAMP( green, -1.0, 1.0 );
- tmp[2] = CLAMP( blue, -1.0, 1.0 );
- tmp[3] = CLAMP( alpha, -1.0, 1.0 );
+ tmp[0] = CLAMP( red, -1.0F, 1.0F );
+ tmp[1] = CLAMP( green, -1.0F, 1.0F );
+ tmp[2] = CLAMP( blue, -1.0F, 1.0F );
+ tmp[3] = CLAMP( alpha, -1.0F, 1.0F );
if (TEST_EQ_4V(tmp, ctx->Accum.ClearColor))
return;
COPY_4FV( ctx->Accum.ClearColor, tmp );
}
-/* Should really be a driver-supplied function?
- */
-void
+
+void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value )
{
GET_CURRENT_CONTEXT(ctx);
GLuint xpos, ypos, width, height;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
- if (ctx->Visual.AccumRedBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {
- gl_error(ctx, GL_INVALID_OPERATION, "glAccum");
+ if (ctx->Visual.accumRedBits == 0 || ctx->DrawBuffer != ctx->ReadBuffer) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glAccum");
return;
}
if (ctx->NewState)
- gl_update_state( ctx );
+ _mesa_update_state( ctx );
+
+ if (ctx->RenderMode != GL_RENDER) {
+ /* no-op */
+ return;
+ }
/* Determine region to operate upon. */
if (ctx->Scissor.Enabled) {
height = ctx->DrawBuffer->Height;
}
- if (!ctx->Driver.Accum ||
- !ctx->Driver.Accum( ctx, op, value, xpos, ypos, width, height ))
- _swrast_Accum( ctx, op, value, xpos, ypos, width, height );
+ ctx->Driver.Accum( ctx, op, value, xpos, ypos, width, height );
+}
+
+void
+_mesa_init_accum( GLcontext *ctx )
+{
+ /* Accumulate buffer group */
+ ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );
}