Fix some problems that caused incorrectly annotated prototypes for

__gl*_size functions to be used. The result was that, on x86, the code
    would be compiled with FASTCALL semantics, but the callers would not.
    This should fix GLX protocol errors that people are seeing. There
    doesn't appear to be a bugzilla associated with this problem.
This commit is contained in:
Ian Romanick 2005-09-27 00:04:40 +00:00
parent 6c5c54b9a2
commit 30ff9e2619
2 changed files with 4 additions and 24 deletions

View File

@ -48,30 +48,10 @@
** itself), but we thought it was better to call these routines than to
** replicate the code in here.
*/
extern int __glCallLists_size(GLsizei n, GLenum type);
extern int __glColorTableParameterfv_size(GLenum pname);
extern int __glColorTableParameteriv_size(GLenum pname);
extern int __glConvolutionParameterfv_size(GLenum pname);
extern int __glConvolutionParameteriv_size(GLenum pname);
#include "indirect_size.h"
extern int __glDrawPixels_size(GLenum format, GLenum type, GLsizei w,GLsizei h);
extern int __glFogfv_size(GLenum pname);
extern int __glFogiv_size(GLenum pname);
extern int __glLightModelfv_size(GLenum pname);
extern int __glLightModeliv_size(GLenum pname);
extern int __glLightfv_size(GLenum pname);
extern int __glLightiv_size(GLenum pname);
extern int __glMaterialfv_size(GLenum pname);
extern int __glMaterialiv_size(GLenum pname);
extern int __glTexEnvfv_size(GLenum e);
extern int __glTexEnviv_size(GLenum e);
extern int __glTexGendv_size(GLenum e);
extern int __glTexGenfv_size(GLenum e);
extern int __glTexGeniv_size(GLenum pname);
extern int __glTexParameterfv_size(GLenum e);
extern int __glTexParameteriv_size(GLenum e);
extern int __glEvalComputeK(GLenum target);
extern int __glPointParameterfvEXT_size(GLenum e);
extern int __glPointParameterivNV_size(GLenum e);
#endif /* _impsize_h_ */

View File

@ -57,7 +57,7 @@ int __glXCallListsReqSize(GLbyte *pc, Bool swap )
n = SWAPL( n );
type = SWAPL( type );
}
return __glCallLists_size( n, type ); /* defined in samplegl lib */
return n * __glCallLists_size( type );
}
int __glXFogivReqSize(GLbyte *pc, Bool swap )