diff options
Diffstat (limited to 'dist/Mesa/src/mesa/drivers/dri/common/dri_bufmgr.c')
| -rw-r--r-- | dist/Mesa/src/mesa/drivers/dri/common/dri_bufmgr.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/dist/Mesa/src/mesa/drivers/dri/common/dri_bufmgr.c b/dist/Mesa/src/mesa/drivers/dri/common/dri_bufmgr.c index 370b56c3a..ebeed9a20 100644 --- a/dist/Mesa/src/mesa/drivers/dri/common/dri_bufmgr.c +++ b/dist/Mesa/src/mesa/drivers/dri/common/dri_bufmgr.c @@ -115,7 +115,7 @@ driFenceType(DriFenceObject * fence) unsigned ret; _glthread_LOCK_MUTEX(bmMutex); - ret = fence->fence.flags; + ret = fence->fence.type; _glthread_UNLOCK_MUTEX(bmMutex); return ret; @@ -190,11 +190,16 @@ driBOKernel(struct _DriBufferObject *buf) void driBOWaitIdle(struct _DriBufferObject *buf, int lazy) { - assert(buf->private != NULL); + struct _DriBufferPool *pool; + void *priv; _glthread_LOCK_MUTEX(buf->mutex); - BM_CKFATAL(buf->pool->waitIdle(buf->pool, buf->private, lazy)); + pool = buf->pool; + priv = buf->private; _glthread_UNLOCK_MUTEX(buf->mutex); + + assert(priv != NULL); + BM_CKFATAL(buf->pool->waitIdle(pool, priv, lazy)); } void * @@ -296,7 +301,8 @@ driBOData(struct _DriBufferObject *buf, pool->destroy(pool, buf->private); if (!flags) flags = buf->flags; - buf->private = pool->create(pool, size, flags, 0, buf->alignment); + buf->private = pool->create(pool, size, flags, DRM_BO_HINT_DONT_FENCE, + buf->alignment); if (!buf->private) BM_CKFATAL(-ENOMEM); BM_CKFATAL(pool->map(pool, buf->private, @@ -431,7 +437,7 @@ void driBOCreateList(int target, drmBOList * list) { _glthread_LOCK_MUTEX(bmMutex); - BM_CKFATAL(drmBOCreateList(20, list)); + BM_CKFATAL(drmBOCreateList(target, list)); _glthread_UNLOCK_MUTEX(bmMutex); } |