Remove _xcb_assert_valid_sequence. One test is trivially true, and the other may be temporarily violated without anything bad happening.
This commit is contained in:
parent
55c1842686
commit
1b83f8f8f3
|
@ -181,8 +181,6 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
|
||||||
int ret;
|
int ret;
|
||||||
fd_set rfds, wfds;
|
fd_set rfds, wfds;
|
||||||
|
|
||||||
_xcb_assert_valid_sequence(c);
|
|
||||||
|
|
||||||
/* If the thing I should be doing is already being done, wait for it. */
|
/* If the thing I should be doing is already being done, wait for it. */
|
||||||
if(should_write ? c->out.writing : c->in.reading)
|
if(should_write ? c->out.writing : c->in.reading)
|
||||||
{
|
{
|
||||||
|
|
10
src/xcbint.h
10
src/xcbint.h
|
@ -28,16 +28,6 @@
|
||||||
#ifndef __XCBINT_H
|
#ifndef __XCBINT_H
|
||||||
#define __XCBINT_H
|
#define __XCBINT_H
|
||||||
|
|
||||||
/* Not simply (a <= b) because eventually the 32-bit sequence number
|
|
||||||
* will wrap, causing earlier sequence numbers to be higher than later
|
|
||||||
* ones for a brief but fatal period. (a and b must be unsigned.) */
|
|
||||||
#define _xcb_assert_sequence_less(a,b) assert((b) - (a) < 65536)
|
|
||||||
|
|
||||||
#define _xcb_assert_valid_sequence(c) do { \
|
|
||||||
_xcb_assert_sequence_less((c)->in.request_read, (c)->out.request_written); \
|
|
||||||
_xcb_assert_sequence_less((c)->out.request_written, (c)->out.request); \
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
enum workarounds {
|
enum workarounds {
|
||||||
WORKAROUND_NONE,
|
WORKAROUND_NONE,
|
||||||
WORKAROUND_GLX_GET_FB_CONFIGS_BUG
|
WORKAROUND_GLX_GET_FB_CONFIGS_BUG
|
||||||
|
|
Loading…
Reference in New Issue