fix grStippleMode/Pattern on FreeBSD (got removed in trunk merge).

4 files changed, 8 insertions, 4 deletions

diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
index 568da0563..bab7acb3e 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.c
@@ -609,10 +609,10 @@ GLboolean tdfxInitGlide(tdfxContextPtr tmesa)
    GET_FUNCTION(grDisable, "grDisable");
    GET_FUNCTION(grCoordinateSpace, "grCoordinateSpace");
    GET_FUNCTION(grDepthRange, "grDepthRange");
-#ifdef __linux__ 
+#if defined(__linux__) || defined(__FreeBSD__) 
    GET_FUNCTION(grStippleMode, "grStippleMode");
    GET_FUNCTION(grStipplePattern, "grStipplePattern");
-#endif /* __linux__ */
+#endif /* __linux__ || __FreeBSD__ */
    GET_FUNCTION(grViewport, "grViewport");
    GET_FUNCTION(grTexCalcMemRequired, "grTexCalcMemRequired");
    GET_FUNCTION(grTexTextureMemRequired, "grTexTextureMemRequired");
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
index 3ab973604..f23ac43aa 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_context.h
@@ -650,10 +650,10 @@ struct tdfx_glide {
    void (*grDisable)( GrEnableMode_t mode );
    void (*grCoordinateSpace)( GrCoordinateSpaceMode_t mode );
    void (*grDepthRange)( FxFloat n, FxFloat f );
-#ifdef __linux__ 
+#if defined(__linux__) || defined (__FreeBSD__)
    void (*grStippleMode)( GrStippleMode_t mode );
    void (*grStipplePattern)( GrStipplePattern_t mode );
-#endif /* __linux__ */
+#endif /* __linux__ || __FreeBSD__ */
    void (*grViewport)( FxI32 x, FxI32 y, FxI32 width, FxI32 height );
    FxU32 (*grTexCalcMemRequired)(GrLOD_t lodmin, GrLOD_t lodmax,
                                 GrAspectRatio_t aspect, GrTextureFormat_t fmt);
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
index 42acda0c7..208478d77 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_render.c
@@ -695,11 +695,13 @@ void tdfxEmitHwStateLocked( tdfxContextPtr fxMesa )
       fxMesa->dirty &= ~TDFX_UPLOAD_RENDER_BUFFER;
    }
 
+#if defined(__linux__) || defined(__FreeBSD__)
    if ( fxMesa->dirty & TDFX_UPLOAD_STIPPLE) {
       fxMesa->Glide.grStipplePattern( fxMesa->Stipple.Pattern );
       fxMesa->Glide.grStippleMode( fxMesa->Stipple.Mode );
       fxMesa->dirty &= ~TDFX_UPLOAD_STIPPLE;
    }
+#endif /* __linux__ || __FreeBSD__ */
 
    if ( fxMesa->dirty & TDFX_UPLOAD_ALPHA_TEST ) {
       fxMesa->Glide.grAlphaTestFunction( fxMesa->Color.AlphaFunc );
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
index 4738fe809..ed3d9017e 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
+++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_state.c
@@ -1155,12 +1155,14 @@ static void tdfxDDReducedPrimitiveChange( GLcontext *ctx, GLenum prim )
       fxMesa->dirty &= ~TDFX_UPLOAD_CULL;
    }
 
+#if defined(__linux__) || defined(__FreeBSD__)
    tdfxUpdateStipple(ctx);
    if ( fxMesa->dirty & TDFX_UPLOAD_STIPPLE ) {
       fxMesa->Glide.grStipplePattern ( fxMesa->Stipple.Pattern );
       fxMesa->Glide.grStippleMode ( fxMesa->Stipple.Mode );
       fxMesa->dirty &= ~TDFX_UPLOAD_STIPPLE;
    }
+#endif /* __linux__ || __FreeBSD__ */
 }