Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

Conflicts:
	configs/default

1 files changed, 1 insertions, 17 deletions

diff --git a/src/gallium/state_trackers/python/st_hardpipe_winsys.c b/src/gallium/state_trackers/python/st_hardpipe_winsys.c
index 1e04998..8b33c70 100644
--- a/src/gallium/state_trackers/python/st_hardpipe_winsys.c
+++ b/src/gallium/state_trackers/python/st_hardpipe_winsys.c
@@ -42,13 +42,6 @@ extern void init_gallium(void);
 void (*force_init_gallium_linkage)(void) = &init_gallium;
 
 
-static void 
-st_hardpipe_screen_destroy(struct pipe_screen *screen)
-{
-   st_softpipe_winsys.screen_destroy(screen);
-}
-
-
 static struct pipe_screen *
 st_hardpipe_screen_create(void)
 {
@@ -56,13 +49,6 @@ st_hardpipe_screen_create(void)
 }
 
 
-static void
-st_hardpipe_context_destroy(struct pipe_context *pipe)
-{
-   st_softpipe_winsys.context_destroy(pipe);
-}
-
-
 static struct pipe_context *
 st_hardpipe_context_create(struct pipe_screen *screen)
 {
@@ -72,7 +58,5 @@ st_hardpipe_context_create(struct pipe_screen *screen)
 
 const struct st_winsys st_hardpipe_winsys = {
    &st_hardpipe_screen_create,
-   &st_hardpipe_screen_destroy,
-   &st_hardpipe_context_create,
-   &st_hardpipe_context_destroy
+   &st_hardpipe_context_create
 };