From 63d4e2f436b4c0eb420967ea13bcd16de6e1ea84 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 21 Jan 2019 21:07:00 +0800 Subject: *misc --- bin/SDL2.dll | Bin 771072 -> 771072 bytes bin/cembed.exe | Bin 11264 -> 11264 bytes bin/jin.exe | Bin 317440 -> 337408 bytes bin/lua51.dll | Bin 364544 -> 364544 bytes src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib | Bin 33996 -> 33996 bytes src/3rdparty/LuaJIT-2.0.5/src/minilua.lib | Bin 33996 -> 33996 bytes src/libjin/graphics/shaders/shader.cpp | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/SDL2.dll b/bin/SDL2.dll index 6202063..368dda7 100644 Binary files a/bin/SDL2.dll and b/bin/SDL2.dll differ diff --git a/bin/cembed.exe b/bin/cembed.exe index d9d3a6c..b82dcd8 100644 Binary files a/bin/cembed.exe and b/bin/cembed.exe differ diff --git a/bin/jin.exe b/bin/jin.exe index 64620b8..6db248b 100644 Binary files a/bin/jin.exe and b/bin/jin.exe differ diff --git a/bin/lua51.dll b/bin/lua51.dll index 58b7cdd..5084f27 100644 Binary files a/bin/lua51.dll and b/bin/lua51.dll differ diff --git a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib index d4372fd..c7be727 100644 Binary files a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib and b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib differ diff --git a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib index a3cce18..e2b3ac3 100644 Binary files a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib and b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib differ 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