summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-01-30 21:51:59 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-01-30 21:51:59 +0000
commitb5d96a3e7f02314cbdc3897c4b89137f1e13bb0f (patch)
treeedf1879fedf6959ee18a0ab0865142f9c88d7cb8
parentadfbba476db1fc55006efb748656ebb1a481d143 (diff)
stw: Don't use the winsys.
-rw-r--r--src/gallium/winsys/gdi/gdi_softpipe_winsys.c20
-rw-r--r--src/mesa/state_tracker/wgl/stw_device.c9
-rw-r--r--src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c3
-rw-r--r--src/mesa/state_tracker/wgl/stw_winsys.h2
4 files changed, 15 insertions, 19 deletions
diff --git a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
index 738bca3eac..1abe84b6a0 100644
--- a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
+++ b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
@@ -177,9 +177,9 @@ gdi_softpipe_surface_buffer_create(struct pipe_winsys *winsys,
nblocksy = pf_get_nblocksy(&block, height);
*stride = round_up(nblocksx * block.size, alignment);
- return winsys->_buffer_create(winsys, alignment,
- usage,
- *stride * nblocksy);
+ return winsys->buffer_create(winsys, alignment,
+ usage,
+ *stride * nblocksy);
}
@@ -237,13 +237,13 @@ gdi_softpipe_screen_create(void)
winsys->destroy = gdi_softpipe_destroy;
- winsys->_buffer_create = gdi_softpipe_buffer_create;
- winsys->_user_buffer_create = gdi_softpipe_user_buffer_create;
- winsys->_buffer_map = gdi_softpipe_buffer_map;
- winsys->_buffer_unmap = gdi_softpipe_buffer_unmap;
- winsys->_buffer_destroy = gdi_softpipe_buffer_destroy;
+ winsys->buffer_create = gdi_softpipe_buffer_create;
+ winsys->user_buffer_create = gdi_softpipe_user_buffer_create;
+ winsys->buffer_map = gdi_softpipe_buffer_map;
+ winsys->buffer_unmap = gdi_softpipe_buffer_unmap;
+ winsys->buffer_destroy = gdi_softpipe_buffer_destroy;
- winsys->_surface_buffer_create = gdi_softpipe_surface_buffer_create;
+ winsys->surface_buffer_create = gdi_softpipe_surface_buffer_create;
winsys->fence_reference = gdi_softpipe_fence_reference;
winsys->fence_signalled = gdi_softpipe_fence_signalled;
@@ -268,7 +268,7 @@ gdi_softpipe_context_create(struct pipe_screen *screen)
static void
-gdi_softpipe_flush_frontbuffer(struct pipe_winsys *winsys,
+gdi_softpipe_flush_frontbuffer(struct pipe_screen *screen,
struct pipe_surface *surface,
HDC hDC)
{
diff --git a/src/mesa/state_tracker/wgl/stw_device.c b/src/mesa/state_tracker/wgl/stw_device.c
index 0073fdbc23..546ab6c312 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/internal/p_winsys_screen.h"
#include "pipe/p_screen.h"
#include "stw_device.h"
@@ -44,15 +43,14 @@ struct stw_device *stw_dev = NULL;
* 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();
diff --git a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c b/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
index ddc482752b..41bfeadfb1 100644
--- a/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
+++ b/src/mesa/state_tracker/wgl/stw_wgl_swapbuffers.c
@@ -27,7 +27,6 @@
#include <windows.h>
-#include "pipe/internal/p_winsys_screen.h"
#include "pipe/p_screen.h"
#include "pipe/p_context.h"
#include "state_tracker/st_context.h"
@@ -55,7 +54,7 @@ wglSwapBuffers(
st_get_framebuffer_surface( fb->stfb, ST_SURFACE_BACK_LEFT, &surf );
- stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen->winsys,
+ stw_dev->stw_winsys->flush_frontbuffer(stw_dev->screen,
surf,
hdc );
diff --git a/src/mesa/state_tracker/wgl/stw_winsys.h b/src/mesa/state_tracker/wgl/stw_winsys.h
index 8557327ccd..03fd8f6bd8 100644
--- a/src/mesa/state_tracker/wgl/stw_winsys.h
+++ b/src/mesa/state_tracker/wgl/stw_winsys.h
@@ -46,7 +46,7 @@ struct stw_winsys
(*create_context)( struct pipe_screen *screen );
void
- (*flush_frontbuffer)( struct pipe_winsys *winsys,
+ (*flush_frontbuffer)( struct pipe_screen *screen,
struct pipe_surface *surf,
HDC hDC );
};