From: Brian Paul <brianp@vmware.com>
Date: Wed, 1 Apr 2009 23:34:16 +0000 (-0600)
Subject: mesa: fix a recursive display list problem
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e4b27b4a69f28ca71944fef5f809023bed630a95;p=mesa.git

mesa: fix a recursive display list problem

This fixes an issue when compiling glCallList() into another display list
when the mode is GL_COMPILE_AND_EXECUTE.

Before, the call to glCallList() called _mesa_save_CallList() which called
neutral_CallList() which then called _mesa_save_CallList() again.  In the
end, the parent display list contained two calls to the child display list
instead of one.

Let's be on the lookout for regressions caused by this change for a while
before we cherry-pick this elsewhere.
---

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 8f7f703da96..537ff5881f3 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -975,7 +975,7 @@ _mesa_save_CallList(GLuint list)
    ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
 
    if (ctx->ExecuteFlag) {
-      CALL_CallList(ctx->Exec, (list));
+      _mesa_CallList(list);
    }
 }