util: Make all 3 fetch_rgba functions occupy the same function slot.

[mesa.git] / src / util / format / u_format_other.c

diff --git a/src/util/format/u_format_other.c b/src/util/format/u_format_other.c
index 6dd66c7d346d87eadb7150104ccb8cbf9a8ffc86..bd68966a580f8df013232e51b67be676bd413f08 100644 (file)
--- a/src/util/format/u_format_other.c
+++ b/src/util/format/u_format_other.c
@@ -74,9 +74,10 @@ util_format_r9g9b9e5_float_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride
 }
 
 void
-util_format_r9g9b9e5_float_fetch_rgba_float(float *dst, const uint8_t *src,
+util_format_r9g9b9e5_float_fetch_rgba(void *in_dst, const uint8_t *src,
                                        UNUSED unsigned i, UNUSED unsigned j)
 {
+   float *dst = in_dst;
    uint32_t value = util_cpu_to_le32(*(const uint32_t *)src);
    rgb9e5_to_float3(value, dst);
    dst[3] = 1; /* a */
@@ -177,9 +178,10 @@ util_format_r11g11b10_float_pack_rgba_float(uint8_t *dst_row, unsigned dst_strid
 }
 
 void
-util_format_r11g11b10_float_fetch_rgba_float(float *dst, const uint8_t *src,
+util_format_r11g11b10_float_fetch_rgba(void *in_dst, const uint8_t *src,
                                         UNUSED unsigned i, UNUSED unsigned j)
 {
+   float *dst = in_dst;
    uint32_t value = util_cpu_to_le32(*(const uint32_t *)src);
    r11g11b10f_to_float3(value, dst);
    dst[3] = 1; /* a */
@@ -362,9 +364,10 @@ util_format_r8g8bx_snorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
 
 
 void
-util_format_r8g8bx_snorm_fetch_rgba_float(float *dst, const uint8_t *src,
+util_format_r8g8bx_snorm_fetch_rgba(void *in_dst, const uint8_t *src,
                                      UNUSED unsigned i, UNUSED unsigned j)
 {
+   float *dst = in_dst;
    uint16_t value = util_cpu_to_le16(*(const uint16_t *)src);
    int16_t r, g;