From: Zou Nan hai <nanhai.zou@intel.com>
Date: Thu, 27 Sep 2007 07:47:00 +0000 (+0800)
Subject:  fix issue when only fragment shader or vertex shader is used
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35a0634e358baac832d6e5a76630fcae57a948a7;p=mesa.git

 fix issue when only fragment shader or vertex shader is used
---

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 8366f14dbea..2031d556c1b 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -69,11 +69,18 @@ static void brwUseProgram(GLcontext *ctx, GLuint program)
         _mesa_use_program(ctx, program);
         sh_prog = ctx->Shader.CurrentProgram;
         if (sh_prog) {
-            ctx->VertexProgram.Enabled = GL_TRUE;
-            ctx->FragmentProgram.Enabled = GL_TRUE;
-            brw->attribs.VertexProgram->Current = sh_prog->VertexProgram;
-            brw->attribs.FragmentProgram->Current = sh_prog->FragmentProgram;
-        }
+	    if (sh_prog->VertexProgram) {
+		brw->attribs.VertexProgram->Current = sh_prog->VertexProgram;
+		ctx->VertexProgram.Enabled = GL_TRUE;
+	    }else
+		ctx->VertexProgram.Enabled = GL_FALSE;
+		
+	    if (sh_prog->FragmentProgram) {
+		brw->attribs.FragmentProgram->Current = sh_prog->FragmentProgram;
+		ctx->FragmentProgram.Enabled = GL_TRUE;
+	    } else
+		ctx->VertexProgram.Enabled = GL_FALSE;
+	}
 }
 
 static void brwInitProgFuncs( struct dd_function_table *functions )