Fix the dependency information in library_gl

1 files changed, 81 insertions, 33 deletions

diff --git a/src/library_gl.js b/src/library_gl.js
index 84062edb..247f5cb7 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -73,7 +73,7 @@ var LibraryGL = {
     }
   },
 
-  glGenIntegerv__deps: ['$GL'],
+  glGetIntegerv__deps: ['$GL'],
   glGetIntegerv: function(name_, p) {
     var result = Module.ctx.getParameter(name_);
     switch (typeof(result)) {
@@ -116,6 +116,7 @@ var LibraryGL = {
     }
   },
 
+  glGetFloatv__deps: ['$GL'],
   glGetFloatv: function(name_, p) {
     var result = Module.ctx.getParameter(name_);
     switch (typeof(result)) {
@@ -158,6 +159,7 @@ var LibraryGL = {
     }
   },
 
+  glGetBooleanv__deps: ['$GL'],
   glGetBooleanv: function(name_, p) {
     var result = Module.ctx.getParameter(name_);
     switch (typeof(result)) {
@@ -204,6 +206,7 @@ var LibraryGL = {
     }
   },
 
+  glDeleteTextures__deps: ['$GL'],
   glDeleteTextures: function(n, textures) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('textures', 'i*4', 'i32') }}};
@@ -320,7 +323,7 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'Module.getTexParameter(target, pname)', 'i32') }}};
   },
 
-  glIsTexture_deps: ['$GL'],
+  glIsTexture__deps: ['$GL'],
   glIsTexture: function(texture) {
     var fb = GL.hashtable("texture").get(texture);
     if (typeof(fb) == 'undefined') {
@@ -337,6 +340,7 @@ var LibraryGL = {
     }
   },
 
+  glDeleteBuffers__deps: ['$GL'],
   glDeleteBuffers: function(n, buffers) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('buffers', 'i*4', 'i32') }}};
@@ -355,7 +359,7 @@ var LibraryGL = {
     Module.ctx.bufferSubData(target, offset, floatArray);
   },
 
-  glIsBuffer_deps: ['$GL'],
+  glIsBuffer__deps: ['$GL'],
   glIsBuffer: function(buffer) {
     var fb = GL.hashtable("buffer").get(buffer);
     if (typeof(fb) == 'undefined') {
@@ -372,6 +376,7 @@ var LibraryGL = {
     }
   },
 
+  glDeleteRenderbuffers__deps: ['$GL'],
   glDeleteRenderbuffers: function(n, renderbuffers) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('renderbuffers', 'i*4', 'i32') }}};
@@ -380,6 +385,7 @@ var LibraryGL = {
     }
   },
 
+  glBindRenderbuffer__deps: ['$GL'],
   glBindRenderbuffer: function(target, renderbuffer) {
     Module.ctx.bindRenderbuffer(target, GL.hashtable("renderbuffer").get(renderbuffer));
   },
@@ -388,7 +394,7 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'Module.ctx.getRenderbufferParameter(target, pname)', 'i32') }}};
   },
 
-  glIsRenderbuffer_deps: ['$GL'],
+  glIsRenderbuffer__deps: ['$GL'],
   glIsRenderbuffer: function(renderbuffer) {
     var fb = GL.hashtable("renderbuffer").get(renderbuffer);
     if (typeof(fb) == 'undefined') {
@@ -397,59 +403,69 @@ var LibraryGL = {
     return Module.ctx.isRenderbuffer(fb);
   },
 
-  glGetUniformLocation_deps: ['$GL'],
+  glGetUniformLocation__deps: ['$GL'],
   glGetUniformLocation: function(program, name) {
     name = Pointer_stringify(name);
     return GL.hashtable("uniform").add(
              Module.ctx.getUniformLocation(GL.hashtable("program").get(program), name));
   },
 
+  glUniform1f__deps: ['$GL'],
   glUniform1f: function(Location, v0) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform1f(Location, v0);
   },
 
+  glUniform2f__deps: ['$GL'],
   glUniform2f: function(Location, v0, v1) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform2f(Location, v0, v1);
   },
 
+  glUniform3f__deps: ['$GL'],
   glUniform3f: function(Location, v0, v1, v2) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform3f(Location, v0, v1, v2);
   },
 
+  glUniform4f__deps: ['$GL'],
   glUniform4f: function(Location, v0, v1, v2, v3) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform4f(Location, v0, v1, v2, v3);
   },
 
