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 /mesalib/src/mapi/glapi/gen/ARB_debug_output.xml | |
| 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 'mesalib/src/mapi/glapi/gen/ARB_debug_output.xml')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_debug_output.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml index 11f268dc6..0468d570c 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml @@ -52,7 +52,7 @@ <enum name="DEBUG_SEVERITY_LOW_ARB" value="0x9148"/> - <function name="DebugMessageControlARB" offset="assign"> + <function name="DebugMessageControlARB" alias="DebugMessageControl"> <param name="source" type="GLenum"/> <param name="type" type="GLenum"/> <param name="severity" type="GLenum"/> @@ -61,7 +61,7 @@ <param name="enabled" type="GLboolean"/> </function> - <function name="DebugMessageInsertARB" offset="assign"> + <function name="DebugMessageInsertARB" alias="DebugMessageInsert"> <param name="source" type="GLenum"/> <param name="type" type="GLenum"/> <param name="id" type="GLuint"/> @@ -70,12 +70,12 @@ <param name="buf" type="const GLcharARB *"/> </function> - <function name="DebugMessageCallbackARB" offset="assign"> + <function name="DebugMessageCallbackARB" alias="DebugMessageCallback"> <param name="callback" type="GLDEBUGPROCARB"/> <param name="userParam" type="const GLvoid *"/> </function> - <function name="GetDebugMessageLogARB" offset="assign"> + <function name="GetDebugMessageLogARB" alias="GetDebugMessageLog"> <return type="GLuint"/> <param name="count" type="GLuint"/> <param name="bufsize" type="GLsizei"/> |