aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/indirect_reqsize.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-31 08:40:01 +0100
committermarha <marha@users.sourceforge.net>2013-10-31 08:40:01 +0100
commite4ef724e06621be9325fc41ed886fd404467fdc0 (patch)
treebe445314647f682fbb4a1e8b94aeb6ee79cede5f /xorg-server/glx/indirect_reqsize.c
parent270d3a1aa4137dc15d7b7e5a0958cc8c0bef9a1a (diff)
downloadvcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.gz
vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.tar.bz2
vcxsrv-e4ef724e06621be9325fc41ed886fd404467fdc0.zip
fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013
xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485 libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834 fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
Diffstat (limited to 'xorg-server/glx/indirect_reqsize.c')
-rw-r--r--xorg-server/glx/indirect_reqsize.c77
1 files changed, 19 insertions, 58 deletions
diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c
index 86ea9700f..026afb6fb 100644
--- a/xorg-server/glx/indirect_reqsize.c
+++ b/xorg-server/glx/indirect_reqsize.c
@@ -613,7 +613,7 @@ __glXTexSubImage3DReqSize(const GLbyte * pc, Bool swap)
}
int
-__glXCompressedTexImage1DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage1DReqSize(const GLbyte * pc, Bool swap)
{
GLsizei imageSize = *(GLsizei *) (pc + 20);
@@ -625,7 +625,7 @@ __glXCompressedTexImage1DARBReqSize(const GLbyte * pc, Bool swap)
}
int
-__glXCompressedTexImage2DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage2DReqSize(const GLbyte * pc, Bool swap)
{
GLsizei imageSize = *(GLsizei *) (pc + 24);
@@ -637,7 +637,7 @@ __glXCompressedTexImage2DARBReqSize(const GLbyte * pc, Bool swap)
}
int
-__glXCompressedTexImage3DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexImage3DReqSize(const GLbyte * pc, Bool swap)
{
GLsizei imageSize = *(GLsizei *) (pc + 28);
@@ -649,7 +649,7 @@ __glXCompressedTexImage3DARBReqSize(const GLbyte * pc, Bool swap)
}
int
-__glXCompressedTexSubImage3DARBReqSize(const GLbyte * pc, Bool swap)
+__glXCompressedTexSubImage3DReqSize(const GLbyte * pc, Bool swap)
{
GLsizei imageSize = *(GLsizei *) (pc + 36);
@@ -661,31 +661,7 @@ __glXCompressedTexSubImage3DARBReqSize(const GLbyte * pc, Bool swap)
}
int
-__glXProgramStringARBReqSize(const GLbyte * pc, Bool swap)
-{
- GLsizei len = *(GLsizei *) (pc + 8);
-
- if (swap) {
- len = bswap_32(len);
- }
-
- return __GLX_PAD(len);
-}
-
-int
-__glXDrawBuffersARBReqSize(const GLbyte * pc, Bool swap)
-{
- GLsizei n = *(GLsizei *) (pc + 0);
-
- if (swap) {
- n = bswap_32(n);
- }
-
- return __GLX_PAD((n * 4));
-}
-
-int
-__glXPointParameterfvEXTReqSize(const GLbyte * pc, Bool swap)
+__glXPointParameterfvReqSize(const GLbyte * pc, Bool swap)
{
GLenum pname = *(GLenum *) (pc + 0);
GLsizei compsize;
@@ -694,32 +670,32 @@ __glXPointParameterfvEXTReqSize(const GLbyte * pc, Bool swap)
pname = bswap_32(pname);
}
- compsize = __glPointParameterfvEXT_size(pname);
+ compsize = __glPointParameterfv_size(pname);
return __GLX_PAD((compsize * 4));
}
int
-__glXProgramParameters4dvNVReqSize(const GLbyte * pc, Bool swap)
+__glXDrawBuffersReqSize(const GLbyte * pc, Bool swap)
{
- GLsizei num = *(GLsizei *) (pc + 8);
+ GLsizei n = *(GLsizei *) (pc + 0);
if (swap) {
- num = bswap_32(num);
+ n = bswap_32(n);
}
- return __GLX_PAD((num * 32));
+ return __GLX_PAD((n * 4));
}
int
-__glXProgramParameters4fvNVReqSize(const GLbyte * pc, Bool swap)
+__glXProgramStringARBReqSize(const GLbyte * pc, Bool swap)
{
- GLsizei num = *(GLsizei *) (pc + 8);
+ GLsizei len = *(GLsizei *) (pc + 8);
if (swap) {
- num = bswap_32(num);
+ len = bswap_32(len);
}
- return __GLX_PAD((num * 16));
+ return __GLX_PAD(len);
}
int
@@ -794,18 +770,6 @@ __glXVertexAttribs4dvNVReqSize(const GLbyte * pc, Bool swap)
return __GLX_PAD((n * 32));
}
-int
-__glXProgramNamedParameter4fvNVReqSize(const GLbyte * pc, Bool swap)
-{
- GLsizei len = *(GLsizei *) (pc + 4);
-
- if (swap) {
- len = bswap_32(len);
- }
-
- return __GLX_PAD(len);
-}
-
ALIAS(Fogiv, Fogfv)
ALIAS(Lightiv, Lightfv)
ALIAS(LightModeliv, LightModelfv)
@@ -816,10 +780,11 @@ ALIAS(Fogiv, Fogfv)
ALIAS(PixelMapuiv, PixelMapfv)
ALIAS(ColorTableParameteriv, ColorTableParameterfv)
ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
- ALIAS(CompressedTexSubImage1DARB, CompressedTexImage1DARB)
- ALIAS(CompressedTexSubImage2DARB, CompressedTexImage3DARB)
- ALIAS(LoadProgramNV, ProgramStringARB)
- ALIAS(RequestResidentProgramsNV, DrawBuffersARB)
+ ALIAS(CompressedTexSubImage1D, CompressedTexImage1D)
+ ALIAS(CompressedTexSubImage2D, CompressedTexImage3D)
+ ALIAS(PointParameteriv, PointParameterfv)
+ ALIAS(DeleteFramebuffers, DrawBuffers)
+ ALIAS(DeleteRenderbuffers, DrawBuffers)
ALIAS(VertexAttribs1fvNV, PixelMapfv)
ALIAS(VertexAttribs1svNV, PixelMapusv)
ALIAS(VertexAttribs2fvNV, VertexAttribs1dvNV)
@@ -827,7 +792,3 @@ ALIAS(Fogiv, Fogfv)
ALIAS(VertexAttribs4fvNV, VertexAttribs2dvNV)
ALIAS(VertexAttribs4svNV, VertexAttribs1dvNV)
ALIAS(VertexAttribs4ubvNV, PixelMapfv)
- ALIAS(PointParameterivNV, PointParameterfvEXT)
- ALIAS(ProgramNamedParameter4dvNV, CompressedTexSubImage3DARB)
- ALIAS(DeleteFramebuffersEXT, DrawBuffersARB)
- ALIAS(DeleteRenderbuffersEXT, DrawBuffersARB)