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

Dave Airlie airlied at kemper.freedesktop.org
Sat Dec 10 09:05:05 UTC 2011


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Sat Dec 10 09:04:46 2011 +0000

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

This reverts commit 8c713626db33c40c18e24c880fe47d7948f4dcd7.

Didn't mean to push this at all

---

 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 8f0c2e8..750f541 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 && readFB->Visual.samples > 1) {
+   if (readFB->Visual.sampleBuffers > drawFB->Visual.sampleBuffers) {
       struct pipe_resolve_info info;
 
       if (dstX0 < dstX1) {




More information about the mesa-commit mailing list