diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-03-31 11:43:49 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-05-12 12:12:57 +0800 |
| commit | e33ad4999e5f8a690a72ad6ce4e6d36328173430 (patch) | |
| tree | ada6d72d104c875c4986523bff2bc308d05adb9c | |
| parent | b093016bd0660cc4ac6142aa8d4d6add5b6bfce8 (diff) | |
st/mesa: Make st_cb_accum.h FEATURE_accum aware.
This change allows st_cb_accum.h to be used without knowing if
FEATURE_accum is enabled.
| -rw-r--r-- | src/mesa/state_tracker/st_cb_accum.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_accum.h | 18 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cb_accum.c b/src/mesa/state_tracker/st_cb_accum.c index ded0ba9c6a..425e7987d3 100644 --- a/src/mesa/state_tracker/st_cb_accum.c +++ b/src/mesa/state_tracker/st_cb_accum.c @@ -45,6 +45,8 @@ #include "util/u_tile.h" +#if FEATURE_accum + /** * For hardware that supports deep color buffers, we could accelerate * most/all the accum operations with blending/texturing. @@ -333,3 +335,5 @@ void st_init_accum_functions(struct dd_function_table *functions) { functions->Accum = st_Accum; } + +#endif /* FEATURE_accum */ diff --git a/src/mesa/state_tracker/st_cb_accum.h b/src/mesa/state_tracker/st_cb_accum.h index ed9b7dab94..7d52481c82 100644 --- a/src/mesa/state_tracker/st_cb_accum.h +++ b/src/mesa/state_tracker/st_cb_accum.h @@ -30,10 +30,28 @@ #define ST_CB_ACCUM_H +#include "main/mtypes.h" + +#if FEATURE_accum + extern void st_clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb); extern void st_init_accum_functions(struct dd_function_table *functions); +#else + +static INLINE void +st_clear_accum_buffer(GLcontext *ctx, struct gl_renderbuffer *rb) +{ + ASSERT_NO_FEATURE(); +} + +static INLINE void +st_init_accum_functions(struct dd_function_table *functions) +{ +} + +#endif /* FEATURE_accum */ #endif /* ST_CB_ACCUM_H */ diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 806f8777f2..24360fa8bc 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -302,9 +302,7 @@ void st_init_driver_functions(struct dd_function_table *functions) { _mesa_init_glsl_driver_functions(functions); -#if FEATURE_accum st_init_accum_functions(functions); -#endif #if FEATURE_EXT_framebuffer_blit st_init_blit_functions(functions); #endif |