Mesa (master): gallium/util: attempt to fix blitting multisample texture arrays
Marek Olšák
mareko at kemper.freedesktop.org
Mon Mar 11 12:51:46 UTC 2013
Module: Mesa
Branch: master
Commit: 68ed4c9c89fd299ebc02dff3fa9938c797f417da
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68ed4c9c89fd299ebc02dff3fa9938c797f417da
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun Mar 3 17:33:11 2013 +0100
gallium/util: attempt to fix blitting multisample texture arrays
We don't have a test for this yet, but obviously the swizzle was wrong.
---
src/gallium/auxiliary/util/u_blitter.c | 2 +-
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 a851836..70fec91 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 7e36661..c53c2d0 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];
More information about the mesa-commit
mailing list