diff options
| author | Marek Olšák <[email protected]> | 2010-06-20 03:33:50 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2010-06-20 03:59:31 +0200 |
| commit | 6e96cfa39a1d6705be6b3fc3bae651ba0450a336 (patch) | |
| tree | b95c56437b9cd7567f5ab660844de8e95ae5a20a | |
| parent | a916669468f059987eb7662840ac0ddb68534007 (diff) | |
r300g: cleanup includes
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 17 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.h | 5 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index de65c61e97c..772bbdd2a66 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -21,20 +21,23 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "pipe/p_screen.h" - -#include "util/u_format.h" -#include "util/u_format_s3tc.h" -#include "util/u_math.h" -#include "util/u_memory.h" +/* Always include headers in the reverse order!! ~ M. */ +#include "r300_texture.h" #include "r300_context.h" #include "r300_reg.h" -#include "r300_texture.h" #include "r300_transfer.h" #include "r300_screen.h" #include "r300_winsys.h" +#include "util/u_format.h" +#include "util/u_format_s3tc.h" +#include "util/u_math.h" +#include "util/u_memory.h" + +#include "pipe/p_screen.h" +#include "state_tracker/drm_api.h" + enum r300_dim { DIM_WIDTH = 0, DIM_HEIGHT = 1 diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h index ff640c56eed..99e7694254e 100644 --- a/src/gallium/drivers/r300/r300_texture.h +++ b/src/gallium/drivers/r300/r300_texture.h @@ -23,8 +23,11 @@ #ifndef R300_TEXTURE_H #define R300_TEXTURE_H -#include "util/u_format.h" +#include "pipe/p_format.h" +struct pipe_screen; +struct pipe_resource; +struct winsys_handle; struct r300_texture; struct r300_screen; |