Merge changes Id437e220,I9d6b3fba
authorTreehugger Robot <treehugger-gerrit@google.com>
Mon, 11 Sep 2017 19:30:30 +0000 (19:30 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 11 Sep 2017 19:30:30 +0000 (19:30 +0000)
commit94b6d1164001af38af15d73ef21af4f73975ca42
treef6a602e961a68c9cbb070ac48a9f84f6e979e65a
parentbc6743fe2716e5227514713e348c32ce74d66aef
parent22b06ee14aab70d32912ee3f2ba2949a5eaf5c57
Merge changes Id437e220,I9d6b3fba

* changes:
  Allow ES 3.2 contexts to run sRGB write control unsupported test.
  Require GL_EXT_sRGB_write_control for GL_FRAMEBUFFER_SRGB enable/disable