From 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 15 Jun 2012 08:28:24 +0200 Subject: fontconfig mesa pixman xserver git update 15 juni 2012 --- mesalib/src/gallium/auxiliary/util/u_blit.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesalib/src/gallium') diff --git a/mesalib/src/gallium/auxiliary/util/u_blit.c b/mesalib/src/gallium/auxiliary/util/u_blit.c index e5b97f720..9bd2ef52d 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blit.c +++ b/mesalib/src/gallium/auxiliary/util/u_blit.c @@ -419,7 +419,7 @@ util_blit_pixels_writemask(struct blit_state *ctx, dstX0, dstY0, dst->u.tex.first_layer,/* dest */ src_tex, src_level, &src_box); - return; + return; } if (dst_format == dst->format) { @@ -444,6 +444,9 @@ util_blit_pixels_writemask(struct blit_state *ctx, src_tex->target != PIPE_TEXTURE_2D && src_tex->target != PIPE_TEXTURE_RECT)) { + /* Make a temporary texture which contains a copy of the source pixels. + * Then we'll sample from the temporary texture. + */ struct pipe_resource texTemp; struct pipe_resource *tex; struct pipe_sampler_view sv_templ; @@ -515,6 +518,7 @@ util_blit_pixels_writemask(struct blit_state *ctx, pipe_resource_reference(&tex, NULL); } else { + /* Directly sample from the source resource/texture */ u_sampler_view_default_template(&sv_templ, src_tex, src_format); sampler_view = pipe->create_sampler_view(pipe, src_tex, &sv_templ); -- cgit v1.2.3