From 762b7fde3d57d3a151f98535fd31516b7e823bc0 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 30 Apr 2012 10:36:15 +0200 Subject: fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012 --- mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'mesalib/src/mesa/state_tracker/st_cb_drawpixels.c') diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 5e078a85e..9a3f22465 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -1509,7 +1509,15 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, readY = srcy; readW = width; readH = height; - _mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack); + if (!_mesa_clip_readpixels(ctx, &readX, &readY, &readW, &readH, &pack)) { + /* The source region is completely out of bounds. Do nothing. + * The GL spec says "Results of copies from outside the window, + * or from regions of the window that are not exposed, are + * hardware dependent and undefined." + */ + return; + } + readW = MAX2(0, readW); readH = MAX2(0, readH); -- cgit v1.2.3