aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics/shaders
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-06 13:12:29 +0800
committerchai <chaifix@163.com>2018-12-06 13:12:29 +0800
commitb3712ebdf148bd8d2d31e70734a4b7923f6038f8 (patch)
treec813d158030ee33b76d7ec23fa2deaa1eb0a4e36 /src/libjin/graphics/shaders
parent17d86218e25a6c889c24822da8d7b59967babd89 (diff)
*remove create function
Diffstat (limited to 'src/libjin/graphics/shaders')
-rw-r--r--src/libjin/graphics/shaders/je_shader.cpp4
-rw-r--r--src/libjin/graphics/shaders/je_shader.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp
index f33adaf..017231a 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/je_shader.cpp
@@ -53,7 +53,7 @@ namespace JinEngine
// texture unit 0, and did not just forget to set the value.
//
const int DEFAULT_TEXTURE_UNIT = 0;
-
+/*
Shader* Shader::createShader(const string& program)
{
Shader* shader = nullptr;
@@ -67,7 +67,7 @@ namespace JinEngine
}
return shader;
}
-
+*/
Shader::Shader(const string& program)
: mCurrentTextureUnit(DEFAULT_TEXTURE_UNIT)
{
diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h
index 2f53ab0..a30413c 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/je_shader.h
@@ -37,7 +37,12 @@ namespace JinEngine
///
/// @param source The shader source code.
///
- static Shader* createShader(const std::string& source);
+ //static Shader* createShader(const std::string& source);
+
+ ///
+ /// Shader constructor.
+ ///
+ Shader(const std::string& program);
///
/// Destructor of shader.
@@ -156,11 +161,6 @@ namespace JinEngine
GLint claimTextureUnit(const std::string& name);
///
- /// Shader constructor.
- ///
- Shader(const std::string& program);
-
- ///
/// Compile JSL program into GLSL source.
///
/// @param program JSL source code.