summaryrefslogtreecommitdiff
path: root/source/modules/asura-core/graphics/shader.h
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-06-09 21:12:25 +0800
committerchai <chaifix@163.com>2019-06-09 21:12:25 +0800
commit8ee3f7453bf7b0db5c7358e697e91714d825c87d (patch)
tree57283565219d1808b47bbd4a883a5a52b6eb7bae /source/modules/asura-core/graphics/shader.h
parentd7a972a0f16da0fd7bf4c0b70913920216ff3113 (diff)
*misc
Diffstat (limited to 'source/modules/asura-core/graphics/shader.h')
-rw-r--r--source/modules/asura-core/graphics/shader.h25
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;
}