summaryrefslogtreecommitdiff
path: root/GL/glx/glxcmds.c
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2004-06-16 09:22:17 +0000
committerEric Anholt <anholt@freebsd.org>2004-06-16 09:22:17 +0000
commit22bad9474b8822f03f84a8a39edce624bfb9befa (patch)
tree8b599b118a758a44fe46985b4843fb29d1ae3253 /GL/glx/glxcmds.c
parent1c133c27ccc1f09b95922fdece3c8d73cc182def (diff)
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'GL/glx/glxcmds.c')
-rw-r--r--GL/glx/glxcmds.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index df4154991..b6f358f2e 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.12 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.9 2002/12/14 01:36:09 dawes Exp $ */
/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
@@ -747,8 +747,6 @@ int __glXQueryVersion(__GLXclientState *cl, GLbyte *pc)
major = req->majorVersion;
minor = req->minorVersion;
- (void)major;
- (void)minor;
/*
** Server should take into consideration the version numbers sent by the
@@ -1554,18 +1552,6 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
req = (xGLXVendorPrivateReq *) pc;
vendorcode = req->vendorCode;
-#ifndef __DARWIN__
- switch( vendorcode ) {
- case X_GLvop_SampleMaskSGIS:
- glSampleMaskSGIS(*(GLfloat *)(pc + 4),
- *(GLboolean *)(pc + 8));
- return Success;
- case X_GLvop_SamplePatternSGIS:
- glSamplePatternSGIS( *(GLenum *)(pc + 4));
- return Success;
- }
-#endif
-
if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) &&
(vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT)) {
(*__glXVendorPrivTable_EXT[vendorcode-__GLX_MIN_VENDPRIV_OPCODE_EXT])