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/glapitable.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/glapitable.h')
| -rw-r--r-- | xorg-server/glx/glapitable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h index 68c3ec956..a680432a4 100644 --- a/xorg-server/glx/glapitable.h +++ b/xorg-server/glx/glapitable.h @@ -749,8 +749,8 @@ struct _glapi_table void (GLAPIENTRYP ProvokingVertex)(GLenum mode); /* 705 */
void (GLAPIENTRYP GetMultisamplefv)(GLenum pname, GLuint index, GLfloat * val); /* 706 */
void (GLAPIENTRYP SampleMaski)(GLuint index, GLbitfield mask); /* 707 */
- void (GLAPIENTRYP TexImage2DMultisample)(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 708 */
- void (GLAPIENTRYP TexImage3DMultisample)(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 709 */
+ void (GLAPIENTRYP TexImage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 708 */
+ void (GLAPIENTRYP TexImage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 709 */
void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 710 */
void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 711 */
void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 712 */
|