diff options
Diffstat (limited to 'src/mesa/main/formats.c')
| -rw-r--r-- | src/mesa/main/formats.c | 243 |
1 files changed, 122 insertions, 121 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 603ccac3a51..4a08d1a0158 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -57,22 +57,22 @@ struct mesa_format_info */ GLenum DataType; - GLubyte RedBits; - GLubyte GreenBits; - GLubyte BlueBits; - GLubyte AlphaBits; - GLubyte LuminanceBits; - GLubyte IntensityBits; - GLubyte DepthBits; - GLubyte StencilBits; + uint8_t RedBits; + uint8_t GreenBits; + uint8_t BlueBits; + uint8_t AlphaBits; + uint8_t LuminanceBits; + uint8_t IntensityBits; + uint8_t DepthBits; + uint8_t StencilBits; bool IsSRGBFormat; /** * To describe compressed formats. If not compressed, Width=Height=Depth=1. */ - GLubyte BlockWidth, BlockHeight, BlockDepth; - GLubyte BytesPerBlock; + uint8_t BlockWidth, BlockHeight, BlockDepth; + uint8_t BytesPerBlock; uint8_t Swizzle[4]; mesa_array_format ArrayFormat; @@ -105,9 +105,9 @@ _mesa_get_format_name(mesa_format 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 + * Note: return is signed, so as not to coerce math to unsigned. cf. fdo #37351 */ -GLint +int _mesa_get_format_bytes(mesa_format format) { if (_mesa_format_is_mesa_array_format(format)) { @@ -183,11 +183,11 @@ _mesa_get_format_bits(mesa_format format, GLenum pname) } -GLuint +unsigned int _mesa_get_format_max_bits(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); - GLuint max = MAX2(info->RedBits, info->GreenBits); + unsigned int max = MAX2(info->RedBits, info->GreenBits); max = MAX2(max, info->BlueBits); max = MAX2(max, info->AlphaBits); max = MAX2(max, info->LuminanceBits); @@ -318,7 +318,8 @@ _mesa_get_format_base_format(uint32_t format) * \param bh returns block height in pixels */ void -_mesa_get_format_block_size(mesa_format format, GLuint *bw, GLuint *bh) +_mesa_get_format_block_size(mesa_format format, + unsigned int *bw, unsigned int *bh) { const struct mesa_format_info *info = _mesa_get_format_info(format); /* Use _mesa_get_format_block_size_3d() for 3D blocks. */ @@ -339,9 +340,9 @@ _mesa_get_format_block_size(mesa_format format, GLuint *bw, GLuint *bh) */ void _mesa_get_format_block_size_3d(mesa_format format, - GLuint *bw, - GLuint *bh, - GLuint *bd) + unsigned int *bw, + unsigned int *bh, + unsigned int *bd) { const struct mesa_format_info *info = _mesa_get_format_info(format); *bw = info->BlockWidth; @@ -497,7 +498,7 @@ _mesa_format_from_array_format(uint32_t array_format) } /** Is the given format a compressed format? */ -GLboolean +bool _mesa_is_format_compressed(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -508,7 +509,7 @@ _mesa_is_format_compressed(mesa_format format) /** * Determine if the given format represents a packed depth/stencil buffer. */ -GLboolean +bool _mesa_is_format_packed_depth_stencil(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -520,7 +521,7 @@ _mesa_is_format_packed_depth_stencil(mesa_format format) /** * Is the given format a signed/unsigned integer color format? */ -GLboolean +bool _mesa_is_format_integer_color(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -534,7 +535,7 @@ _mesa_is_format_integer_color(mesa_format format) /** * Is the given format an unsigned integer format? */ -GLboolean +bool _mesa_is_format_unsigned(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -545,13 +546,13 @@ _mesa_is_format_unsigned(mesa_format format) /** * Does the given format store signed values? */ -GLboolean +bool _mesa_is_format_signed(mesa_format format) { if (format == MESA_FORMAT_R11G11B10_FLOAT || format == MESA_FORMAT_R9G9B9E5_FLOAT) { /* these packed float formats only store unsigned values */ - return GL_FALSE; + return false; } else { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -564,7 +565,7 @@ _mesa_is_format_signed(mesa_format format) /** * Is the given format an integer format? */ -GLboolean +bool _mesa_is_format_integer(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -620,9 +621,9 @@ _mesa_is_format_etc2(mesa_format format) case MESA_FORMAT_ETC2_SIGNED_RG11_EAC: case MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1: case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1: - return GL_TRUE; + return true; default: - return GL_FALSE; + return false; } } @@ -740,7 +741,7 @@ _mesa_get_uncompressed_format(mesa_format format) } -GLuint +unsigned int _mesa_format_num_components(mesa_format format) { const struct mesa_format_info *info = _mesa_get_format_info(format); @@ -788,21 +789,21 @@ _mesa_format_has_color_component(mesa_format format, int component) * Return number of bytes needed to store an image of the given size * in the given format. */ -GLuint -_mesa_format_image_size(mesa_format format, GLsizei width, - GLsizei height, GLsizei depth) +uint32_t +_mesa_format_image_size(mesa_format format, int width, + int height, int depth) { const struct mesa_format_info *info = _mesa_get_format_info(format); - GLuint sz; + uint32_t sz; /* Strictly speaking, a conditional isn't needed here */ if (info->BlockWidth > 1 || info->BlockHeight > 1 || info->BlockDepth > 1) { /* compressed format (2D only for now) */ - const GLuint bw = info->BlockWidth; - const GLuint bh = info->BlockHeight; - const GLuint bd = info->BlockDepth; - const GLuint wblocks = (width + bw - 1) / bw; - const GLuint hblocks = (height + bh - 1) / bh; - const GLuint dblocks = (depth + bd - 1) / bd; + const uint32_t bw = info->BlockWidth; + const uint32_t bh = info->BlockHeight; + const uint32_t bd = info->BlockDepth; + const uint32_t wblocks = (width + bw - 1) / bw; + const uint32_t hblocks = (height + bh - 1) / bh; + const uint32_t dblocks = (depth + bd - 1) / bd; sz = wblocks * hblocks * dblocks * info->BytesPerBlock; } else /* non-compressed */ @@ -817,8 +818,8 @@ _mesa_format_image_size(mesa_format format, GLsizei width, * accommodate very large textures. */ uint64_t -_mesa_format_image_size64(mesa_format format, GLsizei width, - GLsizei height, GLsizei depth) +_mesa_format_image_size64(mesa_format format, int width, + int height, int depth) { const struct mesa_format_info *info = _mesa_get_format_info(format); uint64_t sz; @@ -842,20 +843,20 @@ _mesa_format_image_size64(mesa_format format, GLsizei width, -GLint -_mesa_format_row_stride(mesa_format format, GLsizei width) +int32_t +_mesa_format_row_stride(mesa_format format, int width) { const struct mesa_format_info *info = _mesa_get_format_info(format); /* Strictly speaking, a conditional isn't needed here */ if (info->BlockWidth > 1 || info->BlockHeight > 1) { /* compressed format */ - const GLuint bw = info->BlockWidth; - const GLuint wblocks = (width + bw - 1) / bw; - const GLint stride = wblocks * info->BytesPerBlock; + const uint32_t bw = info->BlockWidth; + const uint32_t wblocks = (width + bw - 1) / bw; + const int32_t stride = wblocks * info->BytesPerBlock; return stride; } else { - const GLint stride = width * info->BytesPerBlock; + const int32_t stride = width * info->BytesPerBlock; return stride; } } @@ -1436,14 +1437,14 @@ _mesa_uncompressed_format_to_type_and_comps(mesa_format format, * \param swapBytes typically the current pixel pack/unpack byteswap state * \param[out] error GL_NO_ERROR if format is an expected input. * GL_INVALID_ENUM if format is an unexpected input. - * \return GL_TRUE if the formats match, GL_FALSE otherwise. + * \return true if the formats match, false otherwise. */ -GLboolean +bool _mesa_format_matches_format_and_type(mesa_format mesa_format, GLenum format, GLenum type, - GLboolean swapBytes, GLenum *error) + bool swapBytes, GLenum *error) { - const GLboolean littleEndian = _mesa_little_endian(); + const bool littleEndian = _mesa_little_endian(); if (error) *error = GL_NO_ERROR; @@ -1452,7 +1453,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, * significant. A type with _REV indicates that the assignments are * swapped, so they are listed from least significant to most significant. * - * Compressed formats will fall through and return GL_FALSE. + * Compressed formats will fall through and return false. * * For sanity, please keep this switch statement ordered the same as the * enums in formats.h. @@ -1462,92 +1463,92 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_NONE: case MESA_FORMAT_COUNT: - return GL_FALSE; + return false; case MESA_FORMAT_A8B8G8R8_UNORM: case MESA_FORMAT_A8B8G8R8_SRGB: if (format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8_REV && swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA && type == GL_UNSIGNED_BYTE && !littleEndian) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_INT_8_8_8_8_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_INT_8_8_8_8 && swapBytes) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_BYTE && littleEndian) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R8G8B8A8_UNORM: case MESA_FORMAT_R8G8B8A8_SRGB: if (format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8 && swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA && type == GL_UNSIGNED_BYTE && littleEndian) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_INT_8_8_8_8 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_INT_8_8_8_8_REV && swapBytes) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_BYTE && !littleEndian) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_B8G8R8A8_UNORM: case MESA_FORMAT_B8G8R8A8_SRGB: if (format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8 && swapBytes) - return GL_TRUE; + return true; if (format == GL_BGRA && type == GL_UNSIGNED_BYTE && littleEndian) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_A8R8G8B8_UNORM: case MESA_FORMAT_A8R8G8B8_SRGB: if (format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_BGRA && type == GL_UNSIGNED_INT_8_8_8_8_REV && swapBytes) - return GL_TRUE; + return true; if (format == GL_BGRA && type == GL_UNSIGNED_BYTE && !littleEndian) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_X8B8G8R8_UNORM: case MESA_FORMAT_R8G8B8X8_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_B8G8R8X8_UNORM: case MESA_FORMAT_X8R8G8B8_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_BGR_UNORM8: case MESA_FORMAT_BGR_SRGB8: @@ -1571,7 +1572,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, !swapBytes; case MESA_FORMAT_A4R4G4B4_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_A1B5G5R5_UNORM: return format == GL_RGBA && type == GL_UNSIGNED_SHORT_5_5_5_1 && @@ -1590,18 +1591,18 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, !swapBytes; case MESA_FORMAT_L4A4_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_L8A8_UNORM: case MESA_FORMAT_L8A8_SRGB: return format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE && littleEndian; case MESA_FORMAT_A8L8_UNORM: case MESA_FORMAT_A8L8_SRGB: - return GL_FALSE; + return false; case MESA_FORMAT_L16A16_UNORM: return format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_SHORT && littleEndian && !swapBytes; case MESA_FORMAT_A16L16_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_B2G3R3_UNORM: return format == GL_RGB && type == GL_UNSIGNED_BYTE_3_3_2; @@ -1611,27 +1612,27 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_A4B4G4R4_UNORM: if (format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && !swapBytes) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R4G4B4A4_UNORM: if (format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_4_4_4_4 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4 && swapBytes) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R5G5B5A1_UNORM: return format == GL_RGBA && type == GL_UNSIGNED_SHORT_1_5_5_5_REV; @@ -1677,7 +1678,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_R8G8_UNORM: return format == GL_RG && type == GL_UNSIGNED_BYTE && littleEndian; case MESA_FORMAT_G8R8_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_R_UNORM16: return format == GL_RED && type == GL_UNSIGNED_SHORT && @@ -1686,7 +1687,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, return format == GL_RG && type == GL_UNSIGNED_SHORT && littleEndian && !swapBytes; case MESA_FORMAT_G16R16_UNORM: - return GL_FALSE; + return false; case MESA_FORMAT_B10G10R10A2_UNORM: return format == GL_BGRA && type == GL_UNSIGNED_INT_2_10_10_10_REV && @@ -1697,14 +1698,14 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, !swapBytes; case MESA_FORMAT_X8_UINT_Z24_UNORM: case MESA_FORMAT_Z24_UNORM_S8_UINT: - return GL_FALSE; + return false; case MESA_FORMAT_Z_UNORM16: return format == GL_DEPTH_COMPONENT && type == GL_UNSIGNED_SHORT && !swapBytes; case MESA_FORMAT_Z24_UNORM_X8_UINT: - return GL_FALSE; + return false; case MESA_FORMAT_Z_UNORM32: return format == GL_DEPTH_COMPONENT && type == GL_UNSIGNED_INT && @@ -1876,25 +1877,25 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, return format == GL_RG && type == GL_BYTE && littleEndian && !swapBytes; case MESA_FORMAT_X8B8G8R8_SNORM: - return GL_FALSE; + return false; case MESA_FORMAT_A8B8G8R8_SNORM: if (format == GL_RGBA && type == GL_BYTE && !littleEndian) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_BYTE && littleEndian) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R8G8B8A8_SNORM: if (format == GL_RGBA && type == GL_BYTE && littleEndian) - return GL_TRUE; + return true; if (format == GL_ABGR_EXT && type == GL_BYTE && !littleEndian) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R_SNORM16: return format == GL_RED && type == GL_SHORT && @@ -1956,27 +1957,27 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_A4B4G4R4_UINT: if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_SHORT_4_4_4_4 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && swapBytes) - return GL_TRUE; - return GL_FALSE; + return true; + return false; case MESA_FORMAT_R4G4B4A4_UINT: if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_SHORT_4_4_4_4 && swapBytes) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_B4G4R4A4_UINT: return format == GL_BGRA_INTEGER && type == GL_UNSIGNED_SHORT_4_4_4_4_REV && !swapBytes; case MESA_FORMAT_A4R4G4B4_UINT: - return GL_FALSE; + return false; case MESA_FORMAT_A1B5G5R5_UINT: return format == GL_RGBA_INTEGER && type == GL_UNSIGNED_SHORT_5_5_5_1 && @@ -1995,42 +1996,42 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_A8B8G8R8_UINT: if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8_REV && swapBytes) - return GL_TRUE; - return GL_FALSE; + return true; + return false; case MESA_FORMAT_A8R8G8B8_UINT: if (format == GL_BGRA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8 && !swapBytes) - return GL_TRUE; + return true; if (format == GL_BGRA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8_REV && swapBytes) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R8G8B8A8_UINT: if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_RGBA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8 && swapBytes) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_B8G8R8A8_UINT: if (format == GL_BGRA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8_REV && !swapBytes) - return GL_TRUE; + return true; if (format == GL_BGRA_INTEGER && type == GL_UNSIGNED_INT_8_8_8_8 && swapBytes) - return GL_TRUE; + return true; - return GL_FALSE; + return false; case MESA_FORMAT_R9G9B9E5_FLOAT: return format == GL_RGB && type == GL_UNSIGNED_INT_5_9_9_9_REV && @@ -2063,7 +2064,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_RGBX_FLOAT32: case MESA_FORMAT_RGBX_UINT32: case MESA_FORMAT_RGBX_SINT32: - return GL_FALSE; + return false; case MESA_FORMAT_R10G10B10X2_UNORM: return format == GL_RGB && type == GL_UNSIGNED_INT_2_10_10_10_REV && @@ -2082,12 +2083,12 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_B8G8R8X8_SRGB: case MESA_FORMAT_X8R8G8B8_SRGB: - return GL_FALSE; + return false; default: assert(_mesa_is_format_compressed(mesa_format)); if (error) *error = GL_INVALID_ENUM; } - return GL_FALSE; + return false; } |