diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-08-12 16:30:57 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-08-12 16:30:57 +0000 |
| commit | 370b111f4882a95248bcc4727438c95a065c174d (patch) | |
| tree | c2be117ffb22e3d876fbdd5f7a9586506274d912 | |
| parent | 5f5117729de3a8a4eb6e17dc0979e4b1c1ef9918 (diff) | |
Use '$(DRMSRCDIR)/shared-core' instead of '$(DRMSRCDIR)/shared' for DRM
includes. This matches the way drivers are built in the Mesa tree and
fixes a build problem in the Savage driver.
Convert uses of __glPointParameterfvARB_size to
__glPointParameterfvEXT_size and uses of __glPointParameteriv_size to
__glPointParameterivNV_size. This eliminates the need to hand-edit
indirect_size.c after it is generated.
| -rw-r--r-- | GL/glx/g_disptab_EXT.c | 10 | ||||
| -rw-r--r-- | GL/glx/g_disptab_EXT.h | 7 | ||||
| -rw-r--r-- | GL/glx/g_render.c | 6 | ||||
| -rw-r--r-- | GL/glx/g_renderswap.c | 2 | ||||
| -rw-r--r-- | GL/glx/impsize.h | 4 | ||||
| -rw-r--r-- | GL/glx/rensize.c | 2 |
6 files changed, 4 insertions, 27 deletions
diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c index 1ce1bd4a7..d837c64d9 100644 --- a/GL/glx/g_disptab_EXT.c +++ b/GL/glx/g_disptab_EXT.c @@ -2225,13 +2225,8 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXNoSuchRenderOpcode, /* 4219 */ #ifndef MISSING_GL_EXTS __glXDisp_ActiveStencilFaceEXT, /* 4220 */ -# ifndef __DARWIN__ - __glXDisp_PointParameteri, /* 4221 */ - __glXDisp_PointParameteriv, /* 4222 */ -# else __glXDisp_PointParameteriNV, /* 4221 */ __glXDisp_PointParameterivNV, /* 4222 */ -# endif #else __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -4435,13 +4430,8 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXNoSuchRenderOpcode, /* 4219 */ #ifndef MISSING_GL_EXTS __glXDispSwap_ActiveStencilFaceEXT, /* 4220 */ -# ifndef __DARWIN__ - __glXDispSwap_PointParameteri, /* 4221 */ - __glXDispSwap_PointParameteriv, /* 4222 */ -# else __glXDispSwap_PointParameteriNV, /* 4221 */ __glXDispSwap_PointParameterivNV, /* 4222 */ -# endif #else __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h index 33672379b..3def7f1c5 100644 --- a/GL/glx/g_disptab_EXT.h +++ b/GL/glx/g_disptab_EXT.h @@ -99,17 +99,10 @@ extern void __glXDispSwap_SecondaryColor3dv(GLbyte *); extern void __glXDisp_BlendFuncSeparate(GLbyte *); extern void __glXDispSwap_BlendFuncSeparate(GLbyte *); -#ifdef __DARWIN__ extern void __glXDisp_PointParameteriNV(GLbyte *); extern void __glXDisp_PointParameterivNV(GLbyte *); extern void __glXDispSwap_PointParameteriNV(GLbyte *); extern void __glXDispSwap_PointParameterivNV(GLbyte *); -#else -extern void __glXDisp_PointParameteri(GLbyte *); -extern void __glXDisp_PointParameteriv(GLbyte *); -extern void __glXDispSwap_PointParameteri(GLbyte *); -extern void __glXDispSwap_PointParameteriv(GLbyte *); -#endif extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*); diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c index 28d23da84..24c64897e 100644 --- a/GL/glx/g_render.c +++ b/GL/glx/g_render.c @@ -2253,14 +2253,8 @@ 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) { diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c index e22494ed2..f485a2690 100644 --- a/GL/glx/g_renderswap.c +++ b/GL/glx/g_renderswap.c @@ -3339,7 +3339,7 @@ void __glXDispSwap_PointParameterfvARB(GLbyte *pc) __GLX_SWAP_INT(pc + 0); pname = *(GLenum *)(pc + 0); - compsize = __glPointParameterfvARB_size(pname); + compsize = __glPointParameterfvEXT_size(pname); if (compsize < 0) compsize = 0; __GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize); diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h index eee60cc3e..1bef03d21 100644 --- a/GL/glx/impsize.h +++ b/GL/glx/impsize.h @@ -71,7 +71,7 @@ extern int __glTexParameterfv_size(GLenum e); extern int __glTexParameteriv_size(GLenum e); extern int __glEvalComputeK(GLenum target); -extern int __glPointParameterfvARB_size(GLenum e); -extern int __glPointParameteriv_size(GLenum e); +extern int __glPointParameterfvEXT_size(GLenum e); +extern int __glPointParameterivNV_size(GLenum e); #endif /* _impsize_h_ */ diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c index 9cedecfad..29d545e4c 100644 --- a/GL/glx/rensize.c +++ b/GL/glx/rensize.c @@ -922,7 +922,7 @@ int __glXPointParameterfvARBReqSize(GLbyte *pc, Bool swap ) if (swap) { pname = SWAPL( pname ); } - return 4 * __glPointParameterfvARB_size( pname ); + return 4 * __glPointParameterfvEXT_size( pname ); } int __glXPointParameterivReqSize(GLbyte *pc, Bool swap ) |