diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
| commit | 4a991716ac65d28a68f9943d54c4b74ad0b58f65 (patch) | |
| tree | c037c3fe64bb15ea67dbf03a96783a8b04085371 /xserver/include/resource.h | |
| parent | 549cb8bcb6bdd3a7d44f3b9fdc003df777b2b0d2 (diff) | |
Update to xserver 1.18.3. Tested by shadchin@ and naddy@.
Note that indirect GLX is now disbled by default.
Diffstat (limited to 'xserver/include/resource.h')
| -rw-r--r-- | xserver/include/resource.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/xserver/include/resource.h b/xserver/include/resource.h index 772f363b0..5871a4cb4 100644 --- a/xserver/include/resource.h +++ b/xserver/include/resource.h @@ -85,21 +85,10 @@ typedef uint32_t RESTYPE; #define RT_LASTPREDEF ((RESTYPE)9) #define RT_NONE ((RESTYPE)0) +extern _X_EXPORT unsigned int ResourceClientBits(void); /* bits and fields within a resource id */ #define RESOURCE_AND_CLIENT_COUNT 29 /* 29 bits for XIDs */ -#if MAXCLIENTS == 64 -#define RESOURCE_CLIENT_BITS 6 -#endif -#if MAXCLIENTS == 128 -#define RESOURCE_CLIENT_BITS 7 -#endif -#if MAXCLIENTS == 256 -#define RESOURCE_CLIENT_BITS 8 -#endif -#if MAXCLIENTS == 512 -#define RESOURCE_CLIENT_BITS 9 -#endif -/* client field offset */ +#define RESOURCE_CLIENT_BITS ResourceClientBits() /* client field offset */ #define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS) /* resource field */ #define RESOURCE_ID_MASK ((1 << CLIENTOFFSET) - 1) |