Mesa (master): gallium/u_blit: bail out if src is a multisample texture

Marek Olšák mareko at kemper.freedesktop.org
Sat Aug 4 13:01:10 UTC 2012


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Jul 24 16:11:04 2012 +0200

gallium/u_blit: bail out if src is a multisample texture

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

---

 src/gallium/auxiliary/util/u_blit.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 1300872..3887e65 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -507,6 +507,12 @@ util_blit_pixels(struct blit_state *ctx,
       return;
    }
 
+   /* XXX Reading multisample textures is unimplemented. */
+   assert(src_tex->nr_samples <= 1);
+   if (src_tex->nr_samples > 1) {
+      return;
+   }
+
    /* It's a mistake to call this function with a stencil format and
     * without shader stencil export. We don't do software fallbacks here.
     * Ignore stencil and only copy depth.




More information about the mesa-commit mailing list