* Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com>
*/
-#include "pipe/p_winsys.h"
+#include "pipe/p_state.h"
+#include "util/u_simple_screen.h"
#include "u_timed_winsys.h"
#include "util/u_memory.h"
-#include <sys/time.h>
-
+#include "os/os_time.h"
struct timed_winsys {
struct pipe_winsys base;
struct pipe_winsys *backend;
- unsigned long long last_dump;
+ uint64_t last_dump;
struct {
const char *name_key;
double total;
}
-static unsigned long long get_time( void )
-{
- struct timeval systime;
- gettimeofday( &systime, NULL );
- return (((unsigned long long) systime.tv_sec) * 1000000LL) + systime.tv_usec;
-}
-
-
-static unsigned long long time_start( void )
-{
- return get_time();
-}
-
-
static void time_display( struct pipe_winsys *winsys )
{
struct timed_winsys *tws = timed_winsys(winsys);
const char *name )
{
struct timed_winsys *tws = timed_winsys(winsys);
- unsigned long long endval = get_time();
+ int64_t endval = os_time_get();
double elapsed = (endval - startval)/1000.0;
if (endval - startval > 1000LL)
unsigned size )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
- 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__);
unsigned bytes)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
struct pipe_buffer *buf = backend->user_buffer_create( backend, data, bytes );
unsigned flags)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
void *map = backend->buffer_map( backend, buf, flags );
struct pipe_buffer *buf)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
backend->buffer_unmap( backend, buf );
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;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
- backend->buffer_destroy( backend, buf );
+ backend->buffer_destroy( buf );
time_finish(winsys, start, 4, __FUNCTION__);
}
void *context_private)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
backend->flush_frontbuffer( backend, surf, context_private );
-static struct pipe_surface *
-timed_surface_alloc(struct pipe_winsys *winsys)
-{
- struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
-
- struct pipe_surface *surf = backend->surface_alloc( backend );
-
- time_finish(winsys, start, 6, __FUNCTION__);
-
- return surf;
-}
-
-
-
-static int
-timed_surface_alloc_storage(struct pipe_winsys *winsys,
- struct pipe_surface *surf,
+static struct pipe_buffer *
+timed_surface_buffer_create(struct pipe_winsys *winsys,
unsigned width, unsigned height,
enum pipe_format format,
- unsigned flags,
- unsigned tex_usage)
+ unsigned usage,
+ unsigned tex_usage,
+ unsigned *stride)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
- int ret = backend->surface_alloc_storage( backend, surf, width, height,
- format, flags, tex_usage );
+ struct pipe_buffer *ret = backend->surface_buffer_create( backend, width, height,
+ format, usage, tex_usage, stride );
time_finish(winsys, start, 7, __FUNCTION__);
}
-static void
-timed_surface_release(struct pipe_winsys *winsys, struct pipe_surface **s)
-{
- struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
-
- backend->surface_release( backend, s );
-
- time_finish(winsys, start, 8, __FUNCTION__);
-}
-
-
-
static const char *
timed_get_name( struct pipe_winsys *winsys )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
const char *ret = backend->get_name( backend );
struct pipe_fence_handle *fence)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
backend->fence_reference( backend, ptr, fence );
unsigned flag )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
int ret = backend->fence_signalled( backend, fence, flag );
unsigned flag )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
- unsigned long long start = time_start();
+ int64_t start = os_time_get();
int ret = backend->fence_finish( backend, fence, flag );
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_alloc = timed_surface_alloc;
- ws->base.surface_alloc_storage = timed_surface_alloc_storage;
- ws->base.surface_release = timed_surface_release;
ws->base.fence_reference = timed_fence_reference;
ws->base.fence_signalled = timed_fence_signalled;
ws->base.fence_finish = timed_fence_finish;