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_get.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_size_get.h')
-rw-r--r-- | glx/indirect_size_get.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/glx/indirect_size_get.h b/glx/indirect_size_get.h index 4cfb3a6ba..9b6203669 100644 --- a/glx/indirect_size_get.h +++ b/glx/indirect_size_get.h @@ -67,6 +67,7 @@ extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint __glGetPointerv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint @@ -79,19 +80,12 @@ extern _X_INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectiv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuiv_size(GLenum); +extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryiv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum); -extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint -__glGetFramebufferAttachmentParameterivEXT_size(GLenum); +__glGetFramebufferAttachmentParameteriv_size(GLenum); #undef PURE #undef FASTCALL |