Hi,
I don't know much about the current shader code but is this the right way to go thinking about GL_EXT_texture_swizzle + GL_ARB_texture_rg? For instance Nvidia drivers will soon get the swizzle extension and for that you don't have to fixups anymore. Is moving this way the right approach, so that it won't become a mess later on?
Roderick