summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/va-r600
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-07-22 19:25:07 +0200
committerMarek Olšák <[email protected]>2011-08-16 09:15:10 +0200
commitce12f826927cf2d3ac3fd70d893abfb07adc23db (patch)
tree021390666894835790a38127546ed1a4becd137a /src/gallium/targets/va-r600
parent8c409403217cf8c13e1d2dd306ad5e86b566c5c9 (diff)
r600g: first step into winsys/radeon
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/targets/va-r600')
-rw-r--r--src/gallium/targets/va-r600/Makefile1
-rw-r--r--src/gallium/targets/va-r600/target.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile
index 28797ad528d..d09a3aa8ad2 100644
--- a/src/gallium/targets/va-r600/Makefile
+++ b/src/gallium/targets/va-r600/Makefile
@@ -10,6 +10,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r600/libr600.a \
$(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \
+ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/auxiliary/libgallium.a
diff --git a/src/gallium/targets/va-r600/target.c b/src/gallium/targets/va-r600/target.c
index 8753e2bab17..1b8b6816ec1 100644
--- a/src/gallium/targets/va-r600/target.c
+++ b/src/gallium/targets/va-r600/target.c
@@ -1,14 +1,14 @@
#include "state_tracker/drm_driver.h"
#include "target-helpers/inline_debug_helper.h"
-#include "r600/drm/r600_drm_public.h"
+#include "radeon/drm/radeon_drm_public.h"
#include "r600/r600_public.h"
static struct pipe_screen *create_screen(int fd)
{
- struct radeon *radeon;
+ struct radeon_winsys *radeon;
struct pipe_screen *screen;
- radeon = r600_drm_winsys_create(fd);
+ radeon = radeon_drm_winsys_create(fd);
if (!radeon)
return NULL;