From 8c713626db33c40c18e24c880fe47d7948f4dcd7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 30 Nov 2011 20:10:33 +0000 Subject: st/mesa: only resolve is number of samples is > 1 This fixes the firefox crash but I've no idea if its correct. Signed-off-by: Dave Airlie --- src/mesa/state_tracker/st_cb_blit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index 750f541b5dd..8f0c2e8716a 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -178,7 +178,7 @@ st_BlitFramebuffer(struct gl_context *ctx, st->pipe->render_condition(st->pipe, NULL, 0); } - if (readFB->Visual.sampleBuffers > drawFB->Visual.sampleBuffers) { + if (readFB->Visual.sampleBuffers > drawFB->Visual.sampleBuffers && readFB->Visual.samples > 1) { struct pipe_resolve_info info; if (dstX0 < dstX1) { -- cgit v1.2.3