fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 02:20:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: rename gl_sync_object::Status to StatusFlag

Browse source 
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.
This commit is contained in:
Brian Paul 2009-09-03 12:47:25 -06:00
parent 446a71d1f8
commit e059885ce3
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/intel/intel_syncobj.c
View file

@ -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;
}
}

2
src/mesa/main/mtypes.h
View file

@ -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? */
};

10
src/mesa/main/syncobj.c
View file

@ -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;