diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2015-01-13 08:33:19 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <itoral@igalia.com> | 2015-01-14 07:57:31 +0100 |
| commit | c6a2628950202d0792b58e4d7b4d574b6051bdf6 (patch) | |
| tree | 9f622502d4b7ecca7ff318a20e5ee7d0ec9e06e3 /src/mesa/main/format_utils.c | |
| parent | ae417957e04f5f52ac1a15f27c153bc2b426d7dd (diff) | |
| download | external_mesa3d-c6a2628950202d0792b58e4d7b4d574b6051bdf6.zip external_mesa3d-c6a2628950202d0792b58e4d7b4d574b6051bdf6.tar.gz external_mesa3d-c6a2628950202d0792b58e4d7b4d574b6051bdf6.tar.bz2 | |
mesa: rename RGBA8888_* format constants to something appropriate.
The 8888 suggests 8-bit components which is not correct, so
replace that with the actual size of the components in each
format.
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Diffstat (limited to 'src/mesa/main/format_utils.c')
| -rw-r--r-- | src/mesa/main/format_utils.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c index bebc974..eb650a2 100644 --- a/src/mesa/main/format_utils.c +++ b/src/mesa/main/format_utils.c @@ -27,16 +27,16 @@ #include "format_pack.h" #include "format_unpack.h" -const mesa_array_format RGBA8888_FLOAT = +const mesa_array_format RGBA32_FLOAT = MESA_ARRAY_FORMAT(4, 1, 1, 1, 4, 0, 1, 2, 3); -const mesa_array_format RGBA8888_UBYTE = +const mesa_array_format RGBA8_UBYTE = MESA_ARRAY_FORMAT(1, 0, 0, 1, 4, 0, 1, 2, 3); -const mesa_array_format RGBA8888_UINT = +const mesa_array_format RGBA32_UINT = MESA_ARRAY_FORMAT(4, 0, 0, 0, 4, 0, 1, 2, 3); -const mesa_array_format RGBA8888_INT = +const mesa_array_format RGBA32_INT = MESA_ARRAY_FORMAT(4, 1, 0, 0, 4, 0, 1, 2, 3); static void @@ -257,7 +257,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, if (!rebase_swizzle) { /* Handle the cases where we can directly unpack */ if (!src_format_is_mesa_array_format) { - if (dst_array_format == RGBA8888_FLOAT) { + if (dst_array_format == RGBA32_FLOAT) { for (row = 0; row < height; ++row) { _mesa_unpack_rgba_row(src_format, width, src, (float (*)[4])dst); @@ -265,7 +265,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, dst += dst_stride; } return; - } else if (dst_array_format == RGBA8888_UBYTE) { + } else if (dst_array_format == RGBA8_UBYTE) { assert(!_mesa_is_format_integer_color(src_format)); for (row = 0; row < height; ++row) { _mesa_unpack_ubyte_rgba_row(src_format, width, @@ -274,7 +274,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, dst += dst_stride; } return; - } else if (dst_array_format == RGBA8888_UINT && + } else if (dst_array_format == RGBA32_UINT && _mesa_is_format_unsigned(src_format)) { assert(_mesa_is_format_integer_color(src_format)); for (row = 0; row < height; ++row) { @@ -289,7 +289,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, /* Handle the cases where we can directly pack */ if (!dst_format_is_mesa_array_format) { - if (src_array_format == RGBA8888_FLOAT) { + if (src_array_format == RGBA32_FLOAT) { for (row = 0; row < height; ++row) { _mesa_pack_float_rgba_row(dst_format, width, (const float (*)[4])src, dst); @@ -297,7 +297,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, dst += dst_stride; } return; - } else if (src_array_format == RGBA8888_UBYTE) { + } else if (src_array_format == RGBA8_UBYTE) { assert(!_mesa_is_format_integer_color(dst_format)); for (row = 0; row < height; ++row) { _mesa_pack_ubyte_rgba_row(dst_format, width, @@ -306,7 +306,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, dst += dst_stride; } return; - } else if (src_array_format == RGBA8888_UINT && + } else if (src_array_format == RGBA32_UINT && _mesa_is_format_unsigned(dst_format)) { assert(_mesa_is_format_integer_color(dst_format)); for (row = 0; row < height; ++row) { |