From 308b85f29f191409e42935a3ccd5c502bdf70608 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 23 Nov 2006 15:58:30 +0000
Subject: fix several program-related bugs (bug 9136)

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

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

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 789d36eba0..ddfad47b89 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -207,6 +207,7 @@ _mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
       prog->Target = target;
       prog->Resident = GL_TRUE;
       prog->RefCount = 1;
+      prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
    }
 
    return prog;
@@ -284,6 +285,9 @@ _mesa_delete_program(GLcontext *ctx, struct gl_program *prog)
    (void) ctx;
    ASSERT(prog);
 
+   if (prog == &_mesa_DummyProgram)
+      return;
+                 
    if (prog->String)
       _mesa_free(prog->String);
 
-- 
cgit v1.2.3