From: Dave Airlie <airlied@redhat.com>
Date: Wed, 30 Nov 2011 20:10:33 +0000 (+0000)
Subject: st/mesa: only resolve is number of samples is > 1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8c713626db33c40c18e24c880fe47d7948f4dcd7;p=mesa.git

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 <airlied@redhat.com>
---

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) {