diff options
author | marha <marha@users.sourceforge.net> | 2012-02-09 08:46:41 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-02-09 08:46:41 +0100 |
commit | 535951cba015f2a2b63292e0ca983d0d6e736b71 (patch) | |
tree | 8c0e0364a27f250e926abe165b82ca12e5a841bf /mesalib/src/mesa/main/image.h | |
parent | ebb6162f9cbc1af0fac0b670b5aa38c8bb7a7446 (diff) | |
parent | 474621addc25cb22865c54b70ffbec07c82eb04c (diff) | |
download | vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.tar.gz vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.tar.bz2 vcxsrv-535951cba015f2a2b63292e0ca983d0d6e736b71.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/image.h')
-rw-r--r-- | mesalib/src/mesa/main/image.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/image.h b/mesalib/src/mesa/main/image.h index e4961ed3d..f1ed88379 100644 --- a/mesalib/src/mesa/main/image.h +++ b/mesalib/src/mesa/main/image.h @@ -53,9 +53,9 @@ _mesa_components_in_format( GLenum format ); extern GLint _mesa_bytes_per_pixel( GLenum format, GLenum type ); -extern GLboolean -_mesa_is_legal_format_and_type(const struct gl_context *ctx, - GLenum format, GLenum type); +extern GLenum +_mesa_error_check_format_and_type(const struct gl_context *ctx, + GLenum format, GLenum type); extern GLboolean _mesa_is_color_format(GLenum format); |