diff options
author | marha <marha@users.sourceforge.net> | 2010-12-29 12:20:21 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-12-29 12:20:21 +0000 |
commit | 053f5dfd42ade05252e586a282e34906db10828d (patch) | |
tree | de215580ce205409a6d810a005c6c5909f3145d1 /xorg-server/glx/indirect_dispatch_swap.c | |
parent | 04ceb8c4a0cca3d8682f094d1d6faed8f693afb5 (diff) | |
parent | 807c6931fe683fd844ceec1b023232181e6aae03 (diff) | |
download | vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.tar.gz vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.tar.bz2 vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/indirect_dispatch_swap.c')
-rw-r--r-- | xorg-server/glx/indirect_dispatch_swap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c index db2d24e5a..c606a5e5e 100644 --- a/xorg-server/glx/indirect_dispatch_swap.c +++ b/xorg-server/glx/indirect_dispatch_swap.c @@ -5350,7 +5350,7 @@ void __glXDispSwap_LoadProgramNV(GLbyte * pc) void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc) { - const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 ); + const GLsizei num = (GLsizei )bswap_CARD32 ( pc + 8 ); #ifdef __GLX_ALIGN64 const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; @@ -5370,7 +5370,7 @@ void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc) void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc) { - const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 ); + const GLsizei num = (GLsizei )bswap_CARD32 ( pc + 8 ); CALL_ProgramParameters4fvNV( GET_DISPATCH(), ( (GLenum )bswap_ENUM ( pc + 0 ), |