aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics/shaders/je_shader.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-05 17:09:21 +0800
committerchai <chaifix@163.com>2018-12-05 17:09:21 +0800
commitf9e45fae6b4c1b846f7534e6692a0495d3b2f60d (patch)
tree9a59d87b24fb12f9cd249deb4beae21299ea0edf /src/libjin/graphics/shaders/je_shader.cpp
parentd14d3de517e3bea5470ba42a4d1646cca77c2d25 (diff)
*gl
Diffstat (limited to 'src/libjin/graphics/shaders/je_shader.cpp')
-rw-r--r--src/libjin/graphics/shaders/je_shader.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/je_shader.cpp
index b78c71c..f33adaf 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/je_shader.cpp
@@ -78,11 +78,16 @@ namespace JinEngine
Shader::~Shader()
{
if (gl.getShader() == this)
- unuse();
+ gl.unuseShader();
// delete shader program
glDeleteShader(mPID);
}
+ void Shader::setDefaultUniform()
+ {
+ sendInt(SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT);
+ }
+
bool Shader::compile(const string& program)
{
string vertex_shader, fragment_shader;
@@ -127,17 +132,6 @@ if (success == GL_FALSE) \
return maxTextureUnits;
}
- void Shader::use()
- {
- glUseProgram(mPID);
- sendInt(SHADER_MAIN_TEXTURE, DEFAULT_TEXTURE_UNIT);
- }
-
- void Shader::unuse()
- {
- glUseProgram(0);
- }
-
GLint Shader::claimTextureUnit(const std::string& name)
{
std::map<std::string, GLint>::iterator unit = mTextureUnits.find(name);