Module: Mesa Branch: master Commit: 8fe6755ed52acfb88a7a787c3406b64fcdd80e6e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fe6755ed52acfb88a7a787c3406b64fcdd80e6e
Author: Brian Paul <bri...@vmware.com> Date: Tue Jan 10 08:16:38 2012 -0700 mesa: move _mesa_clear_accum_buffer() inside FEATURE_accum test Fixes _mesa_clear_accum_buffer() being multiply defined if FEATURE_accum is false. Tested-by: Chih-Wei Huang <cwhu...@android-x86.org> --- src/mesa/main/accum.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index a8c30c2..df6f219 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -117,19 +117,6 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp) } -#endif /* FEATURE_accum */ - - -void -_mesa_init_accum( struct gl_context *ctx ) -{ - /* Accumulate buffer group */ - ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 ); -} - - - - /** * Clear the accumulation buffer by mapping the renderbuffer and * writing the clear color to it. Called by the driver's implementation @@ -507,3 +494,14 @@ _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value) break; } } + + +#endif /* FEATURE_accum */ + + +void +_mesa_init_accum( struct gl_context *ctx ) +{ + /* Accumulate buffer group */ + ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 ); +} _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit