mesa: Remove unnecessary headers from fbobject.c.

[mesa.git] / src / mesa / main / syncobj.c

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index cbeda4b384d6f4ea7defa45ed89cbc17069c0832..ac3f9eb17523e6f194a5e3cf220d6d0dace7845c 100644 (file)
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -56,7 +56,6 @@
  */
 
 #include "glheader.h"
-#include "hash.h"
 #include "imports.h"
 #include "context.h"
 #include "macros.h"
@@ -91,7 +90,7 @@ _mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) condition;
    (void) flags;
 
-   syncObj->Status = 1;
+   syncObj->StatusFlag = 1;
 }
 
 
@@ -116,7 +115,6 @@ _mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) flags;
    (void) timeout;
 
-
    /* No-op for software rendering.  Hardware drivers will need to wait until
     * the state of the sync object changes or the timeout expires.
     */
@@ -185,33 +183,31 @@ _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
       remove_from_list(& syncObj->link);
       _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
-      (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
+      ctx->Driver.DeleteSyncObject(ctx, syncObj);
    } else {
       _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
    }
 }
 
 
-GLboolean
+GLboolean GLAPIENTRY
 _mesa_IsSync(GLsync sync)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
-
    return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;
 }
 
 
-void
+void GLAPIENTRY
 _mesa_DeleteSync(GLsync sync)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    /* From the GL_ARB_sync spec:
     *
     *    DeleteSync will silently ignore a <sync> value of zero. An
@@ -227,7 +223,6 @@ _mesa_DeleteSync(GLsync sync)
       return;
    }
 
-
    /* If there are no client-waits or server-waits pending on this sync, delete
     * the underlying object.
     */
@@ -236,15 +231,13 @@ _mesa_DeleteSync(GLsync sync)
 }
 
 
-
-GLsync
+GLsync GLAPIENTRY
 _mesa_FenceSync(GLenum condition, GLbitfield flags)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_sync_object *syncObj;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
-
    if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",
                  condition);
@@ -257,7 +250,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       return 0;
    }
 
-   syncObj = (*ctx->Driver.NewSyncObject)(ctx, GL_SYNC_FENCE);
+   syncObj = ctx->Driver.NewSyncObject(ctx, GL_SYNC_FENCE);
    if (syncObj != NULL) {
       syncObj->Type = GL_SYNC_FENCE;
       /* The name is not currently used, and it is never visible to
@@ -270,9 +263,9 @@ _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);
+      ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
 
       _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
       insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);
@@ -285,7 +278,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
 }
 
 
-GLenum
+GLenum GLAPIENTRY
 _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -293,7 +286,6 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    GLenum ret;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
       return GL_WAIT_FAILED;
@@ -304,7 +296,6 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
       return GL_WAIT_FAILED;
    }
 
-
    _mesa_ref_sync_object(ctx, syncObj);
 
    /* From the GL_ARB_sync spec:
@@ -314,13 +305,13 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
-   (*ctx->Driver.CheckSync)(ctx, syncObj);
-   if (syncObj->Status) {
+   ctx->Driver.CheckSync(ctx, syncObj);
+   if (syncObj->StatusFlag) {
       ret = GL_ALREADY_SIGNALED;
    } else {
-      (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
+      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);
@@ -328,14 +319,13 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 }
 
 
-void
+void GLAPIENTRY
 _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
       return;
@@ -354,11 +344,11 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
       return;
    }
 
-   (*ctx->Driver.ServerWaitSync)(ctx, syncObj, flags, timeout);
+   ctx->Driver.ServerWaitSync(ctx, syncObj, flags, timeout);
 }
 
 
-void
+void GLAPIENTRY
 _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
                GLint *values)
 {
@@ -368,13 +358,11 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
    GLint v[1];
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
       return;
    }
 
-
    switch (pname) {
    case GL_OBJECT_TYPE:
       v[0] = syncObj->Type;
@@ -391,9 +379,9 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
        * this call won't block.  It just updates state in the common object
        * data from the current driver state.
        */
-      (*ctx->Driver.CheckSync)(ctx, syncObj);
+      ctx->Driver.CheckSync(ctx, syncObj);
 
-      v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
+      v[0] = (syncObj->StatusFlag) ? GL_SIGNALED : GL_UNSIGNALED;
       size = 1;
       break;
 
@@ -407,14 +395,12 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
       return;
    }
 
-
    if (size > 0) {
       const GLsizei copy_count = MIN2(size, bufSize);
 
       _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
    }
 
-
    if (length != NULL) {
       *length = size;
    }