Skip to content
Snippets Groups Projects
Commit 9562ecb0 authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@742 51575b47-30f0-44d4-a5cc-537603b46e54
parent 5d3e98ca
No related branches found
No related tags found
No related merge requests found
......@@ -159,7 +159,9 @@ static int program_set_uniform_number(lua_State *L)
const char *var = luaL_checkstring(L, 2);
GLfloat i = luaL_checknumber(L, 3);
CHECKGL(glUseProgramObjectARB(p));
CHECKGL(glUniform1fvARB(glGetUniformLocationARB(p, var), 1, &i));
CHECKGL(glUseProgramObjectARB(0));
return 0;
}
......@@ -171,10 +173,12 @@ static int program_set_uniform_texture(lua_State *L)
bool is3d = lua_toboolean(L, 4);
GLint i = 1;
CHECKGL(glUseProgramObjectARB(p));
CHECKGL(glActiveTexture(GL_TEXTURE1));
CHECKGL(glBindTexture(is3d ? GL_TEXTURE_3D : GL_TEXTURE_2D, *t));
CHECKGL(glUniform1ivARB(glGetUniformLocationARB(p, var), 1, &i));
CHECKGL(glActiveTexture(GL_TEXTURE0));
CHECKGL(glUseProgramObjectARB(0));
return 0;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment