diff options
author | Ian Romanick <[email protected]> | 2009-09-01 11:56:34 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2009-09-03 11:22:47 -0700 |
commit | 6af24b6b03a2ce8300c7ae78fd06c6b1edd02017 (patch) | |
tree | a517933ddd8d146c6f690e748394a8157d2f3eb9 /src/mesa/main | |
parent | 0f8fdd81989de5026c8e415f1525931b74dd8647 (diff) |
Whitespace and include file clean-up.
Based on review comments by Brian Paul.
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/syncobj.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c index cbeda4b384d..b3c75c747a7 100644 --- 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" @@ -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. */ @@ -199,7 +197,6 @@ _mesa_IsSync(GLsync sync) 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; } @@ -211,7 +208,6 @@ _mesa_DeleteSync(GLsync sync) 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,7 +231,6 @@ _mesa_DeleteSync(GLsync sync) } - GLsync _mesa_FenceSync(GLenum condition, GLbitfield flags) { @@ -244,7 +238,6 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags) 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); @@ -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: @@ -335,7 +326,6 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) 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; @@ -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; @@ -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; } |