glsl/nir: Couple of fixes to gl_nir_opt_access

Merged Caio Oliveira requested to merge cmarcelo/mesa:r/nir-fix-opt-access into master

Fixes the failing tests in Intel CI. Commit messages have the descriptions.

Merge request reports