Merge pull request #522 from sephiroth99/lf3

Linux compilation/link and compatibility fixes
This commit is contained in:
Ben Vanik
2016-01-20 19:41:40 -08:00
11 changed files with 62 additions and 42 deletions

View File

@@ -29,7 +29,7 @@ class GL4Shader : public Shader {
GLuint shader() const { return shader_; }
GLuint vao() const { return vao_; }
bool Prepare();
bool Prepare() override;
protected:
bool PrepareVertexArrayObject();