From f8d160fc96cccb46040d47b4dead31c81375e6b6 Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Wed, 8 Oct 2014 16:02:21 +0200 Subject: mesa/format_pack: Add _mesa_pack_int_rgba_row() This will be used to unify code in pack.c. v2: - Modify pack_int_*() function generator to use c.datatype() and f.datatype() v3: - Only autogenerate pack_int_*() functions for non-normalized integer formats. v4: - Use _mesa_unsigned_to_unsigned() in pack_int_*() because, in order to be able to pack both signed and unsigned formats, we need to sign-extend. Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Jason Ekstrand --- src/mesa/main/format_pack.h | 3 ++ src/mesa/main/format_pack.py | 85 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) (limited to 'src/mesa/main') diff --git a/src/mesa/main/format_pack.h b/src/mesa/main/format_pack.h index 1582ad12b3d..6087fc381b1 100644 --- a/src/mesa/main/format_pack.h +++ b/src/mesa/main/format_pack.h @@ -68,6 +68,9 @@ extern gl_pack_ubyte_stencil_func _mesa_get_pack_ubyte_stencil_func(mesa_format format); +extern void +_mesa_pack_int_rgba_row(mesa_format format, GLuint n, + const GLint src[][4], void *dst); extern void _mesa_pack_float_rgba_row(mesa_format format, GLuint n, diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py index f141da83ca4..e734e31a798 100644 --- a/src/mesa/main/format_pack.py +++ b/src/mesa/main/format_pack.py @@ -214,6 +214,59 @@ pack_uint_${f.short_name()}(const GLuint src[4], void *dst) } %endfor +/* int packing functions */ + +%for f in rgb_formats: + %if not f.is_int(): + <% continue %> + %elif f.is_normalized(): + <% continue %> + %elif f.is_compressed(): + <% continue %> + %endif + +static inline void +pack_int_${f.short_name()}(const GLint src[4], void *dst) +{ + %for (i, c) in enumerate(f.channels): + <% i = f.swizzle.inverse()[i] %> + %if c.type == 'x': + <% continue %> + %endif + + ${c.datatype()} ${c.name} = + %if c.type == parser.SIGNED: + _mesa_signed_to_signed(src[${i}], ${c.size}); + %elif c.type == parser.UNSIGNED: + _mesa_unsigned_to_unsigned(src[${i}], ${c.size}); + %else: + assert(!"Invalid type: only integer types are allowed"); + %endif + %endfor + + %if f.layout == parser.ARRAY: + ${f.datatype()} *d = (${f.datatype()} *)dst; + %for (i, c) in enumerate(f.channels): + %if c.type == 'x': + <% continue %> + %endif + d[${i}] = ${c.name}; + %endfor + %elif f.layout == parser.PACKED: + ${f.datatype()} d = 0; + %for (i, c) in enumerate(f.channels): + %if c.type == 'x': + <% continue %> + %endif + d |= PACK(${c.name}, ${c.shift}, ${c.size}); + %endfor + (*(${f.datatype()} *)dst) = d; + %else: + <% assert False %> + %endif +} +%endfor + /* float packing functions */ %for f in rgb_formats: @@ -396,6 +449,38 @@ _mesa_pack_uint_rgba_row(mesa_format format, GLuint n, } } +/** + * Pack a row of GLint rgba[4] values to the destination. + */ +void +_mesa_pack_int_rgba_row(mesa_format format, GLuint n, + const GLint src[][4], void *dst) +{ + GLuint i; + GLubyte *d = dst; + + switch (format) { +%for f in rgb_formats: + %if not f.is_int(): + <% continue %> + %elif f.is_normalized(): + <% continue %> + %elif f.is_compressed(): + <% continue %> + %endif + + case ${f.name}: + for (i = 0; i < n; ++i) { + pack_int_${f.short_name()}(src[i], d); + d += ${f.block_size() / 8}; + } + break; +%endfor + default: + assert(!"Invalid format"); + } +} + /** * Pack a row of GLfloat rgba[4] values to the destination. */ -- cgit v1.2.3