+  glUniform1i__deps: ['$GL'],
   glUniform1i: function(Location, v0) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform1i(Location, v0);
   },
 
+  glUniform2i__deps: ['$GL'],
   glUniform2i: function(Location, v0, v1) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform2i(Location, v0, v1);
   },
 
+  glUniform3i__deps: ['$GL'],
   glUniform3i: function(Location, v0, v1, v2) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform3i(Location, v0, v1, v2);
   },
 
+  glUniform4i__deps: ['$GL'],
   glUniform4i: function(Location, v0, v1, v2, v3) {
     Location = GL.hashtable("uniform").get(Location);
     Module.ctx.uniform4i(Location, v0, v1, v2, v3);
   },
 
+  glUniform1fv__deps: ['$GL'],
   glUniform1fv: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     value = new Float32Array(TypedArray_copy(value, count*4)); // TODO: optimize
     Module.ctx.uniform1fv(Location, value);
   },
 
+  glUniform2fv__deps: ['$GL'],
   glUniform2fv: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 2;
@@ -457,6 +473,7 @@ var LibraryGL = {
     Module.ctx.uniform2fv(Location, value);
   },
 
+  glUniform3fv__deps: ['$GL'],
   glUniform3fv: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 3;
@@ -464,6 +481,7 @@ var LibraryGL = {
     Module.ctx.uniform3fv(Location, value);
   },
 
+  glUniform4fv__deps: ['$GL'],
   glUniform4fv: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 4;
@@ -471,12 +489,14 @@ var LibraryGL = {
     Module.ctx.uniform4fv(Location, value);
   },
 
+  glUniform1fi__deps: ['$GL'],
   glUniform1fi: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     value = new Uint32Array(TypedArray_copy(value, count*4)); // TODO: optimize
     Module.ctx.uniform1fi(Location, value);
   },
 
+  glUniform2fi__deps: ['$GL'],
   glUniform2fi: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 2;
@@ -484,6 +504,7 @@ var LibraryGL = {
     Module.ctx.uniform2fi(Location, value);
   },
 
+  glUniform3fi__deps: ['$GL'],
   glUniform3fi: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 3;
@@ -491,6 +512,7 @@ var LibraryGL = {
     Module.ctx.uniform3fi(Location, value);
   },
 
+  glUniform4fi__deps: ['$GL'],
   glUniform4fi: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 4;
@@ -498,6 +520,7 @@ var LibraryGL = {
     Module.ctx.uniform4fi(Location, value);
   },
 
