From f9e45fae6b4c1b846f7534e6692a0495d3b2f60d Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 5 Dec 2018 17:09:21 +0800
Subject: *gl

---
 src/libjin/graphics/shaders/je_shader.cpp | 18 ++++++------------
 src/libjin/graphics/shaders/je_shader.h   | 10 +---------
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'src/libjin/graphics/shaders')

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);
diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h
index bb7bee0..2f53ab0 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/je_shader.h
@@ -39,20 +39,12 @@ namespace JinEngine
                 /// 
                 static Shader* createShader(const std::string& source);
 
-                /// 
-                /// Unuse current shader.
-                ///
-                static void unuse();
-
                 /// 
                 /// Destructor of shader.
                 /// 
                 virtual ~Shader();
 
-                /// 
-                /// Use specific shader.
-                /// 
-                void use();
+                void setDefaultUniform();
 
                 /// 
                 /// Send float value to shader.
-- 
cgit v1.1-26-g67d0