From 0328076efb5ff6e62152c09e38d0d11f7931d07b Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 10 Dec 2012 08:33:13 +0100 Subject: fontconfig libX11 mesa pixman git update 10 dec 2012 libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019 --- mesalib/src/gallium/auxiliary/util/u_rect.h | 30 ++--------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'mesalib/src/gallium/auxiliary/util/u_rect.h') diff --git a/mesalib/src/gallium/auxiliary/util/u_rect.h b/mesalib/src/gallium/auxiliary/util/u_rect.h index 8fccae8c4..10909b202 100644 --- a/mesalib/src/gallium/auxiliary/util/u_rect.h +++ b/mesalib/src/gallium/auxiliary/util/u_rect.h @@ -83,36 +83,10 @@ u_rect_possible_intersection(const struct u_rect *a, } #endif -#include "pipe/p_format.h" -#include "util/u_pack_color.h" - - -/********************************************************************** - * Pipe copy/fill rect helpers. - */ - -/* These really should move to a different file: +/* Include pipe copy/fill rect helpers declarations for backwards compatibility */ -#include "pipe/p_format.h" +#include "util/u_surface.h" -#ifdef __cplusplus -extern "C" { -#endif - -extern void -util_copy_rect(ubyte * dst, enum pipe_format format, - unsigned dst_stride, unsigned dst_x, unsigned dst_y, - unsigned width, unsigned height, const ubyte * src, - int src_stride, unsigned src_x, unsigned src_y); - -extern void -util_fill_rect(ubyte * dst, enum pipe_format format, - unsigned dst_stride, unsigned dst_x, unsigned dst_y, - unsigned width, unsigned height, union util_color *uc); - -#ifdef __cplusplus -} -#endif #endif /* U_RECT_H */ -- cgit v1.2.3