This reverts commit a141a075.

Reason for revert: We need a different solution to fix this issue which doesn't
                   require having a different sampler index and register index.

Change-Id: If08a0fc4713e2bd8277630ca760bb8686a2effd2
Reviewed-on: https://swiftshader-review.googlesource.com/15649Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>