framebuffer-clut: Fixes to ES 2.0 path, slight simplification to ES 3.0 path