diff options
author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2009-02-02 02:13:07 +0100 |
---|---|---|
committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2009-02-02 02:13:07 +0100 |
commit | 59edbc70cd1042a884e7d153ba547c2f7f87318d (patch) | |
tree | c5764fc515f31ab8017d63b476c8ec1178d41d96 /src/mesa/state_tracker/wgl/stw_device.c | |
parent | 4035e0f8989754ee7d31212e69d6461f1bbff008 (diff) | |
parent | 1c90cdd878e9d10e1f6ac619d5d0c3f5151fcb2b (diff) |
Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/mesa/mesa into gallium-0.2
Diffstat (limited to 'src/mesa/state_tracker/wgl/stw_device.c')
-rw-r--r-- | src/mesa/state_tracker/wgl/stw_device.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/wgl/stw_device.c b/src/mesa/state_tracker/wgl/stw_device.c index 129b24ce77..4c2fb5c61b 100644 --- a/src/mesa/state_tracker/wgl/stw_device.c +++ b/src/mesa/state_tracker/wgl/stw_device.c @@ -28,7 +28,6 @@ #include <windows.h> #include "pipe/p_debug.h" -#include "pipe/p_winsys.h" #include "pipe/p_screen.h" #include "stw_device.h" @@ -40,19 +39,18 @@ struct stw_device *stw_dev = NULL; /** - * XXX: Dispatch pipe_winsys::flush_front_buffer to our + * XXX: Dispatch pipe_screen::flush_front_buffer to our * stw_winsys::flush_front_buffer. */ static void -st_flush_frontbuffer(struct pipe_winsys *ws, +st_flush_frontbuffer(struct pipe_screen *screen, struct pipe_surface *surf, void *context_private ) { const struct stw_winsys *stw_winsys = stw_dev->stw_winsys; - struct pipe_winsys *winsys = stw_dev->screen->winsys; HDC hdc = (HDC)context_private; - stw_winsys->flush_frontbuffer(winsys, surf, hdc); + stw_winsys->flush_frontbuffer(screen, surf, hdc); } @@ -72,8 +70,7 @@ st_init(const struct stw_winsys *stw_winsys) if(!stw_dev->screen) goto error1; - /* XXX: pipe_winsys::flush_frontbuffer should go away */ - stw_dev->screen->winsys->flush_frontbuffer = st_flush_frontbuffer; + stw_dev->screen->flush_frontbuffer = st_flush_frontbuffer; pixelformat_init(); |