diff options
author | Zack Rusin <zackr@vmware.com> | 2009-02-01 18:48:16 -0500 |
---|---|---|
committer | Zack Rusin <zackr@vmware.com> | 2009-02-01 18:48:16 -0500 |
commit | 1c90cdd878e9d10e1f6ac619d5d0c3f5151fcb2b (patch) | |
tree | f7463e67788d7b096668e2627118f39aec81ba81 /src/gallium/auxiliary/util/u_timed_winsys.c | |
parent | 9aa73cfae84c7710df97ce182d32bea8d3423ab7 (diff) | |
parent | 64e525eab9e7c60ee18bc75e6f269783533d5edd (diff) |
Merge branch 'gallium-winsys-private' into gallium-0.2
Diffstat (limited to 'src/gallium/auxiliary/util/u_timed_winsys.c')
-rw-r--r-- | src/gallium/auxiliary/util/u_timed_winsys.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_timed_winsys.c b/src/gallium/auxiliary/util/u_timed_winsys.c index dc3c9be595..f237e12d73 100644 --- a/src/gallium/auxiliary/util/u_timed_winsys.c +++ b/src/gallium/auxiliary/util/u_timed_winsys.c @@ -29,7 +29,7 @@ * Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com> */ -#include "pipe/p_winsys.h" +#include "pipe/internal/p_winsys_screen.h" #include "u_timed_winsys.h" #include "util/u_memory.h" #include "util/u_time.h" @@ -121,7 +121,8 @@ timed_buffer_create(struct pipe_winsys *winsys, struct pipe_winsys *backend = timed_winsys(winsys)->backend; uint64_t start = time_start(); - struct pipe_buffer *buf = backend->buffer_create( backend, alignment, usage, size ); + struct pipe_buffer *buf = + backend->buffer_create( backend, alignment, usage, size ); time_finish(winsys, start, 0, __FUNCTION__); @@ -300,9 +301,9 @@ struct pipe_winsys *u_timed_winsys_create( struct pipe_winsys *backend ) ws->base.buffer_unmap = timed_buffer_unmap; ws->base.buffer_destroy = timed_buffer_destroy; ws->base.buffer_create = timed_buffer_create; + ws->base.surface_buffer_create = timed_surface_buffer_create; ws->base.flush_frontbuffer = timed_flush_frontbuffer; ws->base.get_name = timed_get_name; - ws->base.surface_buffer_create = timed_surface_buffer_create; ws->base.fence_reference = timed_fence_reference; ws->base.fence_signalled = timed_fence_signalled; ws->base.fence_finish = timed_fence_finish; |