Mesa (7.11): meta: Fix saving the active program

[Chad Versace]

Module: Mesa
Branch: 7.11
Commit: 986319cd20cfb39e0e3b37eb093f127063264dca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=986319cd20cfb39e0e3b37eb093f127063264dca

Author: Neil Roberts <neil at linux.intel.com>
Date:   Tue Oct 18 18:42:51 2011 +0100

meta: Fix saving the active program

When saving the active program in _mesa_meta_begin, it was actually
saving the fragment program instead. This means that if the
application binds a program that only has a vertex shader then when
the meta saved state is restored it will forget the bound program.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41969
Reviewed-by: Chad Versace <chad at chad-versace.us>
(cherry picked from commit 5625f78cd7e69aa90495d34088a47aa71d076fd2)

---

 src/mesa/drivers/common/meta.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 95044d2..a578797 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -471,7 +471,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
 	 _mesa_reference_shader_program(ctx, &save->FragmentShader,
 					ctx->Shader.CurrentFragmentProgram);
 	 _mesa_reference_shader_program(ctx, &save->ActiveShader,
-					ctx->Shader.CurrentFragmentProgram);
+					ctx->Shader.ActiveProgram);
 
          _mesa_UseProgramObjectARB(0);
       }