diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-24 06:33:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-24 06:33:14 +0000 |
| commit | 941e7f505285f0b77f232f700561c752ce75ff97 (patch) | |
| tree | 298cb649d97a46ea97835411ef517857f1dc70db /mesalib/src/mesa/main/formats.c | |
| parent | 98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (diff) | |
| parent | 94d512f7295ade7b381fba2e9e0bc0c434cf8b65 (diff) | |
| download | vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.tar.gz vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.tar.bz2 vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.zip | |
merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/formats.c')
| -rw-r--r-- | mesalib/src/mesa/main/formats.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index f0f30fe0a..b6210be61 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -1118,8 +1118,10 @@ _mesa_get_format_name(gl_format format) * Return bytes needed to store a block of pixels in the given format.
* Normally, a block is 1x1 (a single pixel). But for compressed formats
* a block may be 4x4 or 8x4, etc.
+ *
+ * Note: not GLuint, so as not to coerce math to unsigned. cf. fdo #37351
*/
-GLuint
+GLint
_mesa_get_format_bytes(gl_format format)
{
const struct gl_format_info *info = _mesa_get_format_info(format);
|