summaryrefslogtreecommitdiffstats
path: root/src/gallium/include/state_tracker
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-11-10 19:08:50 +0100
committerMarek Olšák <[email protected]>2017-11-11 04:12:53 +0100
commit3a71eac783ea5a1c16772f8ec91c4a01ca32504d (patch)
tree12c37d5374251f25dafd8b10fd7eb316df01672e /src/gallium/include/state_tracker
parent881f6e741fe0f63df1aa6aadba7e2eb64269cb20 (diff)
st/dri: fix deadlock when waiting on android fences
Android fences can't be deferred, because st/dri calls fence_finish with ctx = NULL, so the driver can't flush u_threaded_context. Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/include/state_tracker')
-rw-r--r--src/gallium/include/state_tracker/st_api.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h
index 6cdaefc902f..a407b980d94 100644
--- a/src/gallium/include/state_tracker/st_api.h
+++ b/src/gallium/include/state_tracker/st_api.h
@@ -147,8 +147,7 @@ enum st_attachment_type {
#define ST_FLUSH_FRONT (1 << 0)
#define ST_FLUSH_END_OF_FRAME (1 << 1)
#define ST_FLUSH_WAIT (1 << 2)
-#define ST_FLUSH_DEFERRED (1 << 3)
-#define ST_FLUSH_FENCE_FD (1 << 4)
+#define ST_FLUSH_FENCE_FD (1 << 3)
/**
* Value to st_manager->get_param function.