From 51ba9cb2a6b0b9395a2912eadeb954c95e4c1d3c Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 20 May 2018 23:37:11 +0800 Subject: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/render/jsl.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/libjin/render/jsl.h') diff --git a/src/libjin/render/jsl.h b/src/libjin/render/jsl.h index 35479d3..fc1aa48 100644 --- a/src/libjin/render/jsl.h +++ b/src/libjin/render/jsl.h @@ -24,14 +24,12 @@ namespace render { glUseProgram(pid); currentJSLProgram = this; - currentTextureUnit = 0; } static inline void JSLProgram::unuse() { glUseProgram(0); currentJSLProgram = nullptr; - currentTextureUnit = 0; } void sendFloat(const char* name, float number); @@ -49,14 +47,13 @@ namespace render private: + static JSLProgram* currentJSLProgram; + GLuint pid; std::map texturePool; - static JSLProgram* currentJSLProgram; - static GLint currentTextureUnit; - static GLint maxTextureUnits; - + GLint currentTextureUnit; GLint getTextureUnit(const std::string& name); inline void initialize(const char* program); -- cgit v1.1-26-g67d0