summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-04-18 02:39:50 +0200
committerMarek Olšák <[email protected]>2011-04-18 02:52:32 +0200
commitd35aeff4bb0b03450b2c3c08bd7f84db5bf43283 (patch)
tree7572cae9f9022991404b3a9d74882858062fe095 /src/gallium/targets
parentf79717d27aaf471b9cd6eed0d74cbf37ec697361 (diff)
r300g/winsys: rename r300->radeon and do a little cleanup
Renaming a few files, types, and functions. Also make the winsys independent of r300g.
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/dri-r300/target.c4
-rw-r--r--src/gallium/targets/egl-static/egl_pipe.c4
-rw-r--r--src/gallium/targets/egl/pipe_r300.c4
-rw-r--r--src/gallium/targets/xorg-radeon/radeon_target.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/targets/dri-r300/target.c b/src/gallium/targets/dri-r300/target.c
index 2ecf3457a76..b48bcad3710 100644
--- a/src/gallium/targets/dri-r300/target.c
+++ b/src/gallium/targets/dri-r300/target.c
@@ -7,10 +7,10 @@
static struct pipe_screen *
create_screen(int fd)
{
- struct r300_winsys_screen *sws;
+ struct radeon_winsys *sws;
struct pipe_screen *screen;
- sws = r300_drm_winsys_screen_create(fd);
+ sws = radeon_drm_winsys_create(fd);
if (!sws)
return NULL;
diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c
index a33d419e0aa..658c532b404 100644
--- a/src/gallium/targets/egl-static/egl_pipe.c
+++ b/src/gallium/targets/egl-static/egl_pipe.c
@@ -118,10 +118,10 @@ static struct pipe_screen *
pipe_r300_create_screen(int fd)
{
#if _EGL_PIPE_R300
- struct r300_winsys_screen *sws;
+ struct radeon_winsys *sws;
struct pipe_screen *screen;
- sws = r300_drm_winsys_screen_create(fd);
+ sws = radeon_drm_winsys_create(fd);
if (!sws)
return NULL;
diff --git a/src/gallium/targets/egl/pipe_r300.c b/src/gallium/targets/egl/pipe_r300.c
index d84bb92539a..09940f0a194 100644
--- a/src/gallium/targets/egl/pipe_r300.c
+++ b/src/gallium/targets/egl/pipe_r300.c
@@ -7,10 +7,10 @@
static struct pipe_screen *
create_screen(int fd)
{
- struct r300_winsys_screen *sws;
+ struct radeon_winsys *sws;
struct pipe_screen *screen;
- sws = r300_drm_winsys_screen_create(fd);
+ sws = radeon_drm_winsys_create(fd);
if (!sws)
return NULL;
diff --git a/src/gallium/targets/xorg-radeon/radeon_target.c b/src/gallium/targets/xorg-radeon/radeon_target.c
index 5a0a8dc5738..b8410efbd89 100644
--- a/src/gallium/targets/xorg-radeon/radeon_target.c
+++ b/src/gallium/targets/xorg-radeon/radeon_target.c
@@ -7,10 +7,10 @@
static struct pipe_screen *
create_screen(int fd)
{
- struct r300_winsys_screen *sws;
+ struct radeon_winsys *sws;
struct pipe_screen *screen;
- sws = r300_drm_winsys_screen_create(fd);
+ sws = radeon_drm_winsys_create(fd);
if (!sws)
return NULL;