diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-02-14 22:13:59 +0100 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-02-14 22:13:59 +0100 |
commit | 275900d217b354a92b97e645ea6de566b58c3476 (patch) | |
tree | 9b0259dc8307c9704d9629fab2d6b80de3f57bcd | |
parent | 1f5518bf0f4afcfbc54772247776879ea956f913 (diff) |
fix and test glIsProgram
-rw-r--r-- | src/library_gl.js | 8 | ||||
-rw-r--r-- | tests/gl_ps.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/library_gl.js b/src/library_gl.js index 964f3f40..8f692dbf 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -908,11 +908,9 @@ var LibraryGL = { }, glIsProgram: function(program) { - var fb = GL.programs[program]; - if (typeof(fb) == 'undefined') { - return 0; - } - return Module.ctx.isProgram(fb); + var program = GL.programs[program]; + if (!program) return 0; + return Module.ctx.isProgram(program); }, glBindAttribLocation__sig: 'viii', diff --git a/tests/gl_ps.c b/tests/gl_ps.c index 81579c1d..a8a6807f 100644 --- a/tests/gl_ps.c +++ b/tests/gl_ps.c @@ -78,6 +78,8 @@ void shaders() { glLinkProgram(program); glGetProgramiv(program, GL_LINK_STATUS, &ok); assert(ok); + assert(glIsProgram(program)); + assert(!glIsProgram(-1)); glUseProgram(program); |