projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Support EXT_framebuffer_blit targets in ES 3.0 as well.
[mesa.git]
/
src
/
mesa
/
main
/
syncobj.c
diff --git
a/src/mesa/main/syncobj.c
b/src/mesa/main/syncobj.c
index 9f5a27e6267b2cf34cec889aafb2eca75b28df38..745e982ad48936c93f51d3aea5f81bddd6c0a4ed 100644
(file)
--- a/
src/mesa/main/syncobj.c
+++ b/
src/mesa/main/syncobj.c
@@
-64,7
+64,6
@@
#include "dispatch.h"
#include "mtypes.h"
#include "dispatch.h"
#include "mtypes.h"
-#if FEATURE_ARB_sync
#include "syncobj.h"
static struct gl_sync_object *
#include "syncobj.h"
static struct gl_sync_object *
@@
-309,7
+308,7
@@
_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
}
if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {
}
if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glClientWaitSync(flags=0x%x)", flags);
+ _mesa_error(ctx, GL_INVALID_
VALUE
, "glClientWaitSync(flags=0x%x)", flags);
return GL_WAIT_FAILED;
}
return GL_WAIT_FAILED;
}
@@
-353,15
+352,12
@@
_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
}
if (flags != 0) {
}
if (flags != 0) {
- _mesa_error(ctx, GL_INVALID_
ENUM
, "glWaitSync(flags=0x%x)", flags);
+ _mesa_error(ctx, GL_INVALID_
VALUE
, "glWaitSync(flags=0x%x)", flags);
return;
}
return;
}
- /* From the GL_ARB_sync spec:
- *
- * If the value of <timeout> is zero, then WaitSync does nothing.
- */
- if (timeout == 0) {
+ if (timeout != GL_TIMEOUT_IGNORED) {
+ _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%lx)", timeout);
return;
}
return;
}
@@
-426,5
+422,3
@@
_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
*length = size;
}
}
*length = size;
}
}
-
-#endif /* FEATURE_ARB_sync */