diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
| commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
| tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /xorg-server/glx/dispatch.h | |
| parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
| parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
| download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'xorg-server/glx/dispatch.h')
| -rw-r--r-- | xorg-server/glx/dispatch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h index 305eb280c..36a1c4403 100644 --- a/xorg-server/glx/dispatch.h +++ b/xorg-server/glx/dispatch.h @@ -9564,25 +9564,25 @@ static INLINE void SET_SampleMaski(struct _glapi_table *disp, void (GLAPIENTRYP SET_by_offset(disp, _gloffset_SampleMaski, fn);
}
-typedef void (GLAPIENTRYP _glptr_TexImage2DMultisample)(GLenum, GLsizei, GLint, GLsizei, GLsizei, GLboolean);
+typedef void (GLAPIENTRYP _glptr_TexImage2DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean);
#define CALL_TexImage2DMultisample(disp, parameters) \
(* GET_TexImage2DMultisample(disp)) parameters
static INLINE _glptr_TexImage2DMultisample GET_TexImage2DMultisample(struct _glapi_table *disp) {
return (_glptr_TexImage2DMultisample) (GET_by_offset(disp, _gloffset_TexImage2DMultisample));
}
-static INLINE void SET_TexImage2DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLint, GLsizei, GLsizei, GLboolean)) {
+static INLINE void SET_TexImage2DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean)) {
SET_by_offset(disp, _gloffset_TexImage2DMultisample, fn);
}
-typedef void (GLAPIENTRYP _glptr_TexImage3DMultisample)(GLenum, GLsizei, GLint, GLsizei, GLsizei, GLsizei, GLboolean);
+typedef void (GLAPIENTRYP _glptr_TexImage3DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean);
#define CALL_TexImage3DMultisample(disp, parameters) \
(* GET_TexImage3DMultisample(disp)) parameters
static INLINE _glptr_TexImage3DMultisample GET_TexImage3DMultisample(struct _glapi_table *disp) {
return (_glptr_TexImage3DMultisample) (GET_by_offset(disp, _gloffset_TexImage3DMultisample));
}
-static INLINE void SET_TexImage3DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLint, GLsizei, GLsizei, GLsizei, GLboolean)) {
+static INLINE void SET_TexImage3DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean)) {
SET_by_offset(disp, _gloffset_TexImage3DMultisample, fn);
}
|