summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <jose.r.fonseca@gmail.com>2012-12-08 11:45:58 +0000
committerJosé Fonseca <jfonseca@vmware.com>2012-12-11 16:45:01 +0000
commitbc4bf3c84015144100ebdb4015bf06f7eab9f646 (patch)
tree8c3decbab6f26728cefd288c3556dc9aa157f32c
parentb361bb3de4bd8d27f6fcb920e5516e51db00ef73 (diff)
softpipe: Use os_time_get_nano() everywhere.
-rw-r--r--src/gallium/drivers/softpipe/sp_query.c8
-rw-r--r--src/gallium/drivers/softpipe/sp_screen.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/softpipe/sp_query.c b/src/gallium/drivers/softpipe/sp_query.c
index c173736d714..2dd82c81d6f 100644
--- a/src/gallium/drivers/softpipe/sp_query.c
+++ b/src/gallium/drivers/softpipe/sp_query.c
@@ -91,7 +91,7 @@ softpipe_begin_query(struct pipe_context *pipe, struct pipe_query *q)
break;
case PIPE_QUERY_TIMESTAMP_DISJOINT:
case PIPE_QUERY_TIME_ELAPSED:
- sq->start = 1000*os_time_get();
+ sq->start = os_time_get_nano();
break;
case PIPE_QUERY_SO_STATISTICS:
sq->so.primitives_storage_needed = 0;
@@ -131,7 +131,7 @@ softpipe_end_query(struct pipe_context *pipe, struct pipe_query *q)
/* fall through */
case PIPE_QUERY_TIMESTAMP_DISJOINT:
case PIPE_QUERY_TIME_ELAPSED:
- sq->end = 1000*os_time_get();
+ sq->end = os_time_get_nano();
break;
case PIPE_QUERY_SO_STATISTICS:
sq->so.primitives_storage_needed =
@@ -172,8 +172,8 @@ softpipe_get_query_result(struct pipe_context *pipe,
break;
case PIPE_QUERY_TIMESTAMP_DISJOINT: {
struct pipe_query_data_timestamp_disjoint td;
- /*os_get_time is in microseconds*/
- td.frequency = 1000000;
+ /* os_get_time_nano return nanoseconds */
+ td.frequency = UINT64_C(1000000000);
td.disjoint = sq->end != sq->start;
memcpy(vresult, &td,
sizeof(struct pipe_query_data_timestamp_disjoint));
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 909fa1c98b2..f3448142959 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -366,7 +366,7 @@ softpipe_flush_frontbuffer(struct pipe_screen *_screen,
static uint64_t
softpipe_get_timestamp(struct pipe_screen *_screen)
{
- return os_time_get()*1000;
+ return os_time_get_nano();
}
/**