Mesa (master): u_blitter: don't create illegal shaders for 1D/3D/RECT/ CUBE MSAA

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Mar  4 07:18:24 2013 +0000

u_blitter: don't create illegal shaders for 1D/3D/RECT/CUBE MSAA

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

---

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

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index e37be4e..a851836 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -924,6 +924,11 @@ void util_blitter_cache_all_shaders(struct blitter_context *blitter)
              (target == PIPE_TEXTURE_CUBE_ARRAY))
             continue;
 
+	 if (i > 1 &&
+	     (target != PIPE_TEXTURE_2D &&
+	      target != PIPE_TEXTURE_2D_ARRAY))
+	    continue;
+
          blitter_get_fs_texfetch_col(ctx, target, i);
          blitter_get_fs_texfetch_depth(ctx, target, i);
          if (ctx->has_stencil_export) {