diff options
Diffstat (limited to 'source/modules/asura-core/graphics/shader.h')
-rw-r--r-- | source/modules/asura-core/graphics/shader.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/source/modules/asura-core/graphics/shader.h b/source/modules/asura-core/graphics/shader.h index f4553ec..61aa6f1 100644 --- a/source/modules/asura-core/graphics/shader.h +++ b/source/modules/asura-core/graphics/shader.h @@ -71,7 +71,17 @@ namespace AsuraEngine private: - //----------------------------------------------------------------------------// + bool CompileVertexShader(const std::string& vert, std::string& outError); + bool CompileFragementShader(const std::string& frag, std::string& outError); + + std::string GetProgramWarnings(); + std::string GetShaderWarnings(GLuint shader); + + GLuint mProgram; + GLuint mVertShader; + GLuint mFragShader; + + luaxport: LUAX_DECL_FACTORY(Shader); @@ -93,20 +103,9 @@ namespace AsuraEngine LUAX_DECL_METHOD(_SetBuiltInUniforms); - //----------------------------------------------------------------------------// - - bool CompileVertexShader(const std::string& vert, std::string& outError); - bool CompileFragementShader(const std::string& frag, std::string& outError); - - std::string GetProgramWarnings(); - std::string GetShaderWarnings(GLuint shader); - - GLuint mProgram; - GLuint mVertShader; - GLuint mFragShader; - }; + // ڱһGPU typedef Shader GpuProgram; } |