diff options
| author | Brian Paul <brianp@vmware.com> | 2012-01-10 08:16:38 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-01-10 09:09:02 -0700 |
| commit | 8fe6755ed52acfb88a7a787c3406b64fcdd80e6e (patch) | |
| tree | 8906b3b81717b0c3b78be4300ea51f2ca56f1db5 /src/mesa/main/accum.c | |
| parent | 9b1117095a78bbcbf22fef077f001d0fce969a0e (diff) | |
| download | external_mesa3d-8fe6755ed52acfb88a7a787c3406b64fcdd80e6e.zip external_mesa3d-8fe6755ed52acfb88a7a787c3406b64fcdd80e6e.tar.gz external_mesa3d-8fe6755ed52acfb88a7a787c3406b64fcdd80e6e.tar.bz2 | |
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 <cwhuang@android-x86.org>
Diffstat (limited to 'src/mesa/main/accum.c')
| -rw-r--r-- | 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 ); +} |