From 63d4e2f436b4c0eb420967ea13bcd16de6e1ea84 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 21 Jan 2019 21:07:00 +0800 Subject: *misc --- src/libjin/graphics/shaders/shader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libjin/graphics/shaders/shader.cpp') diff --git a/src/libjin/graphics/shaders/shader.cpp b/src/libjin/graphics/shaders/shader.cpp index dce795d..36f6603 100644 --- a/src/libjin/graphics/shaders/shader.cpp +++ b/src/libjin/graphics/shaders/shader.cpp @@ -218,8 +218,8 @@ namespace JinEngine return *this; } gl.activeTextureUnit(unit); - glUniform1i(location, unit); gl.bindTexture2D(tex->getGLTexture()); + glUniform1i(location, unit); gl.activeTextureUnit(MAIN_TEXTURE_UNIT); return *this; } @@ -236,9 +236,9 @@ namespace JinEngine // TODO: 异常处理,绑定的纹理超过最大限制 return *this; } - glUniform1i(location, unit); glActiveTexture(GL_TEXTURE0 + unit); gl.bindTexture2D(canvas->getGLTexture()); + glUniform1i(location, unit); glActiveTexture(GL_TEXTURE0); return *this; -- cgit v1.1-26-g67d0