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

[mesa.git] / src / util / format / u_format.h

diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h
index 91198f653010c6b3aac0532dfc8c589b5d6df37e..41d795e7b3f67521dfa579df954d59c57073e9ee 100644 (file)
--- a/src/util/format/u_format.h
+++ b/src/util/format/u_format.h
@@ -351,9 +351,7 @@ struct util_format_unpack_description {
     * Only defined for non-depth-stencil and non-integer formats.
     */
    void
-   (*fetch_rgba_float)(float *dst,
-                       const uint8_t *src,
-                       unsigned i, unsigned j);
+   (*fetch_rgba)(void *dst, const uint8_t *src, unsigned i, unsigned j);
 
    /**
     * Unpack pixels to Z32_UNORM.
@@ -387,26 +385,6 @@ struct util_format_unpack_description {
    (*unpack_s_8uint)(uint8_t *dst, unsigned dst_stride,
                      const uint8_t *src, unsigned src_stride,
                      unsigned width, unsigned height);
-
-   /**
-    * Fetch a single pixel (i, j) from a block.
-    *
-    * Only defined for unsigned (pure) integer formats.
-    */
-   void
-   (*fetch_rgba_uint)(uint32_t *dst,
-                      const uint8_t *src,
-                      unsigned i, unsigned j);
-
-   /**
-    * Fetch a single pixel (i, j) from a block.
-    *
-    * Only defined for signed (pure) integer formats.
-    */
-   void
-   (*fetch_rgba_sint)(int32_t *dst,
-                      const uint8_t *src,
-                      unsigned i, unsigned j);
 };
 
 const struct util_format_description *