diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-10-25 22:27:17 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-10-27 10:49:33 +0800 |
| commit | e4dbfa44ed018d124e1531077d506c8c914c1a51 (patch) | |
| tree | 743740c5a73c00c4119d2d30a09ccca67b1505b5 /src/glx | |
| parent | e213968f2b99b07e20b69e4dd6f94bea35f54161 (diff) | |
glapi: Do not use glapioffsets.h.
glapioffsets.h exists for the same reason as glapidispatch.h does. It
is of no use to glapi. This commit also drops the use of glapioffsets.h
in glx as glx is considered an extension to glapi when it comes to
defining public GL entries.
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/indirect.h | 1 | ||||
| -rw-r--r-- | src/glx/singlepix.c | 11 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/glx/indirect.h b/src/glx/indirect.h index 282de75c40..1e2994877b 100644 --- a/src/glx/indirect.h +++ b/src/glx/indirect.h @@ -440,6 +440,7 @@ extern HIDDEN void __indirect_glGetConvolutionParameteriv(GLenum target, GLenum extern HIDDEN void gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params); extern HIDDEN void __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); extern HIDDEN void gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); +#define gl_dispatch_stub_GetSeparableFilterEXT gl_dispatch_stub_359 extern HIDDEN void __indirect_glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column); extern HIDDEN void __indirect_glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); extern HIDDEN void gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); diff --git a/src/glx/singlepix.c b/src/glx/singlepix.c index 3fe2d4639a..d8a71664d0 100644 --- a/src/glx/singlepix.c +++ b/src/glx/singlepix.c @@ -33,7 +33,6 @@ #include "glapitable.h" #include "glapi.h" #include "glthread.h" -#include "glapioffsets.h" #include <GL/glxproto.h> void @@ -109,12 +108,10 @@ __indirect_glGetSeparableFilter(GLenum target, GLenum format, GLenum type, } -#define CONCAT(a,b) a ## b -#define NAME(o) CONCAT(gl_dispatch_stub_, o) - -void NAME(_gloffset_GetSeparableFilter) (GLenum target, GLenum format, - GLenum type, GLvoid * row, - GLvoid * column, GLvoid * span) +/* it is defined to gl_dispatch_stub_NNN in indirect.h */ +void gl_dispatch_stub_GetSeparableFilterEXT (GLenum target, GLenum format, + GLenum type, GLvoid * row, + GLvoid * column, GLvoid * span) { struct glx_context *const gc = __glXGetCurrentContext(); |