diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/util/u_format_latc.c | 8 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format_rgtc.c | 22 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/auxiliary/util/u_format_latc.c b/src/gallium/auxiliary/util/u_format_latc.c index e84c493bb1e..2b34c719aaf 100644 --- a/src/gallium/auxiliary/util/u_format_latc.c +++ b/src/gallium/auxiliary/util/u_format_latc.c @@ -27,13 +27,13 @@ #include "u_format_rgtc.h" #include "u_format_latc.h" -static void u_format_unsigned_encode_rgtc_chan(uint8_t *blkaddr, uint8_t srccolors[4][4], +static void u_format_unsigned_encode_rgtc_ubyte(uint8_t *blkaddr, uint8_t srccolors[4][4], int numxpixels, int numypixels); static void u_format_unsigned_fetch_texel_rgtc(unsigned srcRowStride, const uint8_t *pixdata, unsigned i, unsigned j, uint8_t *value, unsigned comps); -static void u_format_signed_encode_rgtc_chan(int8_t *blkaddr, int8_t srccolors[4][4], +static void u_format_signed_encode_rgtc_ubyte(int8_t *blkaddr, int8_t srccolors[4][4], int numxpixels, int numypixels); static void u_format_signed_fetch_texel_rgtc(unsigned srcRowStride, const int8_t *pixdata, @@ -43,8 +43,8 @@ void util_format_latc1_unorm_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j) { /* Fix warnings here: */ - (void) u_format_unsigned_encode_rgtc_chan; - (void) u_format_signed_encode_rgtc_chan; + (void) u_format_unsigned_encode_rgtc_ubyte; + (void) u_format_signed_encode_rgtc_ubyte; u_format_unsigned_fetch_texel_rgtc(0, src, i, j, dst, 1); } diff --git a/src/gallium/auxiliary/util/u_format_rgtc.c b/src/gallium/auxiliary/util/u_format_rgtc.c index c929fd47e99..2371bab1e69 100644 --- a/src/gallium/auxiliary/util/u_format_rgtc.c +++ b/src/gallium/auxiliary/util/u_format_rgtc.c @@ -26,13 +26,13 @@ #include "u_format.h" #include "u_format_rgtc.h" -static void u_format_unsigned_encode_rgtc_chan(uint8_t *blkaddr, uint8_t srccolors[4][4], +static void u_format_unsigned_encode_rgtc_ubyte(uint8_t *blkaddr, uint8_t srccolors[4][4], int numxpixels, int numypixels); static void u_format_unsigned_fetch_texel_rgtc(unsigned srcRowStride, const uint8_t *pixdata, unsigned i, unsigned j, uint8_t *value, unsigned comps); -static void u_format_signed_encode_rgtc_chan(int8_t *blkaddr, int8_t srccolors[4][4], +static void u_format_signed_encode_rgtc_ubyte(int8_t *blkaddr, int8_t srccolors[4][4], int numxpixels, int numypixels); static void u_format_signed_fetch_texel_rgtc(unsigned srcRowStride, const int8_t *pixdata, @@ -82,7 +82,7 @@ util_format_rgtc1_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, tmp[j][i] = src_row[(y + j)*src_stride/sizeof(*src_row) + (x + i)*4]; } } - u_format_unsigned_encode_rgtc_chan(dst, tmp, 4, 4); + u_format_unsigned_encode_rgtc_ubyte(dst, tmp, 4, 4); dst += bytes_per_block; } dst_row += dst_stride / sizeof(*dst_row); @@ -129,7 +129,7 @@ util_format_rgtc1_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, c tmp[j][i] = float_to_ubyte(src_row[(y + j)*src_stride/sizeof(*src_row) + (x + i)*4]); } } - u_format_unsigned_encode_rgtc_chan(dst, tmp, 4, 4); + u_format_unsigned_encode_rgtc_ubyte(dst, tmp, 4, 4); dst += bytes_per_block; } dst_row += dst_stride / sizeof(*dst_row); @@ -180,7 +180,7 @@ util_format_rgtc1_snorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, c tmp[j][i] = float_to_byte_tex(src_row[(y + j)*src_stride/sizeof(*src_row) + (x + i)*4]); } } - u_format_signed_encode_rgtc_chan(dst, tmp, 4, 4); + u_format_signed_encode_rgtc_ubyte(dst, tmp, 4, 4); dst += bytes_per_block; } dst_row += dst_stride / sizeof(*dst_row); @@ -272,8 +272,8 @@ util_format_rgtc2_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, tmp_g[j][i] = src_row[((y + j)*src_stride/sizeof(*src_row) + (x + i)*4) + 1]; } } - u_format_unsigned_encode_rgtc_chan(dst, tmp_r, 4, 4); - u_format_unsigned_encode_rgtc_chan(dst + 8, tmp_g, 4, 4); + u_format_unsigned_encode_rgtc_ubyte(dst, tmp_r, 4, 4); + u_format_unsigned_encode_rgtc_ubyte(dst + 8, tmp_g, 4, 4); dst += bytes_per_block; } dst_row += dst_stride / sizeof(*dst_row); @@ -297,8 +297,8 @@ util_format_rxtc2_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, c tmp_g[j][i] = float_to_ubyte(src_row[(y + j)*src_stride/sizeof(*src_row) + (x + i)*4 + chan2off]); } } - u_format_unsigned_encode_rgtc_chan(dst, tmp_r, 4, 4); - u_format_unsigned_encode_rgtc_chan(dst + 8, tmp_g, 4, 4); + u_format_unsigned_encode_rgtc_ubyte(dst, tmp_r, 4, 4); + u_format_unsigned_encode_rgtc_ubyte(dst + 8, tmp_g, 4, 4); dst += bytes_per_block; } dst_row += dst_stride / sizeof(*dst_row); @@ -411,8 +411,8 @@ util_format_rxtc2_snorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, c tmp_g[j][i] = float_to_byte_tex(src_row[(y + j)*src_stride/sizeof(*src_row) + (x + i)*4 + chan2off]); } } - u_format_signed_encode_rgtc_chan(dst, tmp_r, 4, 4); - u_format_signed_encode_rgtc_chan(dst + 8, tmp_g, 4, 4); + u_format_signed_encode_rgtc_ubyte(dst, tmp_r, 4, 4); + u_format_signed_encode_rgtc_ubyte(dst + 8, tmp_g, 4, 4); dst += bytes_per_block; } dst_row += dst_stride / sizeof(*dst_row); |