From 8993b9818c1f2968f674a6945aa0bc929709f47d Mon Sep 17 00:00:00 2001 From: Samuel Iglesias Gonsalvez Date: Wed, 12 Nov 2014 11:24:30 +0100 Subject: [PATCH] mesa: Remove _mesa_pack_int_rgba_row() and auxiliary functions These are no longer used. Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Jason Ekstrand --- src/mesa/main/format_pack.h | 4 -- src/mesa/main/format_pack.py | 85 ------------------------------------ 2 files changed, 89 deletions(-) diff --git a/src/mesa/main/format_pack.h b/src/mesa/main/format_pack.h index 6087fc381b1..aa7113e9b27 100644 --- a/src/mesa/main/format_pack.h +++ b/src/mesa/main/format_pack.h @@ -68,10 +68,6 @@ 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, const GLfloat src[][4], void *dst); diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py index e734e31a798..f141da83ca4 100644 --- a/src/mesa/main/format_pack.py +++ b/src/mesa/main/format_pack.py @@ -214,59 +214,6 @@ 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: @@ -449,38 +396,6 @@ _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. */ -- 2.30.2