aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Graphics/Shader/je_shader.cpp
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-10-24 22:08:46 +0800
committerchai <chaifix@163.com>2018-10-24 22:08:46 +0800
commitd8d7963b9b658799b806d516bbd6b44c4baa28f8 (patch)
tree4a8c7c247e5c429a4ee50baf3b5be2032575aab6 /src/libjin/Graphics/Shader/je_shader.cpp
parente98acfb0d497e9c4560554cba73eb5c313ea034a (diff)
+粒子系统测试
Diffstat (limited to 'src/libjin/Graphics/Shader/je_shader.cpp')
-rw-r--r--src/libjin/Graphics/Shader/je_shader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libjin/Graphics/Shader/je_shader.cpp b/src/libjin/Graphics/Shader/je_shader.cpp
index b0e7506..e6f82a4 100644
--- a/src/libjin/Graphics/Shader/je_shader.cpp
+++ b/src/libjin/Graphics/Shader/je_shader.cpp
@@ -196,7 +196,7 @@ if (success == GL_FALSE) \
}
gl.activeTexUnit(unit);
glUniform1i(location, unit);
- gl.bindTexture(tex->getTexture());
+ gl.bindTexture(tex->getGLTexture());
gl.activeTexUnit(0);
}
@@ -214,7 +214,7 @@ if (success == GL_FALSE) \
}
glUniform1i(location, unit);
glActiveTexture(GL_TEXTURE0 + unit);
- gl.bindTexture(canvas->getTexture());
+ gl.bindTexture(canvas->getGLTexture());
glActiveTexture(GL_TEXTURE0);
}