summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/image.h
diff options
context:
space:
mode:
authorChristian König <[email protected]>2010-11-11 21:07:42 +0100
committerChristian König <[email protected]>2010-11-11 21:07:42 +0100
commit195bbe8ce218533569dde1368d04da0fd229913d (patch)
tree29d3db04673f59dcfd6663c524a5c1343d5cbee6 /src/mesa/main/image.h
parent99b57bc20e839043ec6160502814085a0976fccc (diff)
parentd67df5dd9db1cede92f1b177c890f83809bb4582 (diff)
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/mesa/main/image.h')
-rw-r--r--src/mesa/main/image.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index b40717223e1..005fbccbeb0 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -27,8 +27,10 @@
#define IMAGE_H
-#include "mtypes.h"
+#include "glheader.h"
+struct gl_context;
+struct gl_pixelstore_attrib;
extern void
_mesa_swap2( GLushort *p, GLuint n );
@@ -52,7 +54,8 @@ extern GLint
_mesa_bytes_per_pixel( GLenum format, GLenum type );
extern GLboolean
-_mesa_is_legal_format_and_type( struct gl_context *ctx, GLenum format, GLenum type );
+_mesa_is_legal_format_and_type(const struct gl_context *ctx,
+ GLenum format, GLenum type);
extern GLboolean
_mesa_is_color_format(GLenum format);