Remove the last remnants of GLX_BUILT_IN_XMESA. This allows the removal of

[mesa.git] / src / mesa / drivers / x11 / glxapi.h

diff --git a/src/mesa/drivers/x11/glxapi.h b/src/mesa/drivers/x11/glxapi.h
index 2090d02d75d87882b32a37fd4c5ef3d9054e520b..3187534c9a39274b1e3b34930e3a40d573725344 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.h
+++ b/src/mesa/drivers/x11/glxapi.h
@@ -1,10 +1,8 @@
-/* $Id: glxapi.h,v 1.15 2003/01/14 04:49:07 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.3
  * 
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,12 +31,6 @@
 #include "GL/glx.h"
 
 
-#ifdef GLX_BUILT_IN_XMESA
-/* The GLX API dispatcher (i.e. this code) is being built into XFree86's
- * libGL so we'll use the __GLXContextRec defined in xc/lib/GL/glx/glxclient.h
-*/
-#include "glxclient.h"
-#else
 /* The GLX API dispatcher (i.e. this code) is being built into stand-alone
  * Mesa.  We don't know anything about XFree86 or real GLX so we define a
  * minimal __GLXContextRec here so some of the functions in this file can
@@ -51,7 +43,6 @@ typedef struct __GLXcontextRec {
    GLXDrawable currentReadable;
    XID xid;
 } __GLXcontext;
-#endif
 
 
 /*
@@ -205,11 +196,6 @@ struct _glxapi_table {
 
    /*** GLX_MESA_agp_offset ***/
    GLuint (*GetAGPOffsetMESA)( const GLvoid *pointer );
-
-   /*** GLX_ARB_render_texture ***/
-   Bool (*BindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
-   Bool (*ReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer);
-   Bool (*DrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList);
 };
 
 
@@ -230,7 +216,7 @@ extern void
 _glxapi_set_no_op_table(struct _glxapi_table *t);
 
 
-extern const GLvoid *
+extern __GLXextFuncPtr
 _glxapi_get_proc_address(const char *funcName);