gles2rice: More integration of upstream into OGLGraphicsContext.cpp
gles2rice: Integrate upstream code into OGLExtCombiner.cpp