projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b6e703
)
llvmpipe: Call pipe_thread_wait() on Linux.
author
José Fonseca
<jfonseca@vmware.com>
Thu, 13 Nov 2014 15:01:19 +0000
(15:01 +0000)
committer
José Fonseca
<jfonseca@vmware.com>
Thu, 13 Nov 2014 15:01:19 +0000
(15:01 +0000)
To address http://lists.freedesktop.org/archives/mesa-dev/2014-November/070569.html
In short, revert
706ad3b649e6a75fdac9dc9acc3caa9e6067b853
for non-Windows
OSes.
src/gallium/drivers/llvmpipe/lp_rast.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/llvmpipe/lp_rast.c
b/src/gallium/drivers/llvmpipe/lp_rast.c
index 6b54d4374f75b711f9a93b40533654a9a9532e32..e168766e348f88e27b4c8753b4e42d2a45fb7a3b 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/
src/gallium/drivers/llvmpipe/lp_rast.c
@@
-800,7
+800,9
@@
static PIPE_THREAD_ROUTINE( thread_function, init_data )
pipe_semaphore_signal(&task->work_done);
}
+#ifdef _WIN32
pipe_semaphore_signal(&task->work_done);
+#endif
return 0;
}
@@
-891,7
+893,11
@@
void lp_rast_destroy( struct lp_rasterizer *rast )
* We don't actually call pipe_thread_wait to avoid dead lock on Windows
* per https://bugs.freedesktop.org/show_bug.cgi?id=76252 */
for (i = 0; i < rast->num_threads; i++) {
+#ifdef _WIN32
pipe_semaphore_wait(&rast->tasks[i].work_done);
+#else
+ pipe_thread_wait(rast->threads[i]);
+#endif
}
/* Clean up per-thread data */