aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/graphics/shaders/shader.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-21 21:07:00 +0800
committerchai <chaifix@163.com>2019-01-21 21:07:00 +0800
commit63d4e2f436b4c0eb420967ea13bcd16de6e1ea84 (patch)
tree8c394be88695a173e51c3d262908a2eded67c7dc /src/libjin/graphics/shaders/shader.cpp
parent63547185567a4bc9c66ad2420134e2dc4a1a58ba (diff)
*misc
Diffstat (limited to 'src/libjin/graphics/shaders/shader.cpp')
-rw-r--r--src/libjin/graphics/shaders/shader.cpp4
1 files changed, 2 insertions, 2 deletions
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;