shader: fix a couple of regressions detected by a full dEQP run

With the help of the new CI MR !694 (merged) by @cristicc, we already detected some regressions, one of this is explained in #257.

This MR fixes two of these regressions.

cc @gerddie