Mesa (master): mesa: fix a recursive display list problem
Brian Paul
brianp at kemper.freedesktop.org
Wed Apr 1 23:40:36 UTC 2009
Module: Mesa
Branch: master
Commit: e4b27b4a69f28ca71944fef5f809023bed630a95
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4b27b4a69f28ca71944fef5f809023bed630a95
Author: Brian Paul <brianp at vmware.com>
Date: Wed Apr 1 17:34:16 2009 -0600
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.
---
src/mesa/main/dlist.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 8f7f703..537ff58 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);
}
}
More information about the mesa-commit
mailing list