From 3222d2665183cecc1b1d47e7b7472da698406ddb Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 2 Jan 2019 00:11:22 +0800 Subject: *misc --- src/libjin/graphics/shaders/je_shader.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/libjin/graphics/shaders/je_shader.h') diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/je_shader.h index a279a79..c3ca721 100644 --- a/src/libjin/graphics/shaders/je_shader.h +++ b/src/libjin/graphics/shaders/je_shader.h @@ -169,7 +169,9 @@ namespace JinEngine /// @param name Name of the texture uniform variable. /// @return Texture unit which texture variable be assigned. /// - GLint claimTextureUnit(const std::string& name); + GLint claimTextureUnit(/*const std::string& name*/); + + GLint getUniformLocation(const char* uniforms); /// /// Compile JSL program into GLSL source. @@ -179,10 +181,14 @@ namespace JinEngine /// bool compile(const std::string& program); + static GLint mTextureUnit; + static GLint mAttributeIndex; + GLuint mPID; - GLint mCurrentTextureUnit; - std::map mTextureUnits; - GLint mAttributeIndex; + //GLint mCurrentTextureUnit; + //std::map mTextureUnits; + + std::map mUniformsLocation; }; -- cgit v1.1-26-g67d0