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

[mesa.git] / src / mesa / drivers / dri / i915 / intel_tris.c

diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 886029574e02e02ed2a858b8d3770ca6508b0783..bb0a7713e605f42b8a5e490e0e2474a8dcc18348 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -50,7 +50,7 @@ static void intelRasterPrimitive( GLcontext *ctx, GLenum rprim, GLuint hwprim );
  *                    Emit primitives as inline vertices               *
  ***********************************************************************/
 
-#if 1
+#ifdef __i386__
 #define COPY_DWORDS( j, vb, vertsize, v )                      \
 do {                                                           \
    int __tmp;                                                  \
@@ -63,9 +63,9 @@ do {                                                          \
 #else
 #define COPY_DWORDS( j, vb, vertsize, v )      \
 do {                                           \
-   if (1) fprintf(stderr, "\n");       \
+   if (0) fprintf(stderr, "\n");       \
    for ( j = 0 ; j < vertsize ; j++ ) {                \
-      if (1) fprintf(stderr, "   -- v(%d): %x/%f\n",j, \
+      if (0) fprintf(stderr, "   -- v(%d): %x/%f\n",j, \
              ((GLuint *)v)[j],                 \
              ((GLfloat *)v)[j]);               \
       vb[j] = ((GLuint *)v)[j];                        \
@@ -642,7 +642,7 @@ void intelChooseRenderState(GLcontext *ctx)
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    intelContextPtr intel = INTEL_CONTEXT(ctx);
    GLuint flags = ctx->_TriangleCaps;
-   struct fragment_program *program = ctx->FragmentProgram.Current;
+   struct fragment_program *program = ctx->FragmentProgram._Current;
    GLboolean have_wpos = (program && (program->InputsRead & FRAG_BIT_WPOS));
    GLuint index = 0;