diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-07-02 13:29:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-07-02 13:29:46 +0100 |
| commit | 1668a679c4aadb37f5af0d6126c414fb9fbbf748 (patch) | |
| tree | b3edf4157c658f1c37d5e046752135bd2ec566ea /src/mesa/vbo/vbo_split_copy.c | |
| parent | b3e8e1cd4c1584f735e35914861ae2e8ae5b6b2b (diff) | |
| parent | 1fa4cde757cc94c0afa40d855309911247974e98 (diff) | |
Merge commit 'origin/dlist-statechange-shortcircuit' into mesa_7_5_branch
Conflicts:
progs/trivial/Makefile
Pull in a minimal version of statechange shortcircuiting in display
list compilation. This affects only glMaterial and glShadeModel state,
and includes quite a few tests to exercise various tricky cases.
If this goes well, will consider extending to all state in the future.
Diffstat (limited to 'src/mesa/vbo/vbo_split_copy.c')
| -rw-r--r-- | src/mesa/vbo/vbo_split_copy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c index 5fb66d3318..b9a5c56987 100644 --- a/src/mesa/vbo/vbo_split_copy.c +++ b/src/mesa/vbo/vbo_split_copy.c @@ -180,7 +180,7 @@ static void begin( struct copy_context *copy, GLenum mode, GLboolean begin_flag { struct _mesa_prim *prim = ©->dstprim[copy->dstprim_nr]; -/* _mesa_printf("begin %s (%d)\n", _mesa_lookup_enum_by_nr(mode), begin_flag); */ +/* _mesa_printf("begin %s (%d)\n", _mesa_lookup_prim_by_nr(mode), begin_flag); */ prim->mode = mode; prim->begin = begin_flag; |