diff options
| author | Marek Olšák <[email protected]> | 2013-03-03 17:33:11 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-03-11 13:43:36 +0100 |
| commit | 68ed4c9c89fd299ebc02dff3fa9938c797f417da (patch) | |
| tree | dce0e0fba95645cac487fece1b06f071cad4476e /src | |
| parent | 52efa01de0c24ed59079a888b7ba1ad6bc5ebaf8 (diff) | |
gallium/util: attempt to fix blitting multisample texture arrays
We don't have a test for this yet, but obviously the swizzle was wrong.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_simple_shaders.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index a8518364401..70fec9118ef 100644 --- 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 7e3666122bf..c53c2d024fb 100644 --- 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]; |