Only vertex program fix, bypass tnl vertex program

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 2031d556c1b..9266e73570a 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -79,7 +79,7 @@ static void brwUseProgram(GLcontext *ctx, GLuint program)
 		brw->attribs.FragmentProgram->Current = sh_prog->FragmentProgram;
 		ctx->FragmentProgram.Enabled = GL_TRUE;
 	    } else
-		ctx->VertexProgram.Enabled = GL_FALSE;
+		ctx->FragmentProgram.Enabled = GL_FALSE;
 	}
 }
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 72b54b27d9a..126a9e1179d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1239,7 +1239,7 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
 
    /* If a conventional fragment program/shader isn't in effect... */
    if (!ctx->FragmentProgram._Enabled &&
-       !ctx->Shader.CurrentProgram) {
+       (!ctx->Shader.CurrentProgram || !ctx->Shader.CurrentProgram->FragmentProgram)) {
       make_state_key(ctx, &key);
       hash = hash_key(&key);