mesa: update_arrays() depends on program state.
It uses ctx->VertexProgram._Current. Signed-off-by: Brian Paul <brianp@vmware.com>
This commit is contained in:

committed by
Brian Paul

parent
42ea25cb4e
commit
f820b263db
@@ -582,9 +582,6 @@ _mesa_update_state_locked( GLcontext *ctx )
|
|||||||
if (new_state & _DD_NEW_SEPARATE_SPECULAR)
|
if (new_state & _DD_NEW_SEPARATE_SPECULAR)
|
||||||
update_separate_specular( ctx );
|
update_separate_specular( ctx );
|
||||||
|
|
||||||
if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))
|
|
||||||
update_arrays( ctx );
|
|
||||||
|
|
||||||
if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))
|
if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))
|
||||||
update_viewport_matrix(ctx);
|
update_viewport_matrix(ctx);
|
||||||
|
|
||||||
@@ -620,6 +617,8 @@ _mesa_update_state_locked( GLcontext *ctx )
|
|||||||
new_prog_state |= update_program( ctx );
|
new_prog_state |= update_program( ctx );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT))
|
||||||
|
update_arrays( ctx );
|
||||||
|
|
||||||
out:
|
out:
|
||||||
new_prog_state |= update_program_constants(ctx);
|
new_prog_state |= update_program_constants(ctx);
|
||||||
|
Reference in New Issue
Block a user