src/mesa/drivers/dri/r300/radeon_state.c |    4 ++--
 src/mesa/main/context.c                  |    3 ++-
 src/mesa/main/context.h                  |    2 ++
 src/mesa/main/extensions.c               |    4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/radeon_state.c b/src/mesa/drivers/dri/r300/radeon_state.c
index 82bfd951b9245317d67f4a55bc0b4acbc40d82b2..226a3cfbe7fd81903b6b6e3246f16fd14e05cb7a 100644
--- a/src/mesa/drivers/dri/r300/radeon_state.c
+++ b/src/mesa/drivers/dri/r300/radeon_state.c
@@ -125,8 +125,8 @@ void radeonUpdateScissor(GLcontext* ctx)
 
 		radeon->state.scissor.rect.x1 = x1;
 		radeon->state.scissor.rect.y1 = y1;
-		radeon->state.scissor.rect.x2 = x1 + ctx->Scissor.Width - 1;
-		radeon->state.scissor.rect.y2 = y1 + ctx->Scissor.Height - 1;
+		radeon->state.scissor.rect.x2 = x1 + ctx->Scissor.Width;
+		radeon->state.scissor.rect.y2 = y1 + ctx->Scissor.Height;
 
 		radeonRecalcScissorRects(radeon);
 	}
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index a240baf30116f83c7000dc0d9be6812a3460a794..9443b5bcd88e2d318208ba92eb03e71cd50aeade 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -671,7 +671,8 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
 {
    struct gl_renderbuffer *rb = (struct gl_renderbuffer *) data;
    rb->RefCount = 0;  /* see comment for FBOs above */
-   rb->Delete(rb);
+   if (rb->Delete)
+      rb->Delete(rb);
 }
 
 
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 7a9d97ce869e4f7be28973112d36ed0456556de1..ad123aaab361fb037d8bba4e00b4a0a8192c6400 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -273,8 +273,10 @@ do {									\
      (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)	\
     || (CTX)->Fog.ColorSumEnabled					\
     || ((CTX)->VertexProgram._Current &&				\
+        ((CTX)->VertexProgram._Current != (CTX)->VertexProgram._TnlProgram) &&    \
         ((CTX)->VertexProgram._Current->Base.InputsRead & VERT_BIT_COLOR1)) \
     || ((CTX)->FragmentProgram._Current &&				\
+        ((CTX)->FragmentProgram._Current != (CTX)->FragmentProgram._TexEnvProgram) &&  \
         ((CTX)->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_COL1)) \
    )
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 4e44c5b71034f22324d5dd6ea203423caca13bbe..ab832f5387f95279d1ca8bbd5047b39ed8970eab 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -201,7 +201,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
 #endif
 #if FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
+   ctx->Extensions.ARB_shading_language_120 = GL_FALSE; /* not quite done */
 #endif
    ctx->Extensions.ARB_shadow = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
@@ -415,7 +415,7 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
 #ifdef FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
+   ctx->Extensions.ARB_shading_language_120 = GL_FALSE; /* not quite done */
 #endif
 }