r600g: cleanup includes in winsys

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2011-07-22 21:38:56 +02:00
parent fb8cf51eeb
commit 354f76f386
10 changed files with 24 additions and 78 deletions

View file

@ -26,12 +26,8 @@
#ifndef R600_H
#define R600_H
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
#include <util/u_double_list.h>
#include <util/u_inlines.h>
#include <pipe/p_compiler.h>
#include "util/u_double_list.h"
#include "util/u_inlines.h"
#define RADEON_CTX_MAX_PM4 (64 * 1024 / 4)

View file

@ -23,8 +23,6 @@
#ifndef R600_ASM_H
#define R600_ASM_H
#include "util/u_double_list.h"
struct r600_vertex_element;
struct r600_pipe_context;

View file

@ -23,19 +23,13 @@
* Authors:
* Jerome Glisse
*/
#include <errno.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include "xf86drm.h"
#include "r600.h"
#include "evergreend.h"
#include "radeon_drm.h"
#include "pipe/p_compiler.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "r600_priv.h"
#include "evergreend.h"
#include "util/u_memory.h"
#include "radeon_drm.h"
#include "xf86drm.h"
#include <errno.h>
#define GROUP_FORCE_NEW_BLOCK 0
@ -1271,4 +1265,3 @@ void evergreen_context_flush_dest_caches(struct r600_context *ctx)
ctx->flags &= ~R600_CONTEXT_DST_CACHES_DIRTY;
}

View file

@ -23,13 +23,9 @@
* Authors:
* Dave Airlie
*/
#include <pipe/p_compiler.h>
#include <pipe/p_screen.h>
#include <pipebuffer/pb_bufmgr.h>
#include "state_tracker/drm_driver.h"
#include "r600_priv.h"
#include "r600d.h"
#include "drm.h"
#include "state_tracker/drm_driver.h"
#include "radeon_drm.h"
struct r600_bo *r600_bo(struct radeon *radeon,

View file

@ -26,11 +26,9 @@
* Thomas Hellström <thomas-at-vmware-dot-com>
* Jerome Glisse <jglisse@redhat.com>
*/
#include <util/u_memory.h>
#include <util/u_double_list.h>
#include <util/u_time.h>
#include <pipebuffer/pb_bufmgr.h>
#include "r600_priv.h"
#include "util/u_memory.h"
#include "util/u_time.h"
static void r600_bomgr_timeout_flush(struct r600_bomgr *mgr)
{

View file

@ -25,31 +25,12 @@
* Corbin Simpson <MostAwesomeDude@gmail.com>
* Joakim Sindholt <opensource@zhasha.com>
*/
#include <stdio.h>
#include <errno.h>
#include <sys/ioctl.h>
#include "util/u_inlines.h"
#include "util/u_debug.h"
#include "util/u_hash_table.h"
#include <pipebuffer/pb_bufmgr.h>
#include "r600.h"
#include "r600_priv.h"
#include "r600_drm_public.h"
#include "xf86drm.h"
#include "radeon_drm.h"
#include "../../radeon/drm/radeon_winsys.h"
#ifndef RADEON_INFO_TILING_CONFIG
#define RADEON_INFO_TILING_CONFIG 0x6
#endif
#ifndef RADEON_INFO_CLOCK_CRYSTAL_FREQ
#define RADEON_INFO_CLOCK_CRYSTAL_FREQ 0x9
#endif
#ifndef RADEON_INFO_NUM_BACKENDS
#define RADEON_INFO_NUM_BACKENDS 0xa
#endif
#include <radeon_drm.h>
#include <xf86drm.h>
#include <errno.h>
#ifndef RADEON_INFO_NUM_TILE_PIPES
#define RADEON_INFO_NUM_TILE_PIPES 0xb

View file

@ -23,19 +23,12 @@
* Authors:
* Jerome Glisse
*/
#include <errno.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <pipe/p_compiler.h>
#include <util/u_inlines.h>
#include <util/u_memory.h>
#include <pipebuffer/pb_bufmgr.h>
#include "xf86drm.h"
#include "radeon_drm.h"
#include "r600_priv.h"
#include "r600d.h"
#include "util/u_memory.h"
#include "radeon_drm.h"
#include "xf86drm.h"
#include <errno.h>
#define GROUP_FORCE_NEW_BLOCK 0

View file

@ -26,16 +26,10 @@
#ifndef R600_PRIV_H
#define R600_PRIV_H
#include <errno.h>
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
#include <util/u_double_list.h>
#include <util/u_inlines.h>
#include "util/u_hash_table.h"
#include <os/os_thread.h>
#include "r600.h"
#include "../../radeon/drm/radeon_winsys.h"
#include "util/u_hash_table.h"
#include "os/os_thread.h"
#define PKT_COUNT_C 0xC000FFFF
#define PKT_COUNT_S(x) (((x) & 0x3FFF) << 16)

View file

@ -24,14 +24,12 @@
* Jerome Glisse
*/
#define _FILE_OFFSET_BITS 64
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "r600_priv.h"
#include "util/u_hash_table.h"
#include "radeon_drm.h"
#include "xf86drm.h"
#include <sys/mman.h>
#include <errno.h>
#include "r600_priv.h"
#include "xf86drm.h"
#include "radeon_drm.h"
int radeon_bo_fixed_map(struct radeon *radeon, struct radeon_bo *bo)
{

View file

@ -23,7 +23,6 @@
* Authors:
* Jerome Glisse
*/
#include <stdlib.h>
#include "r600_priv.h"
struct pci_id {