diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/auxiliary/util/u_format.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_rect.h | 6 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_tile.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_mpeg12_decoder.c | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/util/u_format.c b/src/gallium/auxiliary/util/u_format.c index 08ef6ab..a8aa571 100644 --- a/src/gallium/auxiliary/util/u_format.c +++ b/src/gallium/auxiliary/util/u_format.c @@ -34,9 +34,9 @@ #include "u_math.h" #include "u_memory.h" -#include "u_rect.h" #include "u_format.h" #include "u_format_s3tc.h" +#include "u_surface.h" #include "pipe/p_defines.h" diff --git a/src/gallium/auxiliary/util/u_rect.h b/src/gallium/auxiliary/util/u_rect.h index 10909b2..c141550 100644 --- a/src/gallium/auxiliary/util/u_rect.h +++ b/src/gallium/auxiliary/util/u_rect.h @@ -83,10 +83,4 @@ u_rect_possible_intersection(const struct u_rect *a, } #endif - -/* Include pipe copy/fill rect helpers declarations for backwards compatibility - */ -#include "util/u_surface.h" - - #endif /* U_RECT_H */ diff --git a/src/gallium/auxiliary/util/u_tile.c b/src/gallium/auxiliary/util/u_tile.c index 62298cd..fb80aec 100644 --- a/src/gallium/auxiliary/util/u_tile.c +++ b/src/gallium/auxiliary/util/u_tile.c @@ -37,7 +37,7 @@ #include "util/u_format.h" #include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_rect.h" +#include "util/u_surface.h" #include "util/u_tile.h" diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c index f838e74..f91f90b 100644 --- a/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c +++ b/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c @@ -29,8 +29,8 @@ #include <assert.h> #include "util/u_memory.h" -#include "util/u_rect.h" #include "util/u_sampler.h" +#include "util/u_surface.h" #include "util/u_video.h" #include "vl_mpeg12_decoder.h" |