frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Adam Jackson 2018-01-10 13:05:43 -05:00
parent c2b2f06aa0
commit f704620e5d
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glx/glxserver.h
View File

@ -63,6 +63,7 @@ typedef struct __GLXcontext __GLXcontext;
#include "glxscreens.h" #include "glxscreens.h"
#include "glxdrawable.h" #include "glxdrawable.h"
#include "glxcontext.h" #include "glxcontext.h"
#include "glx_extinit.h"
extern __GLXscreen *glxGetScreen(ScreenPtr pScreen); extern __GLXscreen *glxGetScreen(ScreenPtr pScreen);
extern __GLXclientState *glxGetClient(ClientPtr pClient); 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 { enum {
GLX_MINIMAL_VISUALS, GLX_MINIMAL_VISUALS,
GLX_TYPICAL_VISUALS, GLX_TYPICAL_VISUALS,

12
include/glx_extinit.h
View File

@ -29,6 +29,18 @@
/* this is separate due to sdksyms pulling in extinit.h */ /* this is separate due to sdksyms pulling in extinit.h */
#ifdef GLXEXT #ifdef GLXEXT
extern void GlxExtensionInit(void); 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
#endif #endif