projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
vbo
/
vbo_save_draw.c
diff --git
a/src/mesa/vbo/vbo_save_draw.c
b/src/mesa/vbo/vbo_save_draw.c
index b015bf278648ae7dc2d7004a545cb8faee4eaaca..0488c5d718295dac46ea38d6f4e07c90e2c2d33a 100644
(file)
--- a/
src/mesa/vbo/vbo_save_draw.c
+++ b/
src/mesa/vbo/vbo_save_draw.c
@@
-118,7
+118,7
@@
static void vbo_bind_vertex_list( GLcontext *ctx,
GLuint data = node->buffer_offset;
const GLuint *map;
GLuint attr;
GLuint data = node->buffer_offset;
const GLuint *map;
GLuint attr;
- GL
uint varying_inputs =
0;
+ GL
bitfield varying_inputs = 0x
0;
/* Install the default (ie Current) attributes first, then overlay
* all active ones.
/* Install the default (ie Current) attributes first, then overlay
* all active ones.
@@
-241,6
+241,11
@@
void vbo_save_playback_vertex_list( GLcontext *ctx, void *data )
vbo_bind_vertex_list( ctx, node );
vbo_bind_vertex_list( ctx, node );
+ /* Again...
+ */
+ if (ctx->NewState)
+ _mesa_update_state( ctx );
+
vbo_context(ctx)->draw_prims( ctx,
save->inputs,
node->prim,
vbo_context(ctx)->draw_prims( ctx,
save->inputs,
node->prim,