diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-07 10:45:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-07 10:45:44 +0100 |
| commit | cbcf519f983c24f5d315b4abc194e5d147dc0ab7 (patch) | |
| tree | 3f9cafad0ae5ba278eb444c4ec85f53155e7050d /mesalib/src/gallium/auxiliary/util/u_format.c | |
| parent | 012567f7279756f1fcc4aee30e5e72f0938fe3da (diff) | |
| parent | 956c20498738c242726b5a42ed28db8572a90bed (diff) | |
| download | vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.gz vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.bz2 vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa fontconfig git update 7 Feb 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_format.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c index 8228de1f2..18456371c 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.c +++ b/mesalib/src/gallium/auxiliary/util/u_format.c @@ -63,17 +63,14 @@ util_format_is_float(enum pipe_format format) /** Test if the format contains RGB, but not alpha */ boolean -util_format_is_rgb_no_alpha(enum pipe_format format) +util_format_has_alpha(enum pipe_format format) { const struct util_format_description *desc = util_format_description(format); - if ((desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB || - desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) && - desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_1) { - return TRUE; - } - return FALSE; + return (desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB || + desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) && + desc->swizzle[3] != UTIL_FORMAT_SWIZZLE_1; } |