disable ctx->Driver.NewProgram() call in _mesa_new_program()

This was causing infinite recursive calls w/ software drivers.
All vertex/fragment shaders should be allocated by calling
ctx->Driver.NewProgram(), not by calling _mesa_new_program().

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 11330e24322238e342d73cf32d182f7b21c643b1..43e6fb0be02b9614be9de89f814882b6bde85de2 100644 (file)
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -285,8 +285,13 @@ _mesa_init_vertex_program( GLcontext *ctx, struct gl_vertex_program *prog,
 struct gl_program *
 _mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
 {
+#if 0
+   /* This was added by Nan hai Zou but disabled by BrianP since it
+    * causes infinite recursive calls.
+    */
    if (ctx->Driver.NewProgram)
         return ctx->Driver.NewProgram(ctx, target, id);
+#endif
    switch (target) {
    case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
       return _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),