diff options
| author | José Fonseca <[email protected]> | 2010-03-31 14:31:29 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2010-03-31 14:31:29 +0100 |
| commit | 325d55303d5920c137c0047e673a3940a99e4629 (patch) | |
| tree | d5cab95dfa749c9eec12bd96abba189fbce5ba84 /src/gallium/auxiliary/util | |
| parent | bce109c944c45d763497cea3aeaa6cf0d8163149 (diff) | |
util: Make util_format_xxx_pack_xxx take pointer as arguments.
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_format_pack.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/util/u_format_pack.py b/src/gallium/auxiliary/util/u_format_pack.py index e9d2573667a..43468ecf561 100644 --- a/src/gallium/auxiliary/util/u_format_pack.py +++ b/src/gallium/auxiliary/util/u_format_pack.py @@ -423,7 +423,7 @@ def generate_format_pack(format, src_channel, src_native_type, src_suffix): inv_swizzle = format.inv_swizzles() print 'static INLINE void' - print 'util_format_%s_pack_%s(void *dst, %s r, %s g, %s b, %s a)' % (name, src_suffix, src_native_type, src_native_type, src_native_type, src_native_type) + print 'util_format_%s_pack_%s(void *dst, const %s *src)' % (name, src_suffix, src_native_type) print '{' if format.is_bitmask(): @@ -434,7 +434,7 @@ def generate_format_pack(format, src_channel, src_native_type, src_suffix): for i in range(4): dst_channel = format.channels[i] if inv_swizzle[i] is not None: - value = 'rgba'[inv_swizzle[i]] + value ='src[%u]' % inv_swizzle[i] value = conversion_expr(src_channel, dst_channel, dst_native_type, value) if format.colorspace == ZS: if i == 3: @@ -470,7 +470,7 @@ def generate_format_pack(format, src_channel, src_native_type, src_suffix): width = dst_channel.size if inv_swizzle[i] is None: continue - value = 'rgba'[inv_swizzle[i]] + value ='src[%u]' % inv_swizzle[i] value = conversion_expr(src_channel, dst_channel, dst_native_type, value) if format.colorspace == ZS: if i == 3: @@ -520,9 +520,9 @@ def generate_pack(formats, src_channel, src_native_type, src_suffix): generate_format_pack(format, src_channel, src_native_type, src_suffix) print 'static INLINE void' - print 'util_format_pack_%s(enum pipe_format format, void *dst, %s r, %s g, %s b, %s a)' % (src_suffix, src_native_type, src_native_type, src_native_type, src_native_type) + print 'util_format_pack_%s(enum pipe_format format, void *dst, %s *src)' % (src_suffix, src_native_type) print '{' - print ' void (*func)(void *dst, %s r, %s g, %s b, %s a);' % (src_native_type, src_native_type, src_native_type, src_native_type) + print ' void (*func)(void *dst, const %s *src);' % (src_native_type,) print ' switch(format) {' for format in formats: if is_format_supported(format): @@ -533,7 +533,7 @@ def generate_pack(formats, src_channel, src_native_type, src_suffix): print ' debug_printf("%s: unsupported format\\n", __FUNCTION__);' print ' return;' print ' }' - print ' func(dst, r, g, b, a);' + print ' func(dst, src);' print '}' print |