Merge branch 'feature/hybrid-renderer' into feature/galaxy

This commit is contained in:
Emil Axelsson
2016-05-19 15:25:10 +02:00
6 changed files with 137 additions and 20 deletions
@@ -110,6 +110,9 @@ private:
ghoul::Dictionary _resolveDictionary;
GLuint _mainColorTexture;
GLuint _mainDepthTexture;
GLuint _mainFramebuffer;
GLuint _screenQuad;
GLuint _anchorPointerTexture;
GLuint _anchorPointerTextureInitializer;