mesa: rename gl_sync_object::Status to StatusFlag

There's a symbol collision with X11/Xlib.h #define Status int
in the Mesa xlib code.  This seems the simpliest way to work around this.

diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c
index d447b6a..1286fe9 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_syncobj.c
+++ b/src/mesa/drivers/dri/intel/intel_syncobj.c
@@ -94,7 +94,7 @@ static void intel_client_wait_sync(GLcontext *ctx, struct gl_sync_object *s,
 
    if (sync->bo) {
       drm_intel_bo_wait_rendering(sync->bo);
-      s->Status = 1;
+      s->StatusFlag = 1;
       drm_intel_bo_unreference(sync->bo);
       sync->bo = NULL;
    }
@@ -117,7 +117,7 @@ static void intel_check_sync(GLcontext *ctx, struct gl_sync_object *s)
    if (sync->bo && drm_intel_bo_busy(sync->bo)) {
       drm_intel_bo_unreference(sync->bo);
       sync->bo = NULL;
-      s->Status = 1;
+      s->StatusFlag = 1;
    }
 }
 

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bd3bf28..6b64bf8 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1998,7 +1998,7 @@ struct gl_sync_object {
                               */
    GLenum SyncCondition;
    GLbitfield Flags;          /**< Flags passed to glFenceSync */
-   GLuint Status:1;           /**< Has the sync object been signaled? */
+   GLuint StatusFlag:1;       /**< Has the sync object been signaled? */
 };
 
 

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 075931c..64f923f 100644 (file)
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -90,7 +90,7 @@ _mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) condition;
    (void) flags;
 
-   syncObj->Status = 1;
+   syncObj->StatusFlag = 1;
 }
 
 
@@ -263,7 +263,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       syncObj->DeletePending = GL_FALSE;
       syncObj->SyncCondition = condition;
       syncObj->Flags = flags;
-      syncObj->Status = 0;
+      syncObj->StatusFlag = 0;
 
       ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
 
@@ -306,12 +306,12 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
    ctx->Driver.CheckSync(ctx, syncObj);
-   if (syncObj->Status) {
+   if (syncObj->StatusFlag) {
       ret = GL_ALREADY_SIGNALED;
    } else {
       ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);
 
-      ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+      ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
 
    _mesa_unref_sync_object(ctx, syncObj);
@@ -381,7 +381,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
        */
       ctx->Driver.CheckSync(ctx, syncObj);
 
-      v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
+      v[0] = (syncObj->StatusFlag) ? GL_SIGNALED : GL_UNSIGNALED;
       size = 1;
       break;