fixes to uniforms

This commit is contained in:
aap
2021-03-02 17:23:39 +01:00
parent 0102f88367
commit 427b67c14c
4 changed files with 16 additions and 5 deletions
+7 -2
View File
@@ -481,8 +481,10 @@ uint32
bindTexture(uint32 texid)
{
uint32 prev = boundTexture[activeTexture];
boundTexture[activeTexture] = texid;
glBindTexture(GL_TEXTURE_2D, texid);
if(prev != texid){
boundTexture[activeTexture] = texid;
glBindTexture(GL_TEXTURE_2D, texid);
}
return prev;
}
@@ -1781,6 +1783,9 @@ initOpenGL(void)
u_matColor = registerUniform("u_matColor", UNIFORM_VEC4);
u_surfProps = registerUniform("u_surfProps", UNIFORM_VEC4);
// for im2d
registerUniform("u_xform", UNIFORM_VEC4);
glClearColor(0.25, 0.25, 0.25, 1.0);
byte whitepixel[4] = {0xFF, 0xFF, 0xFF, 0xFF};