For whatever reason, I thought we might have non-ssa phi sources. However,
I looked again and I don't think it's possible. Also, this patch applies
with no piglit regressions.
On Tue, Feb 3, 2015 at 10:49 AM, Jason Ekstrand <ja...@jlekstrand.net>
wrote:
> ---
> src/glsl/nir/nir_validate.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/src/glsl/nir/nir_validate.c b/src/glsl/nir/nir_validate.c
> index 7c801b2..5b47f1a 100644
> --- a/src/glsl/nir/nir_validate.c
> +++ b/src/glsl/nir/nir_validate.c
> @@ -488,16 +488,9 @@ validate_phi_src(nir_phi_instr *instr, nir_block
> *pred, validate_state *state)
> exec_list_validate(&instr->srcs);
> nir_foreach_phi_src(instr, src) {
> if (src->pred == pred) {
> - unsigned num_components;
> - if (src->src.is_ssa)
> - num_components = src->src.ssa->num_components;
> - else {
> - if (src->src.reg.reg->is_packed)
> - num_components = 4; /* can't check anything */
> - else
> - num_components = src->src.reg.reg->num_components;
> - }
> - assert(num_components == instr->dest.ssa.num_components);
> + assert(src->src.is_ssa);
> + assert(src->src.ssa->num_components ==
> + instr->dest.ssa.num_components);
>
> validate_src(&src->src, state);
> return;
> --
> 2.2.2
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
