gles2rice: Integrate upstream code into OGLCombiner.cpp.