diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-21 08:45:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-21 08:45:16 +0100 |
| commit | 6e90a0e707aa6d28622f654078f25066bef4dc80 (patch) | |
| tree | cc95d3e984b2fc4503b5fc8ae731518a8c34fe7c /mesalib/src/gallium/auxiliary/util/u_texture.h | |
| parent | f75616ac3e99a6bb814803c823cb34533b9fc328 (diff) | |
| parent | bb953a87489963f63e65c797a1f2837382ff7808 (diff) | |
| download | vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.gz vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.bz2 vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 21 nov 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_texture.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_texture.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_texture.h b/mesalib/src/gallium/auxiliary/util/u_texture.h index 93b2f1e4c..b1c8c7091 100644 --- a/mesalib/src/gallium/auxiliary/util/u_texture.h +++ b/mesalib/src/gallium/auxiliary/util/u_texture.h @@ -27,6 +27,8 @@ #ifndef U_TEXTURE_H #define U_TEXTURE_H +#include "pipe/p_compiler.h" + #ifdef __cplusplus extern "C" { #endif @@ -44,7 +46,8 @@ extern "C" { */ void util_map_texcoords2d_onto_cubemap(unsigned face, const float *in_st, unsigned in_stride, - float *out_str, unsigned out_stride); + float *out_str, unsigned out_stride, + boolean allow_scale); #ifdef __cplusplus |