On Jan 9, 2015 2:40 AM, "Samuel Iglesias Gonsálvez" <<a href="mailto:siglesias@igalia.com">siglesias@igalia.com</a>> wrote: > > On Thursday, January 08, 2015 08:20:55 AM Iago Toral Quiroga wrote: > > From: Samuel Iglesias Gonsalvez <<a href="mailto:siglesias@igalia.com">siglesias@igalia.com</a>> > > > > We will use this later on to handle uint conversion scenarios in a master > > convert function. > > > > v2: > > - Modify pack_uint_*() function generation to use c.datatype() and > > f.datatype(). > > - Remove UINT_TO_FLOAT() macro usage from pack_uint*() > > - Remove "if not f.is_normalized()" conditional as pack_uint*() > > functions are only autogenerated for non normalized formats. > > > > v3: > > - Add clamping for non-normalized integer formats in pack_uint*() > > > > Signed-off-by: Samuel Iglesias Gonsalvez <<a href="mailto:siglesias@igalia.com">siglesias@igalia.com</a>> > > Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>> > > --- > > src/mesa/main/format_pack.h | 3 ++ > > src/mesa/main/format_pack.py | 84 > > ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 > > insertions(+) > > > > diff --git a/src/mesa/main/format_pack.h b/src/mesa/main/format_pack.h > > index 2577def..1582ad1 100644 > > --- a/src/mesa/main/format_pack.h > > +++ b/src/mesa/main/format_pack.h > > @@ -77,6 +77,9 @@ extern void > > _mesa_pack_ubyte_rgba_row(mesa_format format, GLuint n, > > const GLubyte src[][4], void *dst); > > > > +extern void > > +_mesa_pack_uint_rgba_row(mesa_format format, GLuint n, > > + const GLuint src[][4], void *dst); > > > > extern void > > _mesa_pack_ubyte_rgba_rect(mesa_format format, GLuint width, GLuint height, > > diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py > > index cb347ab..3240d24 100644 > > --- a/src/mesa/main/format_pack.py > > +++ b/src/mesa/main/format_pack.py > > @@ -160,6 +160,58 @@ pack_ubyte_r11g11b10_float(const GLubyte src[4], void > > *dst) *d = float3_to_r11g11b10f(rgb); > > } > > > > +/* uint 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_uint_${f.short_name()}(const GLuint src[4], void *dst) > > +{ > > + %for (i, c) in enumerate(f.channels): > > + <% i = f.swizzle.inverse()[i] %> > > + %if c.type == 'x': > > + <% continue %> > > + %endif > > + > > + ${c.datatype()} ${<a href="http://c.name">c.name</a>} = > > + %if c.type == parser.SIGNED: > > + _mesa_signed_to_signed(src[${i}], ${c.size}); > > When fixing "mesa/format_pack: Add _mesa_pack_int_rgba_row()" patch I found an > error here, it should be: > > _mesa_unsigned_to_signed(src[${i}], ${c.size}); > > I tested it with piglit and it gives no regressions. > > Jason, if you agree with it, we will integrate this change before pushing the > patch to master. No, I think this of the correct one. In order to be able to pack both signed and unsigned formats, we need to sign-extend. In other words, we test the 32-bit integer as signed for signed formats and treat it as unsigned for unsigned formats. In the end it doesn't matter because we only end up using this for packed integer formats which are all unsigned anyway. However we should keep with the same semantics we has before and do signed_to_signed. > > Sam > > > + %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}] = ${<a href="http://c.name">c.name</a>}; > > + %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(${<a href="http://c.name">c.name</a>}, ${c.shift}, ${c.size}); > > + %endfor > > + (*(${f.datatype()} *)dst) = d; > > + %else: > > + <% assert False %> > > + %endif > > +} > > +%endfor > > > > /* float packing functions */ > > > > @@ -312,6 +364,38 @@ _mesa_pack_ubyte_rgba_row(mesa_format format, GLuint n, > > } > > > > /** > > + * Pack a row of GLuint rgba[4] values to the destination. > > + */ > > +void > > +_mesa_pack_uint_rgba_row(mesa_format format, GLuint n, > > + const GLuint 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 ${<a href="http://f.name">f.name</a>}: > > + for (i = 0; i < n; ++i) { > > + pack_uint_${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. > > */ > > void > > _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> >