diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
| commit | dcf9ae77854778629cabd0d6943dda3678eb91fa (patch) | |
| tree | 087d3bb4beb55bcc0c5857b41d2b5b10edd0e2f3 /xorg-server/glx/indirect_dispatch.h | |
| parent | 2c8d7aa6bda138693fa1827852ba6b75d1721ff8 (diff) | |
| parent | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (diff) | |
| download | vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.gz vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.bz2 vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxext.c
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'xorg-server/glx/indirect_dispatch.h')
| -rw-r--r-- | xorg-server/glx/indirect_dispatch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h index 214177251..458ff6f0d 100644 --- a/xorg-server/glx/indirect_dispatch.h +++ b/xorg-server/glx/indirect_dispatch.h @@ -146,6 +146,8 @@ extern _X_HIDDEN void __glXDisp_CopyTexSubImage2D(GLbyte * pc); extern _X_HIDDEN void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc);
extern _X_HIDDEN void __glXDisp_DepthRange(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_DepthRange(GLbyte * pc);
+extern _X_HIDDEN int __glXDisp_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
+extern _X_HIDDEN int __glXDispSwap_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_ResetHistogram(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_ResetHistogram(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_GetProgramNamedParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
@@ -710,8 +712,6 @@ extern _X_HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec extern _X_HIDDEN int __glXDispSwap_GetTexLevelParameterfv(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDisp_GenFramebuffersEXT(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN int __glXDispSwap_GenFramebuffersEXT(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDisp_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern _X_HIDDEN int __glXDispSwap_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
extern _X_HIDDEN void __glXDisp_Vertex2sv(GLbyte * pc);
extern _X_HIDDEN void __glXDispSwap_Vertex2sv(GLbyte * pc);
extern _X_HIDDEN int __glXDisp_GetIntegerv(struct __GLXclientStateRec *, GLbyte *);
|