diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-24 06:33:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-24 06:33:14 +0000 |
| commit | 941e7f505285f0b77f232f700561c752ce75ff97 (patch) | |
| tree | 298cb649d97a46ea97835411ef517857f1dc70db /xorg-server | |
| parent | 98a78a31883c4b5d63dd1465b4208bcc7c12bfcb (diff) | |
| parent | 94d512f7295ade7b381fba2e9e0bc0c434cf8b65 (diff) | |
| download | vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.tar.gz vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.tar.bz2 vcxsrv-941e7f505285f0b77f232f700561c752ce75ff97.zip | |
merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/glx/dispatch.h | 5 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Module.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h index 3a9635b9f..f572c6770 100644 --- a/xorg-server/glx/dispatch.h +++ b/xorg-server/glx/dispatch.h @@ -1000,6 +1000,11 @@ #define driDispatchRemapTable_size 520 extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; +#if FEATURE_remap_table +#define driDispatchRemapTable remap_table +static int remap_table[driDispatchRemapTable_size]; +#endif + #define AttachShader_remap_index 0 #define CreateProgram_remap_index 1 #define CreateShader_remap_index 2 diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h index 1322b8046..02fdab608 100644 --- a/xorg-server/hw/xfree86/common/xf86Module.h +++ b/xorg-server/hw/xfree86/common/xf86Module.h @@ -82,7 +82,7 @@ typedef enum { * mask is 0xFFFF0000.
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(10, 0)
+#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(11, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(12, 2)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(5, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
|