From bbecfee3b69fd2d2015305f3d04c02f87d4924b0 Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 2 Sep 2018 10:37:13 +0800 Subject: *update --- src/libjin/Graphics/JSL.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/libjin/Graphics/JSL.h') diff --git a/src/libjin/Graphics/JSL.h b/src/libjin/Graphics/JSL.h index b9198fb..a99a4c7 100644 --- a/src/libjin/Graphics/JSL.h +++ b/src/libjin/Graphics/JSL.h @@ -17,11 +17,9 @@ namespace graphics class JSLProgram { - public: - static JSLProgram* createJSLProgram(const char* program); - + static inline JSLProgram* getCurrentJSL() { return currentJSLProgram; } virtual ~JSLProgram(); inline void use() @@ -29,7 +27,6 @@ namespace graphics glUseProgram(pid); currentJSLProgram = this; } - static inline void unuse() { glUseProgram(0); @@ -44,27 +41,15 @@ namespace graphics void sendCanvas(const char* name, const Canvas* canvas); void sendColor(const char* name, const color* col); - static inline JSLProgram* getCurrentJSL() - { - return currentJSLProgram; - } - protected: - - JSLProgram(const char* program); - static JSLProgram* currentJSLProgram; + JSLProgram(const char* program); GLuint pid; - std::map texturePool; - GLint currentTextureUnit; GLint getTextureUnit(const std::string& name); - inline void initialize(const char* program); - inline void destroy(); - }; } // graphics -- cgit v1.1-26-g67d0