diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
| commit | 30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea (patch) | |
| tree | 7ae924e3fb64c93a0f59e55fd08a914db9bb551b /mesalib/src/mesa/main/texgetimage.c | |
| parent | 55a9a54c65cd0ff58966408ea4d7879a3d9c749c (diff) | |
| parent | 176eab9e8277db1549bfc6c9ae805c4e1858f0b0 (diff) | |
| download | vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.gz vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.bz2 vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xserver git update 25 Mar 2013
Diffstat (limited to 'mesalib/src/mesa/main/texgetimage.c')
| -rw-r--r-- | mesalib/src/mesa/main/texgetimage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index 7299a4b23..74b09ef2c 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -518,6 +518,7 @@ get_tex_rgba(struct gl_context *ctx, GLuint dimensions, if (type_needs_clamping(type)) { /* the returned image type can't have negative values */ if (dataType == GL_FLOAT || + dataType == GL_HALF_FLOAT || dataType == GL_SIGNED_NORMALIZED || format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) { |