+  glUniformMatrix2fv__deps: ['$GL'],
   glUniformMatrix2fv: function(Location, count, transpose, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 4;
@@ -505,6 +528,7 @@ var LibraryGL = {
     Module.ctx.uniformMatrix2fv(Location, transpose, value);
   },
 
+  glUniformMatrix3fv__deps: ['$GL'],
   glUniformMatrix3fv: function(Location, count, transpose, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 9;
@@ -512,6 +536,7 @@ var LibraryGL = {
     Module.ctx.uniformMatrix3fv(Location, transpose, value);
   },
 
+  glUniformMatrix4fv__deps: ['$GL'],
   glUniformMatrix4fv: function(Location, count, transpose, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 16;
@@ -519,6 +544,7 @@ var LibraryGL = {
     Module.ctx.uniformMatrix4fv(Location, transpose, value);
   },
 
+  glBindBuffer__deps: ['$GL'],
   glBindBuffer: function(target, buffer) {
     Module.ctx.bindBuffer(target, GL.hashtable("buffer").get(buffer));
   },
@@ -543,28 +569,31 @@ var LibraryGL = {
     Module.ctx.vertexAttrib4fv(index, v);
   },
 
+  glGetAttribLocation__deps: ['$GL'],
   glGetAttribLocation: function(program, name) {
     program = GL.hashtable("program").get(program);
     name = Pointer_stringify(name);
     Module.ctx.getAttribLocation(program, name);
   },
 
-  glCreateShader_deps: ['$GL'],
+  glCreateShader__deps: ['$GL'],
   glCreateShader: function(shaderType) {
     var shader = Module.ctx.createShader(shaderType);
     return GL.hashtable("shader").add(shader);
   },
 
-  glDeleteShader_deps: ['$GL'],
+  glDeleteShader__deps: ['$GL'],
   glDeleteShader: function(shader) {
     Module.ctx.deleteShader(GL.hashtable("shader").get(shader));
   },
 
+  glDetachShader__deps: ['$GL'],
   glDetachShader: function(program, shader) {
     Module.ctx.detachShader(GL.hashtable("program").get(program),
                             GL.hashtable("shader").get(shader));
   },
 
+  glGetAttachedShaders__deps: ['$GL'],
   glGetAttachedShaders: function(program, maxCount, count, shaders) {
     var result = Module.ctx.getAttachedShaders(GL.hashtable("program").get(program));
     var len = result.length;
@@ -577,7 +606,7 @@ var LibraryGL = {
     }
   },
 
-  glShaderSource_deps: ['$GL'],
+  glShaderSource__deps: ['$GL'],
   glShaderSource: function(shader, count, string, length) {
     var source = "";
     for (var i = 0; i < count; ++i) {
@@ -597,6 +626,7 @@ var LibraryGL = {
     Module.ctx.shaderSource(GL.hashtable("shader").get(shader), source);
   },
 
+  glGetShaderSource__deps: ['$GL'],
   glGetShaderSource: function(shader, bufsize, length, source) {
     var result = Module.ctx.getShaderSource(GL.hashtable("shader").get(shader));
     result.slice(0, bufsize - 1);
@@ -606,12 +636,12 @@ var LibraryGL = {
     }
   },
 
-  glCompileShader_deps: ['$GL'],
+  glCompileShader__deps: ['$GL'],
   glCompileShader: function(shader) {
     Module.ctx.compileShader(GL.hashtable("shader").get(shader));
   },
 
-  glGetShaderInfoLog_deps: ['$GL'],
+  glGetShaderInfoLog__deps: ['$GL'],
   glGetShaderInfoLog: function(shader, maxLength, length, infoLog) {
     var log = Module.ctx.getShaderInfoLog(GL.hashtable("shader").get(shader));
     log.slice(0, maxLength - 1);
@@ -621,17 +651,17 @@ var LibraryGL = {
     }
   },
 
-  glGetShaderiv_deps: ['$GL'],
+  glGetShaderiv__deps: ['$GL'],
   glGetShaderiv : function(shader, pname, p) {
     {{{ makeSetValue('p', '0', 'Module.ctx.getShaderParameter(GL.hashtable("shader").get(shader), pname)', 'i32') }}};
   },
 
-  glGetProgramiv_deps: ['$GL'],
+  glGetProgramiv__deps: ['$GL'],
   glGetProgramiv : function(program, pname, p) {
     {{{ makeSetValue('p', '0', 'Module.ctx.getProgramParameter(GL.hashtable("program").get(program), pname)', 'i32') }}};
   },
 
-  glIsShader_deps: ['$GL'],
+  glIsShader__deps: ['$GL'],
   glIsShader: function(shader) {
     var fb = GL.hashtable("shader").get(shader);
     if (typeof(fb) == 'undefined') {
@@ -640,17 +670,17 @@ var LibraryGL = {
     return Module.ctx.isShader(fb);
   },
 
-  glCreateProgram_deps: ['$GL'],
+  glCreateProgram__deps: ['$GL'],
   glCreateProgram: function() {
     return GL.hashtable("program").add(Module.ctx.createProgram());
   },
 
-  glDeleteProgram_deps: ['$GL'],
+  glDeleteProgram__deps: ['$GL'],
   glDeleteProgram: function(program) {
     Module.ctx.deleteProgram(GL.hashtable("program").get(program));
   },
 
-  glAttachShader_deps: ['$GL'],
+  glAttachShader__deps: ['$GL'],
   glAttachShader: function(program, shader) {
     Module.ctx.attachShader(GL.hashtable("program").get(program),
                             GL.hashtable("shader").get(shader));
@@ -663,12 +693,12 @@ var LibraryGL = {
     {{{ makeSetValue('precision', '0', 'result.precision', 'i32') }}};
   },
 
-  glLinkProgram_deps: ['$GL'],
+  glLinkProgram__deps: ['$GL'],
   glLinkProgram: function(program) {
     Module.ctx.linkProgram(GL.hashtable("program").get(program));
   },
 
-  glGetProgramInfoLog_deps: ['$GL'],
+  glGetProgramInfoLog__deps: ['$GL'],
   glGetProgramInfoLog: function(program, maxLength, length, infoLog) {
     var log = Module.ctx.getProgramInfoLog(GL.hashtable("program").get(program));
     // Work around a bug in Chromium which causes getProgramInfoLog to return null
@@ -682,17 +712,17 @@ var LibraryGL = {
     }
   },
 
-  glUseProgram_deps: ['$Gl'],
+  glUseProgram__deps: ['$Gl'],
   glUseProgram: function(program) {
     Module.ctx.useProgram(GL.hashtable("program").get(program));
   },
 
-  glValidateProgram_deps: ['$Gl'],
+  glValidateProgram__deps: ['$Gl'],
   glValidateProgram: function(program) {
     Module.ctx.validateProgram(GL.hashtable("program").get(program));
   },
 
-  glIsProgram_deps: ['$GL'],
+  glIsProgram__deps: ['$GL'],
   glIsProgram: function(program) {
     var fb = GL.hashtable("program").get(program);
     if (typeof(fb) == 'undefined') {
@@ -701,18 +731,18 @@ var LibraryGL = {
     return Module.ctx.isProgram(fb);
   },
 
-  glBindAttribLocation_deps: ['$GL'],
+  glBindAttribLocation__deps: ['$GL'],
   glBindAttribLocation: function(program, index, name) {
     name = Pointer_stringify(name);
     Module.ctx.bindAttribLocation(GL.hashtable("program").get(program), index, name);
   },
 
-  glBindFramebuffer_deps: ['$GL'],
+  glBindFramebuffer__deps: ['$GL'],
   glBindFramebuffer: function(target, framebuffer) {
     Module.ctx.bindFramebuffer(target, GL.hashtable("framebuffer").get(framebuffer));
   },
 
-  glGenFramebuffers_deps: ['$GL'],
+  glGenFramebuffers__deps: ['$GL'],
   glGenFramebuffers: function(n, ids) {
     for (var i = 0; i < n; ++i) {
       var fb = GL.hashtable("framebuffer").add(Module.ctx.createFramebuffer());
@@ -720,7 +750,7 @@ var LibraryGL = {
     }
   },
 
-  glDeleteFramebuffers_deps: ['$GL'],
+  glDeleteFramebuffers__deps: ['$GL'],
   glDeleteFramebuffers: function(n, framebuffers) {
     for (var i = 0; i < n; ++i) {
       var fb = GL.hashtable("framebuffer").get({{{ makeGetValue('framebuffers', 'i*4', 'i32' ) }}});
@@ -728,25 +758,25 @@ var LibraryGL = {
     }
   },
 
-  glFramebufferRenderbuffer_deps: ['$GL'],
+  glFramebufferRenderbuffer__deps: ['$GL'],
   glFramebufferRenderbuffer: function(target, attachment, renderbuffertarget, renderbuffer) {
     Module.ctx.framebufferRenderbuffer(target, attachment, renderbuffertarget,
                                        GL.hashtable("renderbuffer").get(renderbuffer));
   },
 
-  glFramebufferTexture2D_deps: ['$GL'],
+  glFramebufferTexture2D__deps: ['$GL'],
   glFramebufferTexture2D: function(target, attachment, textarget, texture, level) {
     Module.ctx.framebufferTexture2D(target, attachment, textarget,
                                     GL.hashtable("texture").get(texture), level);
   },
 
-  glGetFramebufferAttachmentParameteriv_deps: ['$GL'],
+  glGetFramebufferAttachmentParameteriv__deps: ['$GL'],
   glGetFramebufferAttachmentParameteriv: function(target, attachment, pname, params) {
     var result = Module.ctx.getFramebufferAttachmentParameter(target, attachment, pname);
     {{{ makeSetValue('params', '0', 'params', 'i32') }}};
   },
 
-  glIsFramebuffer_deps: ['$GL'],
+  glIsFramebuffer__deps: ['$GL'],
   glIsFramebuffer: function(framebuffer) {
     var fb = GL.hashtable("framebuffer").get(framebuffer);
     if (typeof(fb) == 'undefined') {
@@ -797,6 +827,7 @@ var LibraryGLUT = {
     buttons: 0,
     modifiers: 0,
 
+    saveModifiers__deps: ['$GLUT'],
     saveModifiers: function(event) {
       GLUT.modifiers = 0;
       if (event['shiftKey'])
@@ -807,6 +838,7 @@ var LibraryGLUT = {
         GLUT.modifiers += 4; /* GLUT_ACTIVE_ALT */
     },
 
+    onMousemove__deps: ['$GLUT'],
     onMousemove: function(event) {
       GLUT.lastX = event['clientX'];
       GLUT.lastY = event['clientY'];
@@ -854,6 +886,7 @@ var LibraryGLUT = {
       return keycode;
     },
 
+    onKeydown__deps: ['$GLUT'],
     onKeydown: function(event) {
       if (GLUT.specialFunc || GLUT.keyboardFunc) {
         var key = GLUT.getSpecialKey(event['keyCode']);
@@ -876,6 +909,7 @@ var LibraryGLUT = {
       }
     },
 
+    onKeyup__deps: ['$GLUT'],
     onKeyup: function(event) {
       if (GLUT.specialUpFunc || GLUT.keyboardUpFunc) {
         var key = GLUT.getSpecialKey(event['keyCode']);
@@ -898,6 +932,7 @@ var LibraryGLUT = {
       }
     },
 
+    onMouseButtonDown__deps: ['$GLUT'],
     onMouseButtonDown: function(event){
       GLUT.lastX = event['clientX'];
       GLUT.lastY = event['clientY'];
@@ -910,6 +945,7 @@ var LibraryGLUT = {
       }
     },
 
+    onMouseButtonUp__deps: ['$GLUT'],
     onMouseButtonUp: function(event){
       GLUT.lastX = event['clientX'];
       GLUT.lastY = event['clientY'];
@@ -923,6 +959,7 @@ var LibraryGLUT = {
     },
   },
 
+  glutGetModifiers__deps: ['$GLUT'],
   glutGetModifiers: function() { return GLUT.modifiers; },
 
   glutInit__deps: ['$GLUT'],
@@ -941,6 +978,7 @@ var LibraryGLUT = {
     Module['canvas'].height = height;
   },
 
+  glutGet__deps: ['$GLUT'],
   glutGet: function(type) {
     switch (type) {
       case 700: /* GLUT_ELAPSED_TIME */
@@ -959,38 +997,47 @@ var LibraryGLUT = {
     window.setTimeout(function() { FUNCTION_TABLE[func](value); }, msec);
   },
 
+  glutDisplayFunc__deps: ['$GLUT'],
   glutDisplayFunc: function(func) {
     GLUT.displayFunc = func;
   },
-  
+
+  glutKeyboardFunc__deps: ['$GLUT'],
   glutKeyboardFunc: function(func) {
     GLUT.keyboardFunc = func;
   },
-  
+
+  glutKeyboardUpFunc__deps: ['$GLUT'],
   glutKeyboardUpFunc: function(func) {
     GLUT.keyboardUpFunc = func;
   },
 
+  glutSpecialFunc__deps: ['$GLUT'],
   glutSpecialFunc: function(func) {
     GLUT.specialFunc = func;
   },
 
+  glutSpecialUpFunc__deps: ['$GLUT'],
   glutSpecialUpFunc: function(func) {
     GLUT.specialUpFunc = func;
   },
 
+  glutReshapeFunc__deps: ['$GLUT'],
   glutReshapeFunc: function(func) {
     GLUT.reshapeFunc = func;
   },
-  
+
+  glutMotionFunc__deps: ['$GLUT'],
   glutMotionFunc: function(func) {
     GLUT.motionFunc = func;
   },
 
+  glutPassiveMotionFunc__deps: ['$GLUT'],
   glutPassiveMotionFunc: function(func) {
     GLUT.passiveMotionFunc = func;
   },
 
+  glutMouseFunc__deps: ['$GLUT'],
   glutMouseFunc: function(func) {
     GLUT.mouseFunc = func;
   },
@@ -1015,6 +1062,7 @@ var LibraryGLUT = {
   glutInitDisplayMode: function(mode) {},
   glutSwapBuffers: function() {},
 
+  glutPostRedisplay__deps: ['$GLUT'],
   glutPostRedisplay: function() {
     if (GLUT.displayFunc) {
       var RAF = window['setTimeout'];
@@ -1031,7 +1079,7 @@ var LibraryGLUT = {
     }
   },
 
-  glutMainLoop__deps: ['$GLUT', 'exit'],
+  glutMainLoop__deps: ['$GLUT', 'exit', 'glutPostRedisplay'],
   glutMainLoop: function() {
     if (GLUT.reshapeFunc) {
       FUNCTION_TABLE[GLUT.reshapeFunc](Module['canvas'].width,