AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Switch the non-block formats to unpacking rgba rows instead of rects.

Browse Source 
We have only a few callers of unpack that do rects, so add a helper that
iterates over y adding the strides.  This saves us 36kb of generated code
and means that adding cpu-specific variants for RGBA format unpack will be
much simpler.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10014>
This commit is contained in:
Eric Anholt
2021-04-02 14:35:01 -07:00
committed by Marge Bot
parent 921b05f582
commit 2b5178ee48
11 changed files with 268 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/format/u_format_pack.py
+6 -11
View File
@@ -617,7 +617,7 @@ def generate_format_unpack(format, dst_channel, dst_native_type, dst_suffix):
else:
dst_proto_type = 'void'
proto = 'util_format_%s_unpack_%s(%s *restrict dst_row, unsigned dst_stride, const uint8_t *restrict src_row, unsigned src_stride, unsigned width, unsigned height)' % (
proto = 'util_format_%s_unpack_%s(%s *restrict dst_row, const uint8_t *restrict src, unsigned width)' % (
name, dst_suffix, dst_proto_type)
print('void %s;' % proto, file=sys.stdout2)
@@ -626,19 +626,14 @@ def generate_format_unpack(format, dst_channel, dst_native_type, dst_suffix):
print('{')
if is_format_supported(format):
print(' unsigned x, y;')
print(' for(y = 0; y < height; y += %u) {' % (format.block_height,))
print(' %s *dst = dst_row;' % (dst_native_type))
print(' const uint8_t *src = src_row;')
print(' for(x = 0; x < width; x += %u) {' % (format.block_width,))
print(' %s *dst = dst_row;' % (dst_native_type))
print(
' for (unsigned x = 0; x < width; x += %u) {' % (format.block_width,))
generate_unpack_kernel(format, dst_channel, dst_native_type)
print(' src += %u;' % (format.block_size() / 8,))
print(' dst += 4;')
print(' }')
print(' src_row += src_stride;')
print(' dst_row = (uint8_t *)dst_row + dst_stride;')
print(' src += %u;' % (format.block_size() / 8,))
print(' dst += 4;')
print(' }')
print('}')