From: Julien Cristau <julien.cris...@logilab.fr> Suggested-by: Ian Romanick <i...@freedesktop.org> Signed-off-by: Julien Cristau <julien.cris...@logilab.fr> --- src/glx/apple/glxreply.c | 2 +- src/glx/glxclient.h | 2 +- src/glx/pixel.c | 2 +- src/glx/singlepix.c | 8 ++++---- src/mapi/glapi/gen/glX_proto_send.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/glx/apple/glxreply.c b/src/glx/apple/glxreply.c index 6234e3c..db0817b 100644 --- a/src/glx/apple/glxreply.c +++ b/src/glx/apple/glxreply.c @@ -88,7 +88,7 @@ __glXReadPixelReply(Display * dpy, struct glx_context * gc, unsigned max_dim, else { _XRead(dpy, buf, size); - __glEmptyImage(gc, 3, width, height, depth, format, type, buf, dest); + __glEmptyImage(gc, width, height, depth, format, type, buf, dest); Xfree(buf); } } diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index f8ae450..6d7fc8d 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -718,7 +718,7 @@ extern void __glFillMap2d(GLint, GLint, GLint, GLint, GLint, ** Empty an image out of the reply buffer into the clients memory applying ** the pack modes to pack back into the clients requested format. */ -extern void __glEmptyImage(struct glx_context *, GLint, GLint, GLint, GLint, GLenum, +extern void __glEmptyImage(struct glx_context *, GLint, GLint, GLint, GLenum, GLenum, const GLubyte *, GLvoid *); diff --git a/src/glx/pixel.c b/src/glx/pixel.c index d508d62..15a5ed5 100644 --- a/src/glx/pixel.c +++ b/src/glx/pixel.c @@ -388,7 +388,7 @@ EmptyBitmap(struct glx_context * gc, GLint width, GLint height, */ /* ARGSUSED */ void -__glEmptyImage(struct glx_context * gc, GLint dim, GLint width, GLint height, +__glEmptyImage(struct glx_context * gc, GLint width, GLint height, GLint depth, GLenum format, GLenum type, const GLubyte * sourceImage, GLvoid * userdata) { diff --git a/src/glx/singlepix.c b/src/glx/singlepix.c index d8a7166..4c85cf0 100644 --- a/src/glx/singlepix.c +++ b/src/glx/singlepix.c @@ -80,7 +80,7 @@ __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type, } else { __GLX_SINGLE_GET_CHAR_ARRAY(((char *) rowBuf), widthsize); - __glEmptyImage(gc, 1, width, 1, 1, format, type, rowBuf, row); + __glEmptyImage(gc, width, 1, 1, format, type, rowBuf, row); Xfree((char *) rowBuf); } colBuf = (GLubyte *) Xmalloc(heightsize); @@ -94,7 +94,7 @@ __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type, } else { __GLX_SINGLE_GET_CHAR_ARRAY(((char *) colBuf), heightsize); - __glEmptyImage(gc, 1, height, 1, 1, format, type, colBuf, column); + __glEmptyImage(gc, height, 1, 1, format, type, colBuf, column); Xfree((char *) colBuf); } } @@ -174,7 +174,7 @@ void gl_dispatch_stub_GetSeparableFilterEXT (GLenum target, GLenum format, _XEatData(dpy, extra); } - __glEmptyImage(gc, 1, width, 1, 1, format, type, buf, row); + __glEmptyImage(gc, width, 1, 1, format, type, buf, row); extra = 4 - (heightsize & 3); _XRead(dpy, (char *) buf, heightsize); @@ -182,7 +182,7 @@ void gl_dispatch_stub_GetSeparableFilterEXT (GLenum target, GLenum format, _XEatData(dpy, extra); } - __glEmptyImage(gc, 1, height, 1, 1, format, type, buf, column); + __glEmptyImage(gc, height, 1, 1, format, type, buf, column); Xfree((char *) buf); } diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index 029f8d9..acf603a 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -248,7 +248,7 @@ __glXReadPixelReply( Display *dpy, struct glx_context * gc, unsigned max_dim, else { _XRead(dpy, buf, size); - __glEmptyImage(gc, 3, width, height, depth, format, type, + __glEmptyImage(gc, width, height, depth, format, type, buf, dest); Xfree(buf); } @@ -689,7 +689,7 @@ generic_%u_byte( GLint rop, const void * ptr ) else: print ' if (%s == 0) { %s = 1; }' % (d, d) - print ' __glEmptyImage(gc, 3, %s, %s, %s, %s, %s, %s_data(reply), %s);' % (w, h, d, output.img_format, output.img_type, xcb_name, output.name) + print ' __glEmptyImage(gc, %s, %s, %s, %s, %s, %s_data(reply), %s);' % (w, h, d, output.img_format, output.img_type, xcb_name, output.name) else: if f.reply_always_array: print ' (void)memcpy(%s, %s_data(reply), %s_data_length(reply) * sizeof(%s));' % (output.name, xcb_name, xcb_name, output.get_base_type_string()) -- 1.7.2.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev