OpenGL2: Merge bsp surface structs into a single struct, and more cleanup.