Mesa (master): r300g: handle timeout parameter in fence_finish
Marek Olšák
mareko at kemper.freedesktop.org
Tue Mar 8 23:16:29 UTC 2011
Module: Mesa
Branch: master
Commit: ac8821ffe2fc3972bc4744201491a4a41df877e6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac8821ffe2fc3972bc4744201491a4a41df877e6
Author: Marek Olšák <maraeo at gmail.com>
Date: Sat Mar 5 21:46:06 2011 +0100
r300g: handle timeout parameter in fence_finish
---
src/gallium/drivers/r300/r300_screen.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 18ed035..a929a2e 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -24,6 +24,7 @@
#include "util/u_format.h"
#include "util/u_format_s3tc.h"
#include "util/u_memory.h"
+#include "os/os_time.h"
#include "r300_context.h"
#include "r300_texture.h"
@@ -440,6 +441,22 @@ static int r300_fence_finish(struct pipe_screen *screen,
struct r300_winsys_screen *rws = r300_screen(screen)->rws;
struct r300_winsys_bo *rfence = (struct r300_winsys_bo*)fence;
+ if (timeout != PIPE_TIMEOUT_INFINITE) {
+ int64_t start_time = os_time_get();
+
+ /* Convert to microseconds. */
+ timeout /= 1000;
+
+ /* Wait in a loop. */
+ while (rws->buffer_is_busy(rfence)) {
+ if (os_time_get() - start_time >= timeout) {
+ return 1;
+ }
+ os_time_sleep(10);
+ }
+ return 0;
+ }
+
rws->buffer_wait(rfence);
return 0; /* 0 == success */
}
More information about the mesa-commit
mailing list