diff options
| author | Brian Paul <[email protected]> | 2013-09-30 09:07:33 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-09-30 18:50:37 -0600 |
| commit | 81bb98e928861260170c16f5c3e0d80492251d6b (patch) | |
| tree | c1b63d3ef977dff33e50bae5feb2104e43249491 | |
| parent | 48b9720272184d884b21524ae0b5318d42019793 (diff) | |
gallium: include u_surface.h instead of u_rect.h
u_rect.h was including u_surface.h just to avoid touching a bunch
of other source files after some functions were moved from u_rect.h
to u_surface.h. This patch cleans up that hack.
Reviewed-by: Roland Scheidegger <[email protected]>
| -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 08ef6ab3ea6..a8aa5719d39 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 10909b2024e..c141550be2a 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 62298cdab09..fb80aec42a0 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 f838e74210d..f91f90b7ac6 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" |