aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/teximage.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-18 08:21:05 +0200
committermarha <marha@users.sourceforge.net>2012-09-18 08:21:05 +0200
commitd7ddd6ead83965a10d450a580a9b6042c7b86f38 (patch)
tree9ca8c23b6aa54418990c4d851e8da97c577636a7 /mesalib/src/mesa/main/teximage.h
parentc72f683c50e774b21967f0121245a286539fa555 (diff)
parent52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff)
downloadvcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.gz
vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.bz2
vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/teximage.h')
-rw-r--r--mesalib/src/mesa/main/teximage.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index 36fd1c2bc..c7c32d8ac 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -128,8 +128,8 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target);
extern GLboolean
_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- GLint internalFormat, GLenum format, GLenum type,
- GLint width, GLint height, GLint depth, GLint border);
+ gl_format format,
+ GLint width, GLint height, GLint depth, GLint border);
extern GLuint
@@ -142,6 +142,11 @@ extern GLenum
_mesa_es_error_check_format_and_type(GLenum format, GLenum type,
unsigned dimensions);
+extern GLboolean
+_mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
+ GLint level, GLint width, GLint height,
+ GLint depth, GLint border);
+
/**
* Lock a texture for updating. See also _mesa_lock_context_textures().
*/