diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /mesalib/src/mesa/main/api_exec.c | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'mesalib/src/mesa/main/api_exec.c')
| -rw-r--r-- | mesalib/src/mesa/main/api_exec.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c index 605af381d..15b9f6974 100644 --- a/mesalib/src/mesa/main/api_exec.c +++ b/mesalib/src/mesa/main/api_exec.c @@ -55,6 +55,7 @@ #include "drawpix.h" #include "rastpos.h" #include "enable.h" +#include "errors.h" #include "eval.h" #include "get.h" #include "feedback.h" @@ -598,15 +599,18 @@ _mesa_create_exec_table(void) SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB); #endif - /* ARB 104. GL_ARB_robustness */ + /* ARB 66. GL_ARB_sync */ + _mesa_init_sync_dispatch(exec); + + /* ARB 104. GL_ARB_debug_output */ + _mesa_init_errors_dispatch(exec); + + /* ARB 105. GL_ARB_robustness */ SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB); SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB); SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB); SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB); - /* GL_ARB_sync */ - _mesa_init_sync_dispatch(exec); - /* GL_ATI_fragment_shader */ _mesa_init_ati_fragment_shader_dispatch(exec); |