From 8ee3f7453bf7b0db5c7358e697e91714d825c87d Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 9 Jun 2019 21:12:25 +0800 Subject: *misc --- source/modules/asura-core/graphics/shader.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'source/modules/asura-core/graphics/shader.h') 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; } -- cgit v1.1-26-g67d0