[Mesa-dev] [PATCH 2/2] i965: Don't maintain programs for ff state when there is no ff

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

NOTE: This is a candidate for the 9.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/drivers/dri/i965/brw_context.c | 4 ++--
 1 file 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 f439cf2..13d5c31 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -362,8 +362,8 @@ brwCreateContext(int api,
 
    intel->batch.need_workaround_flush = true;
 
-   ctx->VertexProgram._MaintainTnlProgram = true;
-   ctx->FragmentProgram._MaintainTexEnvProgram = true;
+   ctx->VertexProgram._MaintainTnlProgram = ctx->API != API_OPENGL_CORE;
+   ctx->FragmentProgram._MaintainTexEnvProgram = ctx->API != API_OPENGL_CORE;
 
    brw_draw_init( brw );
 
-- 
1.7.11.7