Permalink
Browse files

Merge branch 'master' of github.com:tmpvar/WebGL-standalone

  • Loading branch information...
2 parents f6d78db + a3a4432 commit d8c6c65a4f7ac6c6a74aca521484775264ad41da @tmpvar committed Aug 25, 2011
Showing with 5 additions and 2 deletions.
  1. +3 −0 example/triangle.js
  2. +2 −2 src/js/spidermonkey.cc
View
@@ -109,3 +109,6 @@ while(a--) {
e('draw arrays', gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4));
e('flush', gl.flush());
}
+
+
+console.log(gl.notImplemented + '/' + gl.totalMethods + " (" + Math.floor(((gl.totalMethods - gl.notImplemented)/gl.totalMethods)*100) + "%)");
View
@@ -410,8 +410,8 @@ JSBool webgl_rendering_context_enableVertexAttribArray(JSContext *cx, uintN argc
}
JSBool webgl_rendering_context_finish(JSContext *cx, uintN argc, jsval *argv) {
- JS_ReportError(cx, "method not implemented");
- return JS_FALSE;
+ glFinish();
+ return JS_TRUE;
}
JSBool webgl_rendering_context_flush(JSContext *cx, uintN argc, jsval *argv) {

0 comments on commit d8c6c65

Please sign in to comment.