diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-18 08:21:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-18 08:21:05 +0200 |
| commit | d7ddd6ead83965a10d450a580a9b6042c7b86f38 (patch) | |
| tree | 9ca8c23b6aa54418990c4d851e8da97c577636a7 /mesalib/src/mesa/main/dd.h | |
| parent | c72f683c50e774b21967f0121245a286539fa555 (diff) | |
| parent | 52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff) | |
| download | vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.gz vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.bz2 vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/dd.h')
| -rw-r--r-- | mesalib/src/mesa/main/dd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h index e6a1e68cb..0000a397a 100644 --- a/mesalib/src/mesa/main/dd.h +++ b/mesalib/src/mesa/main/dd.h @@ -251,14 +251,14 @@ struct dd_function_table { struct gl_texture_object *texObj); /** - * Called by glTexImage[123]D when user specifies a proxy texture - * target. - * - * \return GL_TRUE if the proxy test passes, or GL_FALSE if the test fails. + * Called by glTexImage, glCompressedTexImage, glCopyTexImage + * and glTexStorage to check if the dimensions of the texture image + * are too large. + * \param target any GL_PROXY_TEXTURE_x target + * \return GL_TRUE if the image is OK, GL_FALSE if too large */ GLboolean (*TestProxyTexImage)(struct gl_context *ctx, GLenum target, - GLint level, GLint internalFormat, - GLenum format, GLenum type, + GLint level, gl_format format, GLint width, GLint height, GLint depth, GLint border); /*@}*/ |