From 0cab1db7763392f9df2c3dfa598d6a81d5af4606 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 13 Jul 2001 11:28:07 +0000 Subject: Committing in . Modified Files: Mesa/src/descrip.mms Mesa/src/FX/fxtris.c Mesa/src/FX/fxvb.c -updated OpenVMS makefile -fixed compilation if FX is NOT defined. ---------------------------------------------------------------------- --- src/mesa/drivers/glide/fxtris.c | 18 ++++++++++++++++++ src/mesa/drivers/glide/fxvb.c | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/glide/fxtris.c b/src/mesa/drivers/glide/fxtris.c index 5129a94476..150a3f8005 100644 --- a/src/mesa/drivers/glide/fxtris.c +++ b/src/mesa/drivers/glide/fxtris.c @@ -32,6 +32,8 @@ #include #include +#ifdef FX + #include "glheader.h" #include "mtypes.h" #include "macros.h" @@ -822,3 +824,19 @@ void fxDDInitTriFuncs( GLcontext *ctx ) (void) fx_print_vertex; } + +#else + + +/* + * Need this to provide at least one external definition. + */ + +extern int gl_fx_dummy_function_tris(void); +int +gl_fx_dummy_function_tris(void) +{ + return 0; +} + +#endif /* FX */ diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c index 9468d83e3b..62e93f8e70 100644 --- a/src/mesa/drivers/glide/fxvb.c +++ b/src/mesa/drivers/glide/fxvb.c @@ -24,6 +24,8 @@ */ /* $XFree86: xc/lib/GL/mesa/src/drv/tdfx/tdfxvb.c,v 1.7 2000/11/08 05:02:43 dawes Exp $ */ +#ifdef FX + #include "glheader.h" #include "mtypes.h" #include "mem.h" @@ -391,3 +393,18 @@ void fxFreeVB( GLcontext *ctx ) fxMesa->UbyteColor.Ptr = 0; } } +#else + + +/* + * Need this to provide at least one external definition. + */ + +extern int gl_fx_dummy_function_vb(void); +int +gl_fx_dummy_function_vb(void) +{ + return 0; +} + +#endif /* FX */ -- cgit v1.2.3