diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2015-02-02 13:59:27 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <itoral@igalia.com> | 2015-02-04 08:08:34 +0100 |
| commit | 1b029f8a4aa85546a8932f9005373c6c34a0eb7a (patch) | |
| tree | 360ab7388d90cb731883681084b6c5be142f8f4c | |
| parent | 6fd4a61ad6f19bcc8d693df6f84142ef7379509b (diff) | |
mesa: Fix _mesa_format_convert fallback path when src is not an array format
When a rebase swizzle is provided and we call _mesa_swizzle_and_convert
after unpacking the source format we were always passing normalized=false.
We should pass true or false depending on the formats involved in the
conversion for the byte and float paths (the integer path cannot ever be
normalized).
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Tested-by: Mark Janes <mark.a.janes@intel.com>
| -rw-r--r-- | src/mesa/main/format_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c index 4b44befaf4b..00061dedbfd 100644 --- a/src/mesa/main/format_utils.c +++ b/src/mesa/main/format_utils.c @@ -499,7 +499,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, MESA_ARRAY_FORMAT_TYPE_FLOAT, 4, tmp_float + row * width, MESA_ARRAY_FORMAT_TYPE_FLOAT, 4, - rebase_swizzle, false, width); + rebase_swizzle, normalized, width); src += src_stride; } } @@ -543,7 +543,7 @@ _mesa_format_convert(void *void_dst, uint32_t dst_format, size_t dst_stride, MESA_ARRAY_FORMAT_TYPE_UBYTE, 4, tmp_ubyte + row * width, MESA_ARRAY_FORMAT_TYPE_UBYTE, 4, - rebase_swizzle, false, width); + rebase_swizzle, normalized, width); src += src_stride; } } |