diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /xorg-server/glx/glfunctions.h | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/glx/glfunctions.h')
| -rw-r--r-- | xorg-server/glx/glfunctions.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h index 6634f827a..5fb989e47 100644 --- a/xorg-server/glx/glfunctions.h +++ b/xorg-server/glx/glfunctions.h @@ -837,10 +837,6 @@ #define glViewportArrayv(a1, a2, a3) CALL_ViewportArrayv(GET_DISPATCH(), (a1, a2, a3)) #define glViewportIndexedf(a1, a2, a3, a4, a5) CALL_ViewportIndexedf(GET_DISPATCH(), (a1, a2, a3, a4, a5)) #define glViewportIndexedfv(a1, a2) CALL_ViewportIndexedfv(GET_DISPATCH(), (a1, a2)) -#define glDebugMessageCallbackARB(a1, a2) CALL_DebugMessageCallbackARB(GET_DISPATCH(), (a1, a2)) -#define glDebugMessageControlARB(a1, a2, a3, a4, a5, a6) CALL_DebugMessageControlARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) -#define glDebugMessageInsertARB(a1, a2, a3, a4, a5, a6) CALL_DebugMessageInsertARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) -#define glGetDebugMessageLogARB(a1, a2, a3, a4, a5, a6, a7, a8) CALL_GetDebugMessageLogARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) #define glGetGraphicsResetStatusARB() CALL_GetGraphicsResetStatusARB(GET_DISPATCH(), ()) #define glGetnColorTableARB(a1, a2, a3, a4, a5) CALL_GetnColorTableARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) #define glGetnCompressedTexImageARB(a1, a2, a3, a4) CALL_GetnCompressedTexImageARB(GET_DISPATCH(), (a1, a2, a3, a4)) |