Merge change 26891 into eclair

* changes:
  Make tritex test run with latest OpenGL driver.