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_reqsize.h | |
| parent | 8aacf47e1778d8b72811b025a82452b933d3c1f2 (diff) | |
glx: convert to direct GL dispatch (v2)glx-rewrite
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_reqsize.h')
| -rw-r--r-- | glx/indirect_reqsize.h | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/glx/indirect_reqsize.h b/glx/indirect_reqsize.h index d2c1da762..43e1e69e3 100644 --- a/glx/indirect_reqsize.h +++ b/glx/indirect_reqsize.h @@ -96,32 +96,29 @@ extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte * pc, extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte * pc, Bool swap); extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte * pc, +extern PURE _X_HIDDEN int __glXCompressedTexImage1DReqSize(const GLbyte * pc, + Bool swap); +extern PURE _X_HIDDEN int __glXCompressedTexImage2DReqSize(const GLbyte * pc, + Bool swap); +extern PURE _X_HIDDEN int __glXCompressedTexImage3DReqSize(const GLbyte * pc, + Bool swap); +extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte * pc, +extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte * pc, +extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte * - pc, Bool swap); -extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte * - pc, Bool swap); -extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte * - pc, Bool swap); +extern PURE _X_HIDDEN int __glXPointParameterfvReqSize(const GLbyte * pc, + Bool swap); +extern PURE _X_HIDDEN int __glXPointParameterivReqSize(const GLbyte * pc, + Bool swap); +extern PURE _X_HIDDEN int __glXDrawBuffersReqSize(const GLbyte * pc, Bool swap); extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte * pc, - Bool swap); -extern PURE _X_HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte * pc, +extern PURE _X_HIDDEN int __glXDeleteFramebuffersReqSize(const GLbyte * pc, + Bool swap); +extern PURE _X_HIDDEN int __glXDeleteRenderbuffersReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte * pc, - Bool swap); -extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte * pc, - Bool swap); -extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte * pc, - Bool swap); -extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte * - pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte * pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte * pc, @@ -148,16 +145,6 @@ extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte * pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte * pc, Bool swap); -extern PURE _X_HIDDEN int __glXPointParameterivNVReqSize(const GLbyte * pc, - Bool swap); -extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte * - pc, Bool swap); -extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte * - pc, Bool swap); -extern PURE _X_HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte * pc, - Bool swap); -extern PURE _X_HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte * pc, - Bool swap); #undef PURE |