aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-01 10:37:47 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-01 10:37:47 +0000
commit19c0c3d2a4e7d6af7ea4b444390a200fac290eb2 (patch)
tree50d888e9f7bb3cc6678ea504b04412d6aff19a68
parentrender: call wl_display_flush() right after wl_surface_commit() (diff)
render: presentation: cleanup
-rw-r--r--render.c26
1 files changed, 20 insertions, 6 deletions
diff --git a/render.c b/render.c
index 0a7fdf69..97284cbb 100644
--- a/render.c
+++ b/render.c
@@ -57,17 +57,20 @@ presented(void *data,
{
struct terminal *term = data;
- struct timeval input = {
+ if (term->render.commit_time.tv_sec == 0 && term->render.commit_time.tv_nsec == 0)
+ return;
+
+ const struct timeval input = {
.tv_sec = term->render.input_time.tv_sec,
.tv_usec = term->render.input_time.tv_nsec / 1000,
};
- struct timeval commit = {
+ const struct timeval commit = {
.tv_sec = term->render.commit_time.tv_sec,
- .tv_usec = term->render.commit_time.tv_nsec / 1000
+ .tv_usec = term->render.commit_time.tv_nsec / 1000,
};
- struct timeval presented = {
+ const struct timeval presented = {
.tv_sec = (uint64_t)tv_sec_hi << 32 | tv_sec_lo,
.tv_usec = tv_nsec / 1000,
};
@@ -77,6 +80,14 @@ presented(void *data,
char msg[1024];
int chars = 0;
+ if (use_input && timercmp(&presented, &input, <))
+ return;
+ else if (timercmp(&presented, &commit, <))
+ return;
+
+ LOG_DBG("commit: %lu s %lu µs, presented: %lu s %lu µs",
+ commit.tv_sec, commit.tv_usec, presented.tv_sec, presented.tv_usec);
+
if (use_input) {
struct timeval diff;
timersub(&commit, &input, &diff);
@@ -89,10 +100,13 @@ presented(void *data,
chars += snprintf(&msg[chars], sizeof(msg) - chars,
"commit - %lu µs -> ", diff.tv_usec);
- if (use_input)
+ if (use_input) {
+ assert(timercmp(&presented, &input, >));
timersub(&presented, &input, &diff);
- else
+ } else {
+ assert(timercmp(&presented, &commit, >));
timersub(&presented, &commit, &diff);
+ }
chars += snprintf(&msg[chars], sizeof(msg) - chars,
"presented (total: %lu µs)", diff.tv_usec);