frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ian Romanick 2005-08-12 16:30:57 +00:00
parent 5f5117729d
commit 370b111f48
6 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GL/glx/g_disptab_EXT.c
View File

@ -2225,13 +2225,8 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
__glXNoSuchRenderOpcode, /* 4219 */ __glXNoSuchRenderOpcode, /* 4219 */
#ifndef MISSING_GL_EXTS #ifndef MISSING_GL_EXTS
__glXDisp_ActiveStencilFaceEXT, /* 4220 */ __glXDisp_ActiveStencilFaceEXT, /* 4220 */
# ifndef __DARWIN__
__glXDisp_PointParameteri, /* 4221 */
__glXDisp_PointParameteriv, /* 4222 */
# else
__glXDisp_PointParameteriNV, /* 4221 */ __glXDisp_PointParameteriNV, /* 4221 */
__glXDisp_PointParameterivNV, /* 4222 */ __glXDisp_PointParameterivNV, /* 4222 */
# endif
#else #else
__glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode,
@ -4435,13 +4430,8 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
__glXNoSuchRenderOpcode, /* 4219 */ __glXNoSuchRenderOpcode, /* 4219 */
#ifndef MISSING_GL_EXTS #ifndef MISSING_GL_EXTS
__glXDispSwap_ActiveStencilFaceEXT, /* 4220 */ __glXDispSwap_ActiveStencilFaceEXT, /* 4220 */
# ifndef __DARWIN__
__glXDispSwap_PointParameteri, /* 4221 */
__glXDispSwap_PointParameteriv, /* 4222 */
# else
__glXDispSwap_PointParameteriNV, /* 4221 */ __glXDispSwap_PointParameteriNV, /* 4221 */
__glXDispSwap_PointParameterivNV, /* 4222 */ __glXDispSwap_PointParameterivNV, /* 4222 */
# endif
#else #else
__glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode,
__glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode,

7
GL/glx/g_disptab_EXT.h
View File

@ -99,17 +99,10 @@ extern void __glXDispSwap_SecondaryColor3dv(GLbyte *);
extern void __glXDisp_BlendFuncSeparate(GLbyte *); extern void __glXDisp_BlendFuncSeparate(GLbyte *);
extern void __glXDispSwap_BlendFuncSeparate(GLbyte *); extern void __glXDispSwap_BlendFuncSeparate(GLbyte *);
#ifdef __DARWIN__
extern void __glXDisp_PointParameteriNV(GLbyte *); extern void __glXDisp_PointParameteriNV(GLbyte *);
extern void __glXDisp_PointParameterivNV(GLbyte *); extern void __glXDisp_PointParameterivNV(GLbyte *);
extern void __glXDispSwap_PointParameteriNV(GLbyte *); extern void __glXDispSwap_PointParameteriNV(GLbyte *);
extern void __glXDispSwap_PointParameterivNV(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*); extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*);

6
GL/glx/g_render.c
View File

@ -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_1s(PointParameteriNV, GLint)
dispatch_template_enum1_Vv(PointParameterivNV, 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) void __glXDisp_ActiveStencilFaceEXT(GLbyte *pc)
{ {

2
GL/glx/g_renderswap.c
View File

@ -3339,7 +3339,7 @@ void __glXDispSwap_PointParameterfvARB(GLbyte *pc)
__GLX_SWAP_INT(pc + 0); __GLX_SWAP_INT(pc + 0);
pname = *(GLenum *)(pc + 0); pname = *(GLenum *)(pc + 0);
compsize = __glPointParameterfvARB_size(pname); compsize = __glPointParameterfvEXT_size(pname);
if (compsize < 0) compsize = 0; if (compsize < 0) compsize = 0;
__GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize); __GLX_SWAP_FLOAT_ARRAY(pc + 4, compsize);

4
GL/glx/impsize.h
View File

@ -71,7 +71,7 @@ extern int __glTexParameterfv_size(GLenum e);
extern int __glTexParameteriv_size(GLenum e); extern int __glTexParameteriv_size(GLenum e);
extern int __glEvalComputeK(GLenum target); extern int __glEvalComputeK(GLenum target);
extern int __glPointParameterfvARB_size(GLenum e); extern int __glPointParameterfvEXT_size(GLenum e);
extern int __glPointParameteriv_size(GLenum e); extern int __glPointParameterivNV_size(GLenum e);
#endif /* _impsize_h_ */ #endif /* _impsize_h_ */

2
GL/glx/rensize.c
View File

@ -922,7 +922,7 @@ int __glXPointParameterfvARBReqSize(GLbyte *pc, Bool swap )
if (swap) { if (swap) {
pname = SWAPL( pname ); pname = SWAPL( pname );
} }
return 4 * __glPointParameterfvARB_size( pname ); return 4 * __glPointParameterfvEXT_size( pname );
} }
int __glXPointParameterivReqSize(GLbyte *pc, Bool swap ) int __glXPointParameterivReqSize(GLbyte *pc, Bool swap )