diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:37:59 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:37:59 +0000 |
| commit | e56e24af252bd3b8e58076adf0f8eabf1103f187 (patch) | |
| tree | 9d378148aa5cfb83675cfb070a6af296cb4b3e4f /GL/glx/g_render.c | |
| parent | 2e1868b560315a8b20d688e646c489a5ad93eeae (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/GL.
Diffstat (limited to 'GL/glx/g_render.c')
| -rw-r--r-- | GL/glx/g_render.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c index c1aa6a115..f014e3be5 100644 --- a/GL/glx/g_render.c +++ b/GL/glx/g_render.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are @@ -195,6 +195,7 @@ void __glXDisp_Begin(GLbyte *pc) (type *) (pc + 4) ); \ } +#ifndef MISSING_GL_EXTS dispatch_template_1( FogCoordfv, GLfloat ) dispatch_template_1( FogCoorddv, GLdouble ) dispatch_template_3( SecondaryColor3bv, GLbyte ) @@ -207,6 +208,7 @@ dispatch_template_3( SecondaryColor3fv, GLfloat ) dispatch_template_3( SecondaryColor3dv, GLdouble ) dispatch_template_4s( BlendFuncSeparate, GLenum ) +#endif /* !MISSING_GL_EXTS */ void __glXDisp_Color3bv(GLbyte *pc) { @@ -1131,6 +1133,7 @@ void __glXDisp_TexGend(GLbyte *pc) void __glXDisp_TexGendv(GLbyte *pc) { +#ifdef __GLX_ALIGN64 GLenum pname; GLint cmdlen; GLint compsize; @@ -1139,8 +1142,6 @@ void __glXDisp_TexGendv(GLbyte *pc) compsize = __glTexGendv_size(pname); if (compsize < 0) compsize = 0; cmdlen = __GLX_PAD(8+compsize*8); - -#ifdef __GLX_ALIGN64 if ((unsigned long)(pc) & 7) { __GLX_MEM_COPY(pc-4, pc, cmdlen); pc -= 4; @@ -2229,6 +2230,8 @@ void __glXDisp_MultiTexCoord4svARB(GLbyte *pc) * Extensions */ +#ifndef MISSING_GL_EXTS + void __glXDisp_PointParameterfARB(GLbyte *pc) { glPointParameterfARB( @@ -2246,8 +2249,14 @@ void __glXDisp_PointParameterfvARB(GLbyte *pc) ); } +#ifdef __DARWIN__ +#define __glPointParameterivNV_size __glPointParameteriv_size +dispatch_template_enum1_1s(PointParameteriNV, GLint) +dispatch_template_enum1_Vv(PointParameterivNV, GLint) +#else dispatch_template_enum1_1s(PointParameteri, GLint) dispatch_template_enum1_Vv(PointParameteriv, GLint) +#endif void __glXDisp_ActiveStencilFaceEXT(GLbyte *pc) { @@ -2264,6 +2273,7 @@ void __glXDisp_WindowPos3fARB(GLbyte *pc) *(GLfloat *)(pc + 8) ); } +#endif /* !MISSING_GL_EXTS */ void __glXDisp_SampleCoverageARB(GLbyte *pc) { |