Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / state_trackers / python / st_winsys.h

diff --git a/src/gallium/state_trackers/python/st_winsys.h b/src/gallium/state_trackers/python/st_winsys.h
index 992fc9ab4ba88629706b9ac61064020a0ec013df..b8cb612d863fedbce2d853d2499ea1962d0a2d96 100644 (file)
--- a/src/gallium/state_trackers/python/st_winsys.h
+++ b/src/gallium/state_trackers/python/st_winsys.h
@@ -39,20 +39,14 @@ struct st_winsys
    struct pipe_screen *
    (*screen_create)(void);
 
-   void
-   (*screen_destroy)(struct pipe_screen *screen);
-
    struct pipe_context *
    (*context_create)(struct pipe_screen *screen);
-
-   void
-   (*context_destroy)(struct pipe_context *pipe);
 };
 
 
-extern const struct st_winsys st_software_winsys;
+extern const struct st_winsys st_softpipe_winsys;
 
-extern const struct st_winsys st_hardware_winsys;
+extern const struct st_winsys st_hardpipe_winsys;
 
 
 #endif /* ST_WINSYS_H_ */