diff options
author | Adam Jackson <ajax@redhat.com> | 2018-01-10 13:05:43 -0500 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2018-01-22 17:29:45 -0500 |
commit | f704620e5db8305c54c6b6981657d801dbf6849b (patch) | |
tree | 0d284fa88eda88d15fcd930ff04fa1e0cd29e12c /glx | |
parent | c2b2f06aa03fe738301ebaa82f220d9cfed5ab1a (diff) | |
download | xserver-f704620e5db8305c54c6b6981657d801dbf6849b.tar.gz |
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>
Diffstat (limited to 'glx')
-rw-r--r-- | glx/glxserver.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/glx/glxserver.h b/glx/glxserver.h index 31c635b97..8a3e6f98b 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -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, |