From 6b329b9274b18c50f4177eef7ee087d50ebc1525 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 26 Apr 2011 14:54:41 -0600 Subject: Squashed commit of the following: commit 864fe253b04105b7469e5f7b064dc37637b944f8 Author: Brian Paul Date: Thu Apr 21 20:13:07 2011 -0600 mesa: s/exec/disp/ in _mesa_init_histogram_dispatch() This function isn't normally compiled (FEATURE_histogram). commit f4bf45e2b94b582cacd19cdca873c5be627e4250 Author: nobled Date: Thu Apr 21 07:53:58 2011 -0600 mesa: hook up GL_ARB_robustness dispatch functions ...and advertise the extension. Signed-off-by: Brian Paul commit 2b89e38e5f572dc40cebc06381ae7c5d04386998 Author: nobled Date: Thu Apr 21 07:53:58 2011 -0600 mesa: regenerated API files for GL_ARB_robustness Signed-off-by: Brian Paul commit 5d5ebfb7135cec9d833adef86cbf4d0f3d9beca8 Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 glapi: add ARB_robustness xml Signed-off-by: Brian Paul commit 0159d1d6d99f4bbc18381dc2081c20d3aff17ac9 Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: implement GL_ARB_robustness functions Signed-off-by: Brian Paul commit 938fd71f4c4742f274922d53492a7290ab8d9c9b Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: add context fields for GL_ARB_robustness Signed-off-by: Brian Paul commit 72075137bc79e65be03dac7e97b6dba93c3a86a4 Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: standardize more bounds-checking error messages Signed-off-by: Brian Paul commit 32a3fc23746db49da903fbc08afa0135af3007d2 Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: standardize some bounds-checking error messages Signed-off-by: Brian Paul commit cecbf1f4d164207de373dec0cadee2e84e1f9656 Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: add more bounds-checking support for client memory buffers Signed-off-by: Brian Paul commit edc895b52383d5bd274422db56adead1d81daf5f Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: add bounds-checking support for client memory buffers Signed-off-by: Brian Paul commit 3a96ef28a538f158a219b406cd090dee70470c85 Author: nobled Date: Thu Apr 21 07:53:57 2011 -0600 mesa: use is_bufferobj() helper function Signed-off-by: Brian Paul --- src/mesa/main/texgetimage.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/mesa/main/texgetimage.h') diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h index ef420ddabf5..8612705ca88 100644 --- a/src/mesa/main/texgetimage.h +++ b/src/mesa/main/texgetimage.h @@ -51,10 +51,15 @@ _mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level extern void GLAPIENTRY _mesa_GetTexImage( GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels ); - +extern void GLAPIENTRY +_mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format, + GLenum type, GLsizei bufSize, GLvoid *pixels ); extern void GLAPIENTRY _mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img); +extern void GLAPIENTRY +_mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, + GLvoid *img); #endif /* TEXGETIMAGE_H */ -- cgit v1.2.3