summaryrefslogtreecommitdiff
path: root/src/mesa/main/pixel.h
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2009-09-07 16:59:27 +0800
committerChia-I Wu <olvaffe@gmail.com>2009-09-12 20:55:55 +0800
commit57377d5d69ecdf03e4fa2ef44dfbb7fb37f3f799 (patch)
treed119bd247072ec2a1639d69e7f5ab378bfe23602 /src/mesa/main/pixel.h
parentb565e7b88c5604197a1393dda7b4ad57a835d4e5 (diff)
mesa/main: Make FEATURE_pixel_transfer follow feature conventions.
As shown in mfeatures.h, this allows users of pixel.h to work without knowing if the feature is available.
Diffstat (limited to 'src/mesa/main/pixel.h')
-rw-r--r--src/mesa/main/pixel.h25
1 files changed, 22 insertions, 3 deletions
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index cb6c5262a3..7a901aec10 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -33,9 +33,11 @@
#define PIXEL_H
-#include "mtypes.h"
+#include "main/mtypes.h"
+#if FEATURE_pixel_transfer
+
/** \name API functions */
/*@{*/
@@ -68,13 +70,30 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
/*@}*/
-
extern void
_mesa_update_pixel( GLcontext *ctx, GLuint newstate );
extern void
+_mesa_init_pixel_dispatch( struct _glapi_table * disp );
+
+#else /* FEATURE_pixel_transfer */
+
+static INLINE void
+_mesa_update_pixel(GLcontext *ctx, GLuint newstate)
+{
+}
+
+static INLINE void
+_mesa_init_pixel_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_pixel_transfer */
+
+
+extern void
_mesa_init_pixel( GLcontext * ctx );
/*@}*/
-#endif
+#endif /* PIXEL_H */