gallium/util: attempt to fix blitting multisample texture arrays

We don't have a test for this yet, but obviously the swizzle was wrong.

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index a85183644018114a94ef4e4e8b15b186746874f4..70fec9118ef0f986e1182069fb1a62bc637d4a6a 100644 (file)
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -703,7 +703,7 @@ static void blitter_set_texcoords(struct blitter_context_priv *ctx,
 
    case PIPE_TEXTURE_2D:
       for (i = 0; i < 4; i++) {
-         ctx->vertices[i][1][2] = (float) sample; /*r*/
+         ctx->vertices[i][1][3] = (float) sample; /*r*/
       }
       break;
 

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index 7e3666122bf660f3b7116e06866216e6219f0e0e..c53c2d024fbe84e4efe6a6ae9941b0c5a0b7e2c9 100644 (file)
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -400,7 +400,7 @@ util_make_fs_blit_msaa_gen(struct pipe_context *pipe,
          "DCL TEMP[0]\n"
 
          "F2U TEMP[0], IN[0]\n"
-         "TXF OUT[0]%s, TEMP[0].xyzz, SAMP[0], %s\n"
+         "TXF OUT[0]%s, TEMP[0], SAMP[0], %s\n"
          "END\n";
 
    const char *type = tgsi_texture_names[tgsi_tex];