Ok, results: These are on release builds. Debug builds _are_ a lot slower (not 5 times slower, though) after the refactor, due to a lot of uninlined functions and invariant calls. VSync(default on open source drivers) is on, so I'm fixed to at most 60FPS. No idea how to disable it with these drivers, will google later. Stellarium just plain opened (default settings, night sky right now): trunk: 59-60FPS (VSync) refactored-GL2: 59-60FPS (VSync) refactored-GL1: 59-60FPS (VSync) Stellarium opened, disabled atmosphere/ground, zoomed out max, pulsars enabled at default settings (lots of rectangles) trunk: 59-60FPS (VSync) refactored-GL2: 45-55FPS refactored-GL1: 59-60FPS (VSync) Looking at Saturn(FOV ~0.01 deg) trunk: 3-4FPS (WTF? this didn't happen before - yes, this is trunk, not my code. No debug spam either) refactored-GL2: 27-29FPS refactored-GL1: 26-29FPS Also, is there some shader warning spamming terminal output? That might decrease FPS quite a bit. I'll try my integrated Intel GPU (HD2000) later, and maybe old GeForce (~5years, don't remember which) On 8/30/12, No Idea