4b0688fd77
Pure refactoring. Preparing for adding GL-renderer. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>