diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 14:16:22 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2009-09-15 14:16:22 +0800 |
| commit | e2ba90a9cc762cf00a168f0a59d31e7dc52fc42e (patch) | |
| tree | fe3206d7602ad935296884742980f3c4d30bd867 /src/mesa/main/histogram.h | |
| parent | 11a4292d4eb515813b82b8d688a318adef66b3e6 (diff) | |
| parent | b4b8800315637d9218a81c76f09df7d601710d29 (diff) | |
Merge commit 'eee/mesa-es' into android
Diffstat (limited to 'src/mesa/main/histogram.h')
| -rw-r--r-- | src/mesa/main/histogram.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h index 367e9b11ba..ce3246baf4 100644 --- a/src/mesa/main/histogram.h +++ b/src/mesa/main/histogram.h @@ -36,10 +36,9 @@ #ifndef HISTOGRAM_H #define HISTOGRAM_H -#include "glheader.h" -#include "mtypes.h" +#include "main/mtypes.h" -#if _HAVE_FULL_GL +#if FEATURE_histogram extern void GLAPIENTRY _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values); @@ -71,13 +70,18 @@ _mesa_ResetHistogram(GLenum target); extern void GLAPIENTRY _mesa_ResetMinmax(GLenum target); -extern void _mesa_init_histogram( GLcontext * ctx ); +extern void +_mesa_init_histogram_dispatch(struct _glapi_table *disp); + +#else /* FEATURE_histogram */ -#else +static INLINE void +_mesa_init_histogram_dispatch(struct _glapi_table *disp) +{ +} -/** No-op */ -#define _mesa_init_histogram( c ) ((void) 0) +#endif /* FEATURE_histogram */ -#endif +extern void _mesa_init_histogram( GLcontext * ctx ); -#endif +#endif /* HISTOGRAM_H */ |