projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600: don't enable depth test if there is no depth buffer
[mesa.git]
/
src
/
gallium
/
auxiliary
/
util
/
u_timed_winsys.c
diff --git
a/src/gallium/auxiliary/util/u_timed_winsys.c
b/src/gallium/auxiliary/util/u_timed_winsys.c
index f237e12d73502894c26a6c8b4fe8fa7ff9736ce6..d88298bc14c31b27c47e56523e0187f71b702bc9 100644
(file)
--- a/
src/gallium/auxiliary/util/u_timed_winsys.c
+++ b/
src/gallium/auxiliary/util/u_timed_winsys.c
@@
-29,10
+29,11
@@
* Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com>
*/
* Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com>
*/
-#include "pipe/internal/p_winsys_screen.h"
+#include "pipe/p_state.h"
+#include "util/u_simple_screen.h"
#include "u_timed_winsys.h"
#include "util/u_memory.h"
#include "u_timed_winsys.h"
#include "util/u_memory.h"
-#include "
util/u
_time.h"
+#include "
os/os
_time.h"
struct timed_winsys {
struct timed_winsys {
@@
-53,12
+54,6
@@
static struct timed_winsys *timed_winsys( struct pipe_winsys *winsys )
}
}
-static uint64_t time_start( void )
-{
- return util_time_micros();
-}
-
-
static void time_display( struct pipe_winsys *winsys )
{
struct timed_winsys *tws = timed_winsys(winsys);
static void time_display( struct pipe_winsys *winsys )
{
struct timed_winsys *tws = timed_winsys(winsys);
@@
-89,7
+84,7
@@
static void time_finish( struct pipe_winsys *winsys,
const char *name )
{
struct timed_winsys *tws = timed_winsys(winsys);
const char *name )
{
struct timed_winsys *tws = timed_winsys(winsys);
-
uint64_t endval = util_time_micros
();
+
int64_t endval = os_time_get
();
double elapsed = (endval - startval)/1000.0;
if (endval - startval > 1000LL)
double elapsed = (endval - startval)/1000.0;
if (endval - startval > 1000LL)
@@
-119,7
+114,7
@@
timed_buffer_create(struct pipe_winsys *winsys,
unsigned size )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
unsigned size )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
struct pipe_buffer *buf =
backend->buffer_create( backend, alignment, usage, size );
struct pipe_buffer *buf =
backend->buffer_create( backend, alignment, usage, size );
@@
-138,7
+133,7
@@
timed_user_buffer_create(struct pipe_winsys *winsys,
unsigned bytes)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
unsigned bytes)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
struct pipe_buffer *buf = backend->user_buffer_create( backend, data, bytes );
struct pipe_buffer *buf = backend->user_buffer_create( backend, data, bytes );
@@
-154,7
+149,7
@@
timed_buffer_map(struct pipe_winsys *winsys,
unsigned flags)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
unsigned flags)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
void *map = backend->buffer_map( backend, buf, flags );
void *map = backend->buffer_map( backend, buf, flags );
@@
-169,7
+164,7
@@
timed_buffer_unmap(struct pipe_winsys *winsys,
struct pipe_buffer *buf)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
struct pipe_buffer *buf)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
backend->buffer_unmap( backend, buf );
backend->buffer_unmap( backend, buf );
@@
-178,13
+173,13
@@
timed_buffer_unmap(struct pipe_winsys *winsys,
static void
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;
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
- backend->buffer_destroy( b
ackend, b
uf );
+ backend->buffer_destroy( buf );
time_finish(winsys, start, 4, __FUNCTION__);
}
time_finish(winsys, start, 4, __FUNCTION__);
}
@@
-196,7
+191,7
@@
timed_flush_frontbuffer( struct pipe_winsys *winsys,
void *context_private)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
void *context_private)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
backend->flush_frontbuffer( backend, surf, context_private );
backend->flush_frontbuffer( backend, surf, context_private );
@@
-211,13
+206,14
@@
timed_surface_buffer_create(struct pipe_winsys *winsys,
unsigned width, unsigned height,
enum pipe_format format,
unsigned usage,
unsigned width, unsigned height,
enum pipe_format format,
unsigned usage,
+ unsigned tex_usage,
unsigned *stride)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
unsigned *stride)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
struct pipe_buffer *ret = backend->surface_buffer_create( backend, width, height,
struct pipe_buffer *ret = backend->surface_buffer_create( backend, width, height,
- format, usage, stride );
+ format, usage,
tex_usage,
stride );
time_finish(winsys, start, 7, __FUNCTION__);
time_finish(winsys, start, 7, __FUNCTION__);
@@
-229,7
+225,7
@@
static const char *
timed_get_name( struct pipe_winsys *winsys )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
timed_get_name( struct pipe_winsys *winsys )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
const char *ret = backend->get_name( backend );
const char *ret = backend->get_name( backend );
@@
-244,7
+240,7
@@
timed_fence_reference(struct pipe_winsys *winsys,
struct pipe_fence_handle *fence)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
struct pipe_fence_handle *fence)
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
backend->fence_reference( backend, ptr, fence );
backend->fence_reference( backend, ptr, fence );
@@
-258,7
+254,7
@@
timed_fence_signalled( struct pipe_winsys *winsys,
unsigned flag )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
unsigned flag )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
int ret = backend->fence_signalled( backend, fence, flag );
int ret = backend->fence_signalled( backend, fence, flag );
@@
-273,7
+269,7
@@
timed_fence_finish( struct pipe_winsys *winsys,
unsigned flag )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
unsigned flag )
{
struct pipe_winsys *backend = timed_winsys(winsys)->backend;
-
uint64_t start = time_star
t();
+
int64_t start = os_time_ge
t();
int ret = backend->fence_finish( backend, fence, flag );
int ret = backend->fence_finish( backend, fence, flag );