From 66f2fd89ea6e46cd76ea62f59c0b2fcdf80b2247 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 17 Jan 2004 17:33:22 +0000
Subject: added some missing FLUSH_VERTICES calls

---
 src/mesa/main/program.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main/program.c')

diff --git a/src/mesa/main/program.c b/src/mesa/main/program.c
index 83bbb20492..aca9be979d 100644
--- a/src/mesa/main/program.c
+++ b/src/mesa/main/program.c
@@ -798,6 +798,9 @@ _mesa_BindProgram(GLenum target, GLuint id)
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   /* texture state is dependent on current fragment and vertex programs */
+   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_TEXTURE);
+
    if ((target == GL_VERTEX_PROGRAM_NV
         && ctx->Extensions.NV_vertex_program) ||
        (target == GL_VERTEX_PROGRAM_ARB
@@ -899,7 +902,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
 {
    GLint i;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    if (n < 0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glDeleteProgramsNV" );
-- 
cgit v1.2.3