diff options
author | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
commit | a5179a42a3376f0d8c1d01456235b044854d8bdc (patch) | |
tree | 04018368b95d6eb802adbf083fdd774a0336be51 /mesalib/src/gallium/auxiliary/util/u_blit.h | |
parent | 4888b09cfc72713f460dd7457fb2b7eca0abb91c (diff) | |
parent | 55c05b8a12944349b00053253d3a49b223a9f4de (diff) | |
download | vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.gz vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.bz2 vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 20 Sep 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_blit.h')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_blit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_blit.h b/mesalib/src/gallium/auxiliary/util/u_blit.h index 56ab03083..bfcd1bb28 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blit.h +++ b/mesalib/src/gallium/auxiliary/util/u_blit.h @@ -73,6 +73,7 @@ util_blit_pixels_tex(struct blit_state *ctx, struct pipe_sampler_view *src_sampler_view, int srcX0, int srcY0, int srcX1, int srcY1, + unsigned src_face, struct pipe_surface *dst, int dstX0, int dstY0, int dstX1, int dstY1, |