diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-07-10 10:00:46 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-10-29 12:29:16 -0400 |
| commit | be6680967a479eedbcab2fe1718c5f981e1029c7 (patch) | |
| tree | 9a7105fc1eea53f136b13ec355a3c425aaf25a6f /glx/glxserver.h | |
| parent | 8aacf47e1778d8b72811b025a82452b933d3c1f2 (diff) | |
glx: convert to direct GL dispatch (v2)
We now expect to be linked against something that provides the GL API,
instead of manually grubbing about in the DRI driver's dispatch table.
Since the GLX we expose calls GL functions that are meant to be looked
up dynamically, also add a way to thunk through to GetProcAddress.
This includes a refresh of the generated sources, which requires a
correspondingly new Mesa.
The GetProcAddress stubs are at the moment merely enough to make this
link against Mesa 9.2, but should really be provided for everything not
in the OpenGL 1.2 ABI.
v2: Explicitly hide the GetProcAddress stubs so we can't conflict with
libGL symbols; fix leading tab/space issues [anholt]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glx/glxserver.h')
| -rw-r--r-- | glx/glxserver.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/glx/glxserver.h b/glx/glxserver.h index 1021aec80..5e29abb28 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -46,7 +46,9 @@ #include <resource.h> #include <scrnintstr.h> +#define GL_GLEXT_PROTOTYPES /* we want prototypes */ #include <GL/gl.h> +#include <GL/glext.h> #include <GL/glxproto.h> /* @@ -115,6 +117,9 @@ void __glXleaveServer(GLboolean rendering); void glxSuspendClients(void); void glxResumeClients(void); +void __glXsetGetProcAddress(void (*(*get_proc_address) (const char *)) (void)); +void *__glGetProcAddress(const char *); + /* ** State kept per client. */ |