Add more cases for block/non-block uniforms match

Add more cases for block/non-block uniforms match

Cover more situations as described in GLSL 3.20 spec, section 4.3.9.

- It is a link-error when using the same name inside a block with non
instance name and outside a block, but it is correct if the block has
instance name.

- It is a link-error when using the same name inside two different
blocks with non instance name.

Components: OpenGL

VK-GL-CTS issue: 972

Affects:
KHR-GLES3.shaders.uniform_block.common.name_matching
KHR-GL33.shaders.uniform_block.common.name_matching

Change-Id: Ie91300685e807774a9cc9bbb9139936133a8ae1c