diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-04-14 13:29:07 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-04-14 13:29:07 -0700 |
commit | d49fa48f45c8c95df34d32567b783a3cbb5c6469 (patch) | |
tree | bc57ffa4a71230e49f6d9c642ebfed3d22870103 /src | |
parent | 2886822f485a5a9fd2b7aaa8a3812c837edd4bf3 (diff) |
improve texture binding in immediate mode emulation
Diffstat (limited to 'src')
-rw-r--r-- | src/library_gl.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/library_gl.js b/src/library_gl.js index f4d89fee..4fb8a481 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -1029,11 +1029,10 @@ var LibraryGL = { Module.ctx.enableVertexAttribArray(this.positionLocation); Module.ctx.enableVertexAttribArray(this.texCoordLocation); - Module.ctx.activeTexture(Module.ctx.TEXTURE0); // Assume the texture is bound - //this.textureId = Module.ctx.getParameter(Module.ctx.TEXTURE_BINDING_2D); - //Module.ctx.bindTexture(Module.ctx.TEXTURE_2D, this.textureId); - + this.textureId = Module.ctx.getParameter(Module.ctx.TEXTURE_BINDING_2D); + Module.ctx.activeTexture(Module.ctx.TEXTURE0); + Module.ctx.bindTexture(Module.ctx.TEXTURE_2D, this.textureId); Module.ctx.uniform1i(this.textureLocation, 0); Module.ctx.uniformMatrix4fv(this.modelViewLocation, 0 /* GL_FALSE */, GL.immediate.matrix["m"]); |