summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/xlib
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2010-03-08 19:23:10 +0000
committerKeith Whitwell <[email protected]>2010-03-08 19:23:10 +0000
commit3ab8211be40e3cd835bd1f6947b2c56f9a0c7a59 (patch)
tree66d487e3f3ed11186303fb1cb98464010be4d5ea /src/gallium/winsys/xlib
parentc867c58c7340eb5d56f7cc3edf95cce94600f858 (diff)
gallium: remove xlib_driver::display_surface
Just use flush_frontbuffer directly. The flush_frontbuffer routine has been somewhat devalued recently, but it is actually just the right interface for our needs. It is in pipe_screen, meaning that any wrapping (eg trace module) will get properly unwrapped before we try and use the pipe_surface argument for real. If a particular co-state-tracker needs to implement this itself, it should organize a way to allow the winsys to call back up to its level, rather than hijacking the driver-supplied implementation.
Diffstat (limited to 'src/gallium/winsys/xlib')
-rw-r--r--src/gallium/winsys/xlib/xlib_llvmpipe.c13
-rw-r--r--src/gallium/winsys/xlib/xlib_softpipe.c11
2 files changed, 0 insertions, 24 deletions
diff --git a/src/gallium/winsys/xlib/xlib_llvmpipe.c b/src/gallium/winsys/xlib/xlib_llvmpipe.c
index ceefc1624cc..8b66b7459d9 100644
--- a/src/gallium/winsys/xlib/xlib_llvmpipe.c
+++ b/src/gallium/winsys/xlib/xlib_llvmpipe.c
@@ -69,22 +69,9 @@ fail:
}
-static void
-xlib_llvmpipe_display_surface(struct xlib_drawable *xm_buffer,
- struct pipe_surface *surf)
-{
- struct llvmpipe_texture *texture = llvmpipe_texture(surf->texture);
-
- assert(texture->dt);
- if (texture->dt)
- xlib_sw_display(xm_buffer, texture->dt);
-}
-
-
struct xm_driver xlib_llvmpipe_driver =
{
.create_pipe_screen = xlib_create_llvmpipe_screen,
- .display_surface = xlib_llvmpipe_display_surface
};
diff --git a/src/gallium/winsys/xlib/xlib_softpipe.c b/src/gallium/winsys/xlib/xlib_softpipe.c
index 3b51d7c17c4..08b7f08837f 100644
--- a/src/gallium/winsys/xlib/xlib_softpipe.c
+++ b/src/gallium/winsys/xlib/xlib_softpipe.c
@@ -57,22 +57,11 @@ fail:
}
-static void
-xlib_softpipe_display_surface(struct xlib_drawable *xm_buffer,
- struct pipe_surface *surf)
-{
- struct softpipe_texture *texture = softpipe_texture(surf->texture);
-
- assert(texture->dt);
- if (texture->dt)
- xlib_sw_display(xm_buffer, texture->dt);
-}
struct xm_driver xlib_softpipe_driver =
{
.create_pipe_screen = xlib_create_softpipe_screen,
- .display_surface = xlib_softpipe_display_surface
};