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/indirect_size.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/indirect_size.h')
| -rw-r--r-- | glx/indirect_size.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/glx/indirect_size.h b/glx/indirect_size.h index 56ffc1c68..fec7ed393 100644 --- a/glx/indirect_size.h +++ b/glx/indirect_size.h @@ -72,12 +72,14 @@ extern _X_INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameterfv_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint +__glConvolutionParameterfv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint +__glConvolutionParameteriv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint __glPointParameteriv_size(GLenum); #undef PURE #undef FASTCALL -#endif /* !defined( _INDIRECT_SIZE_H_ ) */ +#endif /* !defined( _INDIRECT_SIZE_H_ ) */ |