Reland "Pin the GLSL version to be no larger than the GL version"

Updated to fix a bug with the different version numbering between
GL and GLSL.

This reverts commit 0042cb0c87fbf9826c8ba6bcb2bb5030ff68d5e8.

Change-Id: I5ae9bb77bd46eac47b05e340b491f8a8671ef5a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/238057
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
2 files changed