diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /mesalib/src/gallium/auxiliary | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/src/gallium/auxiliary')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_blit.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |