diff options
| author | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-04-20 22:42:55 +0200 |
| commit | 934184bfecd402aae891b8740d788b486aa7269f (patch) | |
| tree | c23fb0afd169dc6846ea23bda21260fcffd1e3e6 /xorg-server/glx/indirect_dispatch.h | |
| parent | 57dd848fb6dd7cf15820172e2abc9fb9de2b4268 (diff) | |
| parent | 4ba9be2882d9f1567809edb0a31fcdf11320d41f (diff) | |
| download | vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.gz vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.bz2 vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/dlopen.h
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/randr/rrxinerama.c
Diffstat (limited to 'xorg-server/glx/indirect_dispatch.h')
| -rw-r--r-- | xorg-server/glx/indirect_dispatch.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h index ca8344c1b..abc957cd9 100644 --- a/xorg-server/glx/indirect_dispatch.h +++ b/xorg-server/glx/indirect_dispatch.h @@ -70,8 +70,8 @@ extern _X_HIDDEN int __glXDisp_GenQueries(struct __GLXclientStateRec *, GLbyte * extern _X_HIDDEN int __glXDispSwap_GenQueries(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN void __glXDisp_TexCoord2iv(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_TexCoord2iv(GLbyte * pc); -extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc); -extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc); +extern _X_HIDDEN void __glXDisp_Rotatef(GLbyte * pc); +extern _X_HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc); extern _X_HIDDEN void __glXDisp_TexParameterf(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc); extern _X_HIDDEN void __glXDisp_TexParameteri(GLbyte * pc); @@ -724,8 +724,6 @@ extern _X_HIDDEN int __glXDisp_DeleteProgramsARB(struct __GLXclientStateRec *, G extern _X_HIDDEN int __glXDispSwap_DeleteProgramsARB(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN void __glXDisp_ShadeModel(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_ShadeModel(GLbyte * pc); -extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc); -extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc); extern _X_HIDDEN int __glXDisp_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *); @@ -890,6 +888,8 @@ extern _X_HIDDEN void __glXDisp_VertexAttrib1dv(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_VertexAttrib1dv(GLbyte * pc); extern _X_HIDDEN void __glXDisp_Rotated(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_Rotated(GLbyte * pc); +extern _X_HIDDEN void __glXDisp_Color4iv(GLbyte * pc); +extern _X_HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc); extern _X_HIDDEN void __glXDisp_FramebufferTextureLayer(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_FramebufferTextureLayer(GLbyte * pc); extern _X_HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc); @@ -956,6 +956,8 @@ extern _X_HIDDEN int __glXDisp_ChangeDrawableAttributesSGIX(struct __GLXclientSt extern _X_HIDDEN int __glXDispSwap_ChangeDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN void __glXDisp_BlendEquationSeparate(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_BlendEquationSeparate(GLbyte * pc); +extern _X_HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc); +extern _X_HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc); extern _X_HIDDEN void __glXDisp_RasterPos4sv(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_RasterPos4sv(GLbyte * pc); extern _X_HIDDEN void __glXDisp_ClearColor(GLbyte * pc); @@ -984,8 +986,6 @@ extern _X_HIDDEN void __glXDisp_PixelTransferi(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_PixelTransferi(GLbyte * pc); extern _X_HIDDEN void __glXDisp_VertexAttrib3fvNV(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc); -extern _X_HIDDEN void __glXDisp_Rotatef(GLbyte * pc); -extern _X_HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc); extern _X_HIDDEN int __glXDisp_ClientInfo(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN int __glXDispSwap_ClientInfo(struct __GLXclientStateRec *, GLbyte *); extern _X_HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc); |