util: Merge util_format_read_4* functions.

[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 961b0ac72b7aff1cc53d7ed70de54f77a1a6133f..4ce3b58bde22a262179b499e04b586a88adfd92e 100644 (file)
--- a/src/util/format/u_format.h
+++ b/src/util/format/u_format.h
@@ -1551,10 +1551,10 @@ util_format_pack_rgba(enum pipe_format format, void *dst,
  */
 
 void
-util_format_read_4f(enum pipe_format format,
-                    float *dst, unsigned dst_stride, 
-                    const void *src, unsigned src_stride, 
-                    unsigned x, unsigned y, unsigned w, unsigned h);
+util_format_read_4(enum pipe_format format,
+                   void *dst, unsigned dst_stride,
+                   const void *src, unsigned src_stride,
+                   unsigned x, unsigned y, unsigned w, unsigned h);
 
 void
 util_format_write_4(enum pipe_format format,
@@ -1574,18 +1574,6 @@ util_format_write_4ub(enum pipe_format format,
                       void *dst, unsigned dst_stride, 
                       unsigned x, unsigned y, unsigned w, unsigned h);
 
-void
-util_format_read_4ui(enum pipe_format format,
-                     unsigned *dst, unsigned dst_stride,
-                     const void *src, unsigned src_stride,
-                     unsigned x, unsigned y, unsigned w, unsigned h);
-
-void
-util_format_read_4i(enum pipe_format format,
-                    int *dst, unsigned dst_stride,
-                    const void *src, unsigned src_stride,
-                    unsigned x, unsigned y, unsigned w, unsigned h);
-
 /*
  * Generic format conversion;
  */