fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / r200 / r200_vtxfmt_x86.c

diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c b/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c
index c4d8af85e1690ba252d8534b59c33ec33c124ad5..b78a55c31f63399bb50eabb5486af521e36dbae7 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c
@@ -305,14 +305,14 @@ struct dynfn *r200_makeX86Color4ub( GLcontext *ctx, const int *key )
       return dfn;
    }
    else
-      return 0;
+      return NULL;
 }
 
 
 struct dynfn *r200_makeX86Color3fv( GLcontext *ctx, const int *key )
 {
    if (VTX_COLOR(key[0],0) != R200_VTX_FP_RGB) 
-      return 0;
+      return NULL;
    else
    {
       r200ContextPtr rmesa = R200_CONTEXT(ctx);
@@ -325,7 +325,7 @@ struct dynfn *r200_makeX86Color3fv( GLcontext *ctx, const int *key )
 struct dynfn *r200_makeX86Color3f( GLcontext *ctx, const int *key )
 {
    if (VTX_COLOR(key[0],0) != R200_VTX_FP_RGB) 
-      return 0;
+      return NULL;
    else
    {
       r200ContextPtr rmesa = R200_CONTEXT(ctx);
@@ -337,6 +337,7 @@ struct dynfn *r200_makeX86Color3f( GLcontext *ctx, const int *key )
 
 
 
+#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */
 struct dynfn *r200_makeX86TexCoord2fv( GLcontext *ctx, const int *key )
 {
    r200ContextPtr rmesa = R200_CONTEXT(ctx);
@@ -395,7 +396,7 @@ struct dynfn *r200_makeX86MultiTexCoord2fARB( GLcontext *ctx,
    }      
    return dfn;
 }
-
+#endif
 
 void r200InitX86Codegen( struct dfn_generators *gen )
 {
@@ -405,10 +406,12 @@ void r200InitX86Codegen( struct dfn_generators *gen )
    gen->Color4ubv = r200_makeX86Color4ubv; /* PKCOLOR only */
    gen->Normal3f = r200_makeX86Normal3f;
    gen->Normal3fv = r200_makeX86Normal3fv;
+#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */
    gen->TexCoord2f = r200_makeX86TexCoord2f;
    gen->TexCoord2fv = r200_makeX86TexCoord2fv;
    gen->MultiTexCoord2fARB = r200_makeX86MultiTexCoord2fARB;
    gen->MultiTexCoord2fvARB = r200_makeX86MultiTexCoord2fvARB;
+#endif
    gen->Color3f = r200_makeX86Color3f;
    gen->Color3fv = r200_makeX86Color3fv;