diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-07 13:28:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-07 13:28:57 +0000 |
| commit | 14b1cb8d5a27ec9716d3f790fce95f0469e35605 (patch) | |
| tree | 6c94dc9f37b19b995bec603141442b1b93e8c9d2 /mesalib/src/mesa/main/attrib.h | |
| parent | 93c85587c691f9b91e7c2d8bda50f453e0f6674d (diff) | |
| download | vcxsrv-14b1cb8d5a27ec9716d3f790fce95f0469e35605.tar.gz vcxsrv-14b1cb8d5a27ec9716d3f790fce95f0469e35605.tar.bz2 vcxsrv-14b1cb8d5a27ec9716d3f790fce95f0469e35605.zip | |
Updated to Mesa 7.7
Diffstat (limited to 'mesalib/src/mesa/main/attrib.h')
| -rw-r--r-- | mesalib/src/mesa/main/attrib.h | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/mesalib/src/mesa/main/attrib.h b/mesalib/src/mesa/main/attrib.h index 2cf8fe693..6b48a1766 100644 --- a/mesalib/src/mesa/main/attrib.h +++ b/mesalib/src/mesa/main/attrib.h @@ -26,10 +26,10 @@ #define ATTRIB_H -#include "mtypes.h" +#include "main/mtypes.h" -#if _HAVE_FULL_GL +#if FEATURE_attrib_stack extern void GLAPIENTRY _mesa_PushAttrib( GLbitfield mask ); @@ -43,18 +43,34 @@ _mesa_PushClientAttrib( GLbitfield mask ); extern void GLAPIENTRY _mesa_PopClientAttrib( void ); +extern void +_mesa_init_attrib_dispatch(struct _glapi_table *disp); + +#else /* FEATURE_attrib_stack */ + +static INLINE void +_mesa_PushClientAttrib( GLbitfield mask ) +{ + ASSERT_NO_FEATURE(); +} + +static INLINE void +_mesa_PopClientAttrib( void ) +{ + ASSERT_NO_FEATURE(); +} + +static INLINE void +_mesa_init_attrib_dispatch(struct _glapi_table *disp) +{ +} + +#endif /* FEATURE_attrib_stack */ + extern void _mesa_init_attrib( GLcontext *ctx ); extern void _mesa_free_attrib_data( GLcontext *ctx ); -#else - -/** No-op */ -#define _mesa_init_attrib( c ) ((void)0) -#define _mesa_free_attrib_data( c ) ((void)0) - -#endif - -#endif +#endif /* ATTRIB_H */ |