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

[Marek Olšák]

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

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

st/mesa: only resolve if number of samples is > 1

Marek: this fixes a firefox crash and maybe even:
https://bugs.freedesktop.org/show_bug.cgi?id=45943

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Dave Airlie <airlied at redhat.com>
Signed-off-by: Marek Olšák <maraeo at gmail.com>

---

 src/mesa/state_tracker/st_cb_blit.c |    3 ++-
 1 files changed, 2 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..27da2c6 100644
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -178,7 +178,8 @@ 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) {