aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glfunctions.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-03-22 14:10:47 +0100
committermarha <marha@users.sourceforge.net>2015-03-22 14:10:47 +0100
commit3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch)
tree193651a94adb3804e800747e993d07b92688e4d4 /xorg-server/glx/glfunctions.h
parentc646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff)
parent82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff)
downloadvcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz
vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2
vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glapi_nop.c mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'xorg-server/glx/glfunctions.h')
-rw-r--r--xorg-server/glx/glfunctions.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index fa5080278..d7e412543 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -918,15 +918,24 @@
#define glBindVertexBuffers(a1, a2, a3, a4, a5) CALL_BindVertexBuffers(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glClipControl(a1, a2) CALL_ClipControl(GET_DISPATCH(), (a1, a2))
#define glBindTextureUnit(a1, a2) CALL_BindTextureUnit(GET_DISPATCH(), (a1, a2))
+#define glClearNamedBufferData(a1, a2, a3, a4, a5) CALL_ClearNamedBufferData(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glClearNamedBufferSubData(a1, a2, a3, a4, a5, a6, a7) CALL_ClearNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
#define glCompressedTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CompressedTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
#define glCompressedTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CompressedTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
#define glCompressedTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_CompressedTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glCopyNamedBufferSubData(a1, a2, a3, a4, a5) CALL_CopyNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glCopyTextureSubImage1D(a1, a2, a3, a4, a5, a6) CALL_CopyTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
#define glCopyTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
#define glCopyTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CopyTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glCreateBuffers(a1, a2) CALL_CreateBuffers(GET_DISPATCH(), (a1, a2))
#define glCreateTextures(a1, a2, a3) CALL_CreateTextures(GET_DISPATCH(), (a1, a2, a3))
+#define glFlushMappedNamedBufferRange(a1, a2, a3) CALL_FlushMappedNamedBufferRange(GET_DISPATCH(), (a1, a2, a3))
#define glGenerateTextureMipmap(a1) CALL_GenerateTextureMipmap(GET_DISPATCH(), (a1))
#define glGetCompressedTextureImage(a1, a2, a3, a4) CALL_GetCompressedTextureImage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetNamedBufferParameteri64v(a1, a2, a3) CALL_GetNamedBufferParameteri64v(GET_DISPATCH(), (a1, a2, a3))
+#define glGetNamedBufferParameteriv(a1, a2, a3) CALL_GetNamedBufferParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetNamedBufferPointerv(a1, a2, a3) CALL_GetNamedBufferPointerv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetNamedBufferSubData(a1, a2, a3, a4) CALL_GetNamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4))
#define glGetTextureImage(a1, a2, a3, a4, a5, a6) CALL_GetTextureImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
#define glGetTextureLevelParameterfv(a1, a2, a3, a4) CALL_GetTextureLevelParameterfv(GET_DISPATCH(), (a1, a2, a3, a4))
#define glGetTextureLevelParameteriv(a1, a2, a3, a4) CALL_GetTextureLevelParameteriv(GET_DISPATCH(), (a1, a2, a3, a4))
@@ -934,7 +943,13 @@
#define glGetTextureParameterIuiv(a1, a2, a3) CALL_GetTextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
#define glGetTextureParameterfv(a1, a2, a3) CALL_GetTextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
#define glGetTextureParameteriv(a1, a2, a3) CALL_GetTextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glMapNamedBuffer(a1, a2) CALL_MapNamedBuffer(GET_DISPATCH(), (a1, a2))
+#define glMapNamedBufferRange(a1, a2, a3, a4) CALL_MapNamedBufferRange(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedBufferData(a1, a2, a3, a4) CALL_NamedBufferData(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedBufferStorage(a1, a2, a3, a4) CALL_NamedBufferStorage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glNamedBufferSubData(a1, a2, a3, a4) CALL_NamedBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4))
#define glTextureBuffer(a1, a2, a3) CALL_TextureBuffer(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureBufferRange(a1, a2, a3, a4, a5) CALL_TextureBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5))
#define glTextureParameterIiv(a1, a2, a3) CALL_TextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
#define glTextureParameterIuiv(a1, a2, a3) CALL_TextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
#define glTextureParameterf(a1, a2, a3) CALL_TextureParameterf(GET_DISPATCH(), (a1, a2, a3))
@@ -949,6 +964,7 @@
#define glTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_TextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
#define glTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
#define glTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_TextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glUnmapNamedBuffer(a1) CALL_UnmapNamedBuffer(GET_DISPATCH(), (a1))
#define glInvalidateBufferData(a1) CALL_InvalidateBufferData(GET_DISPATCH(), (a1))
#define glInvalidateBufferSubData(a1, a2, a3) CALL_InvalidateBufferSubData(GET_DISPATCH(), (a1, a2, a3))
#define glInvalidateFramebuffer(a1, a2, a3) CALL_InvalidateFramebuffer(GET_DISPATCH(), (a1, a2, a3))