glx: Move provider setup interface to glx_extinit.h
Keeps us from needing to add glx/ to the include path everywhere, since we can't add it to the dix include path because the header file names conflict with glxproxy. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
c2b2f06aa0
commit
f704620e5d
|
@ -63,6 +63,7 @@ typedef struct __GLXcontext __GLXcontext;
|
|||
#include "glxscreens.h"
|
||||
#include "glxdrawable.h"
|
||||
#include "glxcontext.h"
|
||||
#include "glx_extinit.h"
|
||||
|
||||
extern __GLXscreen *glxGetScreen(ScreenPtr pScreen);
|
||||
extern __GLXclientState *glxGetClient(ClientPtr pClient);
|
||||
|
@ -81,16 +82,6 @@ int __glXError(int error);
|
|||
|
||||
/************************************************************************/
|
||||
|
||||
typedef struct __GLXprovider __GLXprovider;
|
||||
struct __GLXprovider {
|
||||
__GLXscreen *(*screenProbe) (ScreenPtr pScreen);
|
||||
const char *name;
|
||||
__GLXprovider *next;
|
||||
};
|
||||
extern __GLXprovider __glXDRISWRastProvider;
|
||||
|
||||
void GlxPushProvider(__GLXprovider * provider);
|
||||
|
||||
enum {
|
||||
GLX_MINIMAL_VISUALS,
|
||||
GLX_TYPICAL_VISUALS,
|
||||
|
|
|
@ -29,6 +29,18 @@
|
|||
/* this is separate due to sdksyms pulling in extinit.h */
|
||||
#ifdef GLXEXT
|
||||
extern void GlxExtensionInit(void);
|
||||
|
||||
typedef struct __GLXprovider __GLXprovider;
|
||||
typedef struct __GLXscreen __GLXscreen;
|
||||
struct __GLXprovider {
|
||||
__GLXscreen *(*screenProbe) (ScreenPtr pScreen);
|
||||
const char *name;
|
||||
__GLXprovider *next;
|
||||
};
|
||||
extern __GLXprovider __glXDRISWRastProvider;
|
||||
|
||||
void GlxPushProvider(__GLXprovider * provider);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user