summaryrefslogtreecommitdiff
path: root/xserver/glx/glxserver.h
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2013-06-07 17:28:57 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2013-06-07 17:28:57 +0000
commitc0190187060808fe0ad2a09b31f4244757572ff9 (patch)
treeb028697436476ae3ff34218b0b233a233d8a7818 /xserver/glx/glxserver.h
parent33eda071f5846d332b428de759c5b1649e9cf1ba (diff)
Update to X server 1.14.1. Tested by many during t2k13. Thanks.
Diffstat (limited to 'xserver/glx/glxserver.h')
-rw-r--r--xserver/glx/glxserver.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/xserver/glx/glxserver.h b/xserver/glx/glxserver.h
index 707684842..1021aec80 100644
--- a/xserver/glx/glxserver.h
+++ b/xserver/glx/glxserver.h
@@ -46,7 +46,6 @@
#include <resource.h>
#include <scrnintstr.h>
-#define GL_GLEXT_PROTOTYPES /* we want prototypes */
#include <GL/gl.h>
#include <GL/glxproto.h>
@@ -77,8 +76,6 @@ extern __GLXclientState *glxGetClient(ClientPtr pClient);
/************************************************************************/
-void GlxExtensionInit(void);
-
void GlxSetVisualConfigs(int nconfigs, void *configs, void **privates);
void __glXScreenInitVisuals(__GLXscreen * screen);
@@ -100,6 +97,7 @@ struct __GLXprovider {
const char *name;
__GLXprovider *next;
};
+extern __GLXprovider __glXDRISWRastProvider;
void GlxPushProvider(__GLXprovider * provider);
@@ -145,8 +143,6 @@ struct __GLXclientStateRec {
/* Back pointer to X client record */
ClientPtr client;
- int GLClientmajorVersion;
- int GLClientminorVersion;
char *GLClientextensions;
};