From d6da5185f96c1a85390e08dc2ef36c04d6e0de11 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 4 Aug 2011 06:23:59 +0200 Subject: [PATCH] r600g: don't include radeon_drm.h and xf86drm.h Reviewed-by: Alex Deucher --- src/gallium/drivers/r600/r600_buffer.c | 3 --- src/gallium/winsys/r600/drm/evergreen_hw_context.c | 2 -- src/gallium/winsys/r600/drm/r600_bo.c | 13 ++++++------- src/gallium/winsys/r600/drm/r600_drm.c | 2 -- src/gallium/winsys/r600/drm/r600_hw_context.c | 2 -- src/gallium/winsys/r600/drm/r600_priv.h | 1 - 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c index bc70578..ca2415a 100644 --- a/src/gallium/drivers/r600/r600_buffer.c +++ b/src/gallium/drivers/r600/r600_buffer.c @@ -33,9 +33,6 @@ #include #include "util/u_upload_mgr.h" -#include -#include "radeon_drm.h" - #include "r600.h" #include "r600_pipe.h" diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c index 1d582ce..54e26b3 100644 --- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c +++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c @@ -27,8 +27,6 @@ #include "r600_priv.h" #include "evergreend.h" #include "util/u_memory.h" -#include "radeon_drm.h" -#include "xf86drm.h" #include #define GROUP_FORCE_NEW_BLOCK 0 diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c index 123f718..4beedad 100644 --- a/src/gallium/winsys/r600/drm/r600_bo.c +++ b/src/gallium/winsys/r600/drm/r600_bo.c @@ -26,7 +26,6 @@ #include "r600_priv.h" #include "r600d.h" #include "state_tracker/drm_driver.h" -#include "radeon_drm.h" struct r600_bo *r600_bo(struct radeon *radeon, unsigned size, unsigned alignment, @@ -41,22 +40,22 @@ struct r600_bo *r600_bo(struct radeon *radeon, * resources. We generate them internally for some transfers. */ if (usage == PIPE_USAGE_STAGING) { - domains = RADEON_GEM_DOMAIN_GTT; - initial_domain = RADEON_GEM_DOMAIN_GTT; + domains = RADEON_DOMAIN_GTT; + initial_domain = RADEON_DOMAIN_GTT; } else { - domains = RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM; + domains = RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM; switch(usage) { case PIPE_USAGE_DYNAMIC: case PIPE_USAGE_STREAM: case PIPE_USAGE_STAGING: - initial_domain = RADEON_GEM_DOMAIN_GTT; + initial_domain = RADEON_DOMAIN_GTT; break; case PIPE_USAGE_DEFAULT: case PIPE_USAGE_STATIC: case PIPE_USAGE_IMMUTABLE: default: - initial_domain = RADEON_GEM_DOMAIN_VRAM; + initial_domain = RADEON_DOMAIN_VRAM; break; } } @@ -88,7 +87,7 @@ struct r600_bo *r600_bo_handle(struct radeon *radeon, struct winsys_handle *whan } pipe_reference_init(&bo->reference, 1); - bo->domains = RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM; + bo->domains = RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM; bo->cs_buf = radeon->ws->buffer_get_cs_handle(pb); if (stride) diff --git a/src/gallium/winsys/r600/drm/r600_drm.c b/src/gallium/winsys/r600/drm/r600_drm.c index a1b0ba1..17d098a 100644 --- a/src/gallium/winsys/r600/drm/r600_drm.c +++ b/src/gallium/winsys/r600/drm/r600_drm.c @@ -29,8 +29,6 @@ #include "r600_priv.h" #include "r600_drm_public.h" #include "util/u_memory.h" -#include -#include #include #ifndef RADEON_INFO_NUM_TILE_PIPES diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/winsys/r600/drm/r600_hw_context.c index f39fc69..577988d 100644 --- a/src/gallium/winsys/r600/drm/r600_hw_context.c +++ b/src/gallium/winsys/r600/drm/r600_hw_context.c @@ -26,8 +26,6 @@ #include "r600_priv.h" #include "r600d.h" #include "util/u_memory.h" -#include "radeon_drm.h" -#include "xf86drm.h" #include #define GROUP_FORCE_NEW_BLOCK 0 diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/winsys/r600/drm/r600_priv.h index df412a0..c5b82fd 100644 --- a/src/gallium/winsys/r600/drm/r600_priv.h +++ b/src/gallium/winsys/r600/drm/r600_priv.h @@ -30,7 +30,6 @@ #include "../../radeon/drm/radeon_winsys.h" #include "util/u_hash_table.h" #include "os/os_thread.h" -#include "radeon_drm.h" #define PKT_COUNT_C 0xC000FFFF #define PKT_COUNT_S(x) (((x) & 0x3FFF) << 16) -- 2.7.4