glsl-1.30: Test some logic joined comparisons with NaN

These try to reproduce some possible errors introduced by replacing the
logic joined comparisons with either min or max.  Without proper
conditioning, the min or max could be repalced by an fsat that would
produce incorrect results.

Both of these tests fail in mesa!10012 without the corrections suggested
by Rhys.

Acked-by: Emma Anholt <emma@anholt.net>
Part-of: <!514>
10 jobs for main in 14 minutes and 18 seconds (queued for 1 second)