diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-07-23 16:51:50 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-07-23 16:51:50 -0700 |
| commit | 233270d3b55cea3aa0c89f134c88d3bb07530e56 (patch) | |
| tree | 38f12f50c3e761015b29b4fc759171d68da1f411 /src | |
| parent | fe6cf455e3169606442042579c521a1c30b42ad2 (diff) | |
| parent | 8989e1205f8fb2128a2fa141a32d1ac245791e07 (diff) | |
Merge branch 'master' of github.com:ToadKing/emscripten into incoming
Diffstat (limited to 'src')
| -rw-r--r-- | src/library_gl.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/library_gl.js b/src/library_gl.js index 959773bc..ee3f8581 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -1076,7 +1076,9 @@ var LibraryGL = { } {{{ makeSetValue('count', '0', 'len', 'i32') }}}; for (var i = 0; i < len; ++i) { - {{{ makeSetValue('shaders', 'i*4', 'GL.shaders[result[i]]', 'i32') }}}; + var id = GL.shaders.indexOf(result[i]); + assert(id !== -1, 'shader not bound to local id'); + {{{ makeSetValue('shaders', 'i*4', 'id', 'i32') }}}; } }, |