Mesa (master): st/mesa: only resolve is number of samples is > 1

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 8c713626db33c40c18e24c880fe47d7948f4dcd7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c713626db33c40c18e24c880fe47d7948f4dcd7

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Nov 30 20:10:33 2011 +0000

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 at redhat.com>

---

 src/mesa/state_tracker/st_cb_blit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index 750f541..8f0c2e8 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) {