* Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com>
*/
-#include "pipe/p_winsys.h"
+#include "pipe/p_state.h"
+#include "pipe/internal/p_winsys_screen.h"
#include "u_timed_winsys.h"
#include "util/u_memory.h"
#include "util/u_time.h"
uint64_t start = time_start();
struct pipe_buffer *buf =
- backend->_buffer_create( backend, alignment, usage, size );
+ backend->buffer_create( backend, alignment, usage, size );
time_finish(winsys, start, 0, __FUNCTION__);
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
uint64_t start = time_start();
- struct pipe_buffer *buf = backend->_user_buffer_create( backend, data, bytes );
+ struct pipe_buffer *buf = backend->user_buffer_create( backend, data, bytes );
time_finish(winsys, start, 1, __FUNCTION__);
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
uint64_t start = time_start();
- void *map = backend->_buffer_map( backend, buf, flags );
+ void *map = backend->buffer_map( backend, buf, flags );
time_finish(winsys, start, 2, __FUNCTION__);
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
uint64_t start = time_start();
- backend->_buffer_unmap( backend, buf );
+ backend->buffer_unmap( backend, buf );
time_finish(winsys, start, 3, __FUNCTION__);
}
static void
-timed_buffer_destroy(struct pipe_winsys *winsys,
- struct pipe_buffer *buf)
+timed_buffer_destroy(struct pipe_buffer *buf)
{
+ struct pipe_winsys *winsys = buf->screen->winsys;
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
uint64_t start = time_start();
- backend->_buffer_destroy( backend, buf );
+ backend->buffer_destroy( buf );
time_finish(winsys, start, 4, __FUNCTION__);
}
unsigned width, unsigned height,
enum pipe_format format,
unsigned usage,
+ unsigned tex_usage,
unsigned *stride)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
uint64_t start = time_start();
- struct pipe_buffer *ret = backend->_surface_buffer_create( backend, width, height,
- format, usage, stride );
+ struct pipe_buffer *ret = backend->surface_buffer_create( backend, width, height,
+ format, usage, tex_usage, stride );
time_finish(winsys, start, 7, __FUNCTION__);
{
struct timed_winsys *ws = CALLOC_STRUCT(timed_winsys);
- ws->base._user_buffer_create = timed_user_buffer_create;
- ws->base._buffer_map = timed_buffer_map;
- 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.user_buffer_create = timed_user_buffer_create;
+ ws->base.buffer_map = timed_buffer_map;
+ 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.fence_reference = timed_fence_reference;