From accd8a3364ffd1e91a4ab52b06b5e3b9d250ae92 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 18 Mar 2013 16:33:08 +0100 Subject: libX11 mesa git update 18 Mar 2013 libX11 commit f49bb2dd6d4ea45c55bd21acc0efe2b764441020 mesa commit 2da8ee16a8b126d15f34552916c77b203be326db --- mesalib/src/gallium/auxiliary/util/u_blitter.c | 2 +- mesalib/src/gallium/auxiliary/util/u_dump_state.c | 3 +-- mesalib/src/gallium/auxiliary/util/u_simple_shaders.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'mesalib/src/gallium/auxiliary/util') diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index a85183644..70fec9118 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/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/mesalib/src/gallium/auxiliary/util/u_dump_state.c b/mesalib/src/gallium/auxiliary/util/u_dump_state.c index d7df5b495..2f28f3c84 100644 --- a/mesalib/src/gallium/auxiliary/util/u_dump_state.c +++ b/mesalib/src/gallium/auxiliary/util/u_dump_state.c @@ -722,9 +722,8 @@ util_dump_vertex_element(FILE *stream, const struct pipe_vertex_element *state) util_dump_struct_begin(stream, "pipe_vertex_element"); util_dump_member(stream, uint, state, src_offset); - + util_dump_member(stream, uint, state, instance_divisor); util_dump_member(stream, uint, state, vertex_buffer_index); - util_dump_member(stream, format, state, src_format); util_dump_struct_end(stream); diff --git a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c index 7e3666122..c53c2d024 100644 --- a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c +++ b/mesalib/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]; -- cgit v1.2.3