From 0bf5dbe002a64e198f55724cc1542602c012490f Mon Sep 17 00:00:00 2001
From: Brian <brian@yutani.localnet.net>
Date: Tue, 19 Dec 2006 18:02:41 -0700
Subject: Overhaul of GLSL API functions, dispatching, etc.

---
 src/mesa/swrast/s_context.c | 2 +-
 src/mesa/swrast/s_span.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/swrast')

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 46f99ef6e0..749e278ffa 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -102,7 +102,7 @@ _swrast_update_rasterflags( GLcontext *ctx )
       rasterMask |= FRAGPROG_BIT;
    }
 
-   if (ctx->ShaderObjects._FragmentShaderPresent) {
+   if (ctx->Shader._FragmentShaderPresent) {
       rasterMask |= FRAGPROG_BIT;
    }
 
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 7bfb23f0f7..536ac30033 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1365,7 +1365,7 @@ shade_texture_span(GLcontext *ctx, SWspan *span)
       if (span->interpMask & SPAN_Z)
          _swrast_span_interpolate_z (ctx, span);
 
-      if (ctx->ShaderObjects.Linked && span->interpMask & SPAN_VARYING)
+      if (ctx->Shader.CurrentProgram && span->interpMask & SPAN_VARYING)
          interpolate_varying(ctx, span);
 
       /* Run fragment program/shader now */
-- 
cgit v1.2.3