From 1372a8f90dc64350e4ac29dbb8c5feb88bc83cd1 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Sat, 24 Apr 2010 14:28:55 +0100 Subject: st/dri: Refactor dri_st_api into other files --- src/gallium/state_trackers/dri/sw/Makefile | 1 - src/gallium/state_trackers/dri/sw/SConscript | 1 - src/gallium/state_trackers/dri/sw/dri_st_api.c | 1 - src/gallium/state_trackers/dri/sw/drisw.c | 4 ++-- 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 120000 src/gallium/state_trackers/dri/sw/dri_st_api.c (limited to 'src/gallium/state_trackers/dri/sw') diff --git a/src/gallium/state_trackers/dri/sw/Makefile b/src/gallium/state_trackers/dri/sw/Makefile index 18d7aabd9f..c0ae71451b 100644 --- a/src/gallium/state_trackers/dri/sw/Makefile +++ b/src/gallium/state_trackers/dri/sw/Makefile @@ -19,7 +19,6 @@ C_SOURCES = \ dri_context.c \ dri_screen.c \ dri_drawable.c \ - dri_st_api.c \ dri1_helper.c \ drisw.c diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript index c97124c831..6bb282d1a4 100644 --- a/src/gallium/state_trackers/dri/sw/SConscript +++ b/src/gallium/state_trackers/dri/sw/SConscript @@ -20,7 +20,6 @@ if env['dri']: source = [ 'dri_context.c', 'dri_drawable.c', 'dri_screen.c', - 'dri_st_api.c', 'dri1_helper.c', 'drisw.c', ] diff --git a/src/gallium/state_trackers/dri/sw/dri_st_api.c b/src/gallium/state_trackers/dri/sw/dri_st_api.c deleted file mode 120000 index a8f6bd06b0..0000000000 --- a/src/gallium/state_trackers/dri/sw/dri_st_api.c +++ /dev/null @@ -1 +0,0 @@ -../common/dri_st_api.c \ No newline at end of file diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c index c3f88c936e..dcf645593f 100644 --- a/src/gallium/state_trackers/dri/sw/drisw.c +++ b/src/gallium/state_trackers/dri/sw/drisw.c @@ -99,7 +99,7 @@ drisw_present_texture(__DRIdrawable *dPriv, if (!psurf) return; - screen->pipe_screen->flush_frontbuffer(screen->pipe_screen, psurf, drawable); + screen->base.screen->flush_frontbuffer(screen->base.screen, psurf, drawable); } static INLINE void @@ -225,7 +225,7 @@ drisw_allocate_textures(struct dri_drawable *drawable, templ.bind = bind; drawable->textures[statts[i]] = - screen->pipe_screen->resource_create(screen->pipe_screen, &templ); + screen->base.screen->resource_create(screen->base.screen, &templ); } drawable->old_w = width; -- cgit v1.2.3