From: Marek Olšák <maraeo@gmail.com>
Date: Sat, 1 Jun 2013 01:18:04 +0000 (+0200)
Subject: st/dri: resolve the back buffer only in SwapBuffers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a713d7b1b962129c4d480c56e7d29bc82f511a1f;p=mesa.git

st/dri: resolve the back buffer only in SwapBuffers

Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/state_trackers/dri/common/dri_drawable.c b/src/gallium/state_trackers/dri/common/dri_drawable.c
index 1c2bad42cbe..18d8d8988a9 100644
--- a/src/gallium/state_trackers/dri/common/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/common/dri_drawable.c
@@ -435,14 +435,14 @@ dri_flush(__DRIcontext *cPriv,
    /* Flush the drawable. */
    if ((flags & __DRI2_FLUSH_DRAWABLE) &&
        drawable->textures[ST_ATTACHMENT_BACK_LEFT]) {
-      if (drawable->stvis.samples > 1) {
+      if (drawable->stvis.samples > 1 &&
+          reason == __DRI2_THROTTLE_SWAPBUFFER) {
          /* Resolve the MSAA back buffer. */
          dri_pipe_blit(ctx->st->pipe,
                        drawable->textures[ST_ATTACHMENT_BACK_LEFT],
                        drawable->msaa_textures[ST_ATTACHMENT_BACK_LEFT]);
 
-         if (reason == __DRI2_THROTTLE_SWAPBUFFER &&
-             drawable->msaa_textures[ST_ATTACHMENT_FRONT_LEFT] &&
+         if (drawable->msaa_textures[ST_ATTACHMENT_FRONT_LEFT] &&
              drawable->msaa_textures[ST_ATTACHMENT_BACK_LEFT]) {
             swap_msaa_buffers = TRUE;
          }