Mesa (master): i965/sync: Rename brw_fence_insert()

Chad Versace chadversary at kemper.freedesktop.org
Fri Jan 27 21:17:20 UTC 2017


Module: Mesa
Branch: master
Commit: 0b6dd31d681060db6920ac9b8f1bcf6970d2a45e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0b6dd31d681060db6920ac9b8f1bcf6970d2a45e

Author: Chad Versace <chadversary at chromium.org>
Date:   Fri Jan 13 10:46:49 2017 -0800

i965/sync: Rename brw_fence_insert()

Rename to brw_fence_insert_locked(). This is correct because the fence's
mutex is effectively locked, as all callers are also *creators* of the
fence, and have not yet returned the new fence.

This reduces noise in the next patch, which defines and uses
brw_fence_insert(), an unlocked variant.

Reviewed-by: Rafael Antognolli <rafael.antognolli at intel.com>
Tested-by: Rafael Antognolli <rafael.antognolli at intel.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_sync.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_sync.c b/src/mesa/drivers/dri/i965/brw_sync.c
index 24c8cbd..77d382c 100644
--- a/src/mesa/drivers/dri/i965/brw_sync.c
+++ b/src/mesa/drivers/dri/i965/brw_sync.c
@@ -91,7 +91,7 @@ brw_fence_finish(struct brw_fence *fence)
 }
 
 static bool MUST_CHECK
-brw_fence_insert(struct brw_context *brw, struct brw_fence *fence)
+brw_fence_insert_locked(struct brw_context *brw, struct brw_fence *fence)
 {
    brw_emit_mi_flush(brw);
 
@@ -249,7 +249,7 @@ brw_gl_fence_sync(struct gl_context *ctx, struct gl_sync_object *_sync,
 
    brw_fence_init(brw, &sync->fence, BRW_FENCE_TYPE_BO_WAIT);
 
-   if (!brw_fence_insert(brw, &sync->fence)) {
+   if (!brw_fence_insert_locked(brw, &sync->fence)) {
       /* FIXME: There exists no way to report a GL error here. If an error
        * occurs, continue silently and hope for the best.
        */
@@ -309,7 +309,7 @@ brw_dri_create_fence(__DRIcontext *ctx)
 
    brw_fence_init(brw, fence, BRW_FENCE_TYPE_BO_WAIT);
 
-   if (!brw_fence_insert(brw, fence)) {
+   if (!brw_fence_insert_locked(brw, fence)) {
       brw_fence_finish(fence);
       free(fence);
       return NULL;




More information about the mesa-commit mailing list