diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-12-18 18:39:44 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-12-18 18:39:44 +0000 |
| commit | 325f045c04121b989bddfca02711e3d03f7f9c3f (patch) | |
| tree | 58db2e7833f8ae7d93641bba877fcec41f8bc6cd | |
| parent | 5e6fff7ac4a4e0d06d394391f6e2dd2eb6ff8aee (diff) | |
| download | mesa-325f045c04121b989bddfca02711e3d03f7f9c3f.tar.gz | |
st/mesa: move assert on nr vs insns until after pos_invarient expansion
It is possible to have a 1-instruction vertex shader before expanding
pos_invarient. Not sure what this assert achieved, but at least move
it where it is correct.
| -rw-r--r-- | src/mesa/state_tracker/st_atom_shader.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_program.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index 6e311e537ef..9208f3f446f 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -287,8 +287,6 @@ find_translated_vp(struct st_context *st, #endif } - assert(stvp->Base.Base.NumInstructions > 1); - st_translate_vertex_program(st, stvp, xvp->output_to_slot, xvp->output_to_semantic_name, xvp->output_to_semantic_index); diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 190b6a5526d..cf19f8f1a8e 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -87,6 +87,8 @@ st_translate_vertex_program(struct st_context *st, if (stvp->Base.IsPositionInvariant) _mesa_insert_mvp_code(st->ctx, &stvp->Base); + assert(stvp->Base.Base.NumInstructions > 1); + /* * Determine number of inputs, the mappings between VERT_ATTRIB_x * and TGSI generic input indexes, plus input attrib semantic info. |