move interpolate_varying() call

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index a23a60850b2eb20c24acd17e68b974fa4c69e9b2..8a2e5d118edd31bbbca49b6038bca69d5cce0faa 100644 (file)
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1361,12 +1361,10 @@ shade_texture_span(GLcontext *ctx, SWspan *span)
       if (span->interpMask & SPAN_Z)
          _swrast_span_interpolate_z (ctx, span);
 
-      if (ctx->ShaderObjects._FragmentShaderPresent)
-         interpolate_varying(ctx, span);
-
       /* Run fragment program/shader now */
       if (ctx->ShaderObjects._FragmentShaderPresent) {
-         _swrast_exec_arbshader (ctx, span);
+         interpolate_varying(ctx, span);
+         _swrast_exec_arbshader(ctx, span);
       }
       else if (ctx->FragmentProgram._Enabled) {
          _swrast_exec_fragment_program(ctx, span);