Merge remote-tracking branch 'origin/Render_Optimization' into RendererBugFixes

2016-03-08 16:20:23 +01:00
parent 155d700a44 b1a59e0ed2
commit d51bea798a
4 changed files with 49 additions and 17 deletions
@@ -21,6 +21,8 @@ public:
 	std::string GetFileName() const;
 	GLuint GetHandle() const;
 	bool IsCompiled() const;
+    static std::string ReadFile(std::string fileName);
+private:
 protected:
 	GLenum m_ShaderType;
 	std::string m_FileName;