auto-add deps in gl and glut

3 files changed, 11 insertions, 77 deletions

diff --git a/src/library.js b/src/library.js
index be5e48d7..6c96bcca 100644
--- a/src/library.js
+++ b/src/library.js
@@ -6087,3 +6087,12 @@ LibraryManager.library = {
   }
 };
 
+function autoAddDeps(object, name) {
+  name = [name];
+  for (var item in object) {
+    if (item.substr(-6) != '__deps' && !object[item + '__deps']) {
+      object[item + '__deps'] = name;
+    }
+  }
+}
+
diff --git a/src/library_gl.js b/src/library_gl.js
index 37e8339b..f296b489 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -62,7 +62,6 @@ var LibraryGL = {
     }
   },
 
-  glGetIntegerv__deps: ['$GL'],
   glGetIntegerv: function(name_, p) {
     var result = Module.ctx.getParameter(name_);
     switch (typeof(result)) {
@@ -105,7 +104,6 @@ var LibraryGL = {
     }
   },
 
-  glGetFloatv__deps: ['$GL'],
   glGetFloatv: function(name_, p) {
     var result = Module.ctx.getParameter(name_);
     switch (typeof(result)) {
@@ -148,7 +146,6 @@ var LibraryGL = {
     }
   },
 
-  glGetBooleanv__deps: ['$GL'],
   glGetBooleanv: function(name_, p) {
     var result = Module.ctx.getParameter(name_);
     switch (typeof(result)) {
@@ -187,7 +184,6 @@ var LibraryGL = {
     }
   },
 
-  glGenTextures__deps: ['$GL'],
   glGenTextures: function(n, textures) {
     for (var i = 0; i < n; i++) {
       var id = GL.hashtable("texture").add(Module.ctx.createTexture());
@@ -195,7 +191,6 @@ var LibraryGL = {
     }
   },
 
-  glDeleteTextures__deps: ['$GL'],
   glDeleteTextures: function(n, textures) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('textures', 'i*4', 'i32') }}};
@@ -312,7 +307,6 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'Module.getTexParameter(target, pname)', 'i32') }}};
   },
 
-  glIsTexture__deps: ['$GL'],
   glIsTexture: function(texture) {
     var fb = GL.hashtable("texture").get(texture);
     if (typeof(fb) == 'undefined') {
@@ -321,7 +315,6 @@ var LibraryGL = {
     return Module.ctx.isTexture(fb);
   },
 
-  glGenBuffers__deps: ['$GL'],
   glGenBuffers: function(n, buffers) {
     for (var i = 0; i < n; i++) {
       var id = GL.hashtable("buffer").add(Module.ctx.createBuffer());
@@ -329,7 +322,6 @@ var LibraryGL = {
     }
   },
 
-  glDeleteBuffers__deps: ['$GL'],
   glDeleteBuffers: function(n, buffers) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('buffers', 'i*4', 'i32') }}};
@@ -347,7 +339,6 @@ var LibraryGL = {
     Module.ctx.bufferSubData(target, offset, floatArray);
   },
 
-  glIsBuffer__deps: ['$GL'],
   glIsBuffer: function(buffer) {
     var fb = GL.hashtable("buffer").get(buffer);
     if (typeof(fb) == 'undefined') {
@@ -356,7 +347,6 @@ var LibraryGL = {
     return Module.ctx.isBuffer(fb);
   },
 
-  glGenRenderbuffers__deps: ['$GL'],
   glGenRenderbuffers: function(n, renderbuffers) {
     for (var i = 0; i < n; i++) {
       var id = GL.hashtable("renderbuffer").add(Module.ctx.createRenderbuffer());
@@ -364,7 +354,6 @@ var LibraryGL = {
     }
   },
 
-  glDeleteRenderbuffers__deps: ['$GL'],
   glDeleteRenderbuffers: function(n, renderbuffers) {
     for (var i = 0; i < n; i++) {
       var id = {{{ makeGetValue('renderbuffers', 'i*4', 'i32') }}};
@@ -373,7 +362,6 @@ var LibraryGL = {
     }
   },
 
-  glBindRenderbuffer__deps: ['$GL'],
   glBindRenderbuffer: function(target, renderbuffer) {
     Module.ctx.bindRenderbuffer(target, GL.hashtable("renderbuffer").get(renderbuffer));
   },
@@ -382,7 +370,6 @@ var LibraryGL = {
     {{{ makeSetValue('params', '0', 'Module.ctx.getRenderbufferParameter(target, pname)', 'i32') }}};
   },
 
-  glIsRenderbuffer__deps: ['$GL'],
   glIsRenderbuffer: function(renderbuffer) {
     var fb = GL.hashtable("renderbuffer").get(renderbuffer);
     if (typeof(fb) == 'undefined') {
@@ -391,7 +378,6 @@ var LibraryGL = {
     return Module.ctx.isRenderbuffer(fb);
   },
 
-  glGetUniformLocation__deps: ['$GL'],
   glGetUniformLocation: function(program, name) {
     name = Pointer_stringify(name);
     var loc = Module.ctx.getUniformLocation(GL.hashtable("program").get(program), name);
@@ -399,62 +385,52 @@ var LibraryGL = {
     return GL.hashtable("uniform").add(loc);
   },
 
-  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;
@@ -462,7 +438,6 @@ var LibraryGL = {
     Module.ctx.uniform2fv(Location, value);
   },
 
-  glUniform3fv__deps: ['$GL'],
   glUniform3fv: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 3;
@@ -470,7 +445,6 @@ var LibraryGL = {
     Module.ctx.uniform3fv(Location, value);
   },
 
-  glUniform4fv__deps: ['$GL'],
   glUniform4fv: function(Location, count, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 4;
@@ -478,7 +452,6 @@ var LibraryGL = {
     Module.ctx.uniform4fv(Location, value);
   },
 
-  glUniformMatrix2fv__deps: ['$GL'],
   glUniformMatrix2fv: function(Location, count, transpose, value) {
     Location = GL.hashtable("uniform").get(Location);
     count *= 4;
@@ -486,7 +459,6 @@ 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;
@@ -494,7 +466,6 @@ 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;
@@ -502,7 +473,6 @@ var LibraryGL = {
     Module.ctx.uniformMatrix4fv(Location, transpose, value);
   },
 
-  glBindBuffer__deps: ['$GL'],
   glBindBuffer: function(target, buffer) {
     Module.ctx.bindBuffer(target, GL.hashtable("buffer").get(buffer));
   },
@@ -527,31 +497,26 @@ var LibraryGL = {
     Module.ctx.vertexAttrib4fv(index, v);
   },
 
-  glGetAttribLocation__deps: ['$GL'],
   glGetAttribLocation: function(program, name) {
     program = GL.hashtable("program").get(program);
     name = Pointer_stringify(name);
     return Module.ctx.getAttribLocation(program, name);
   },
 
-  glCreateShader__deps: ['$GL'],
   glCreateShader: function(shaderType) {
     var shader = Module.ctx.createShader(shaderType);
     return GL.hashtable("shader").add(shader);
   },
 
-  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;
@@ -564,7 +529,6 @@ var LibraryGL = {
     }
   },
 
-  glShaderSource__deps: ['$GL'],
   glShaderSource: function(shader, count, string, length) {
     var source = "";
     for (var i = 0; i < count; ++i) {
@@ -584,7 +548,6 @@ 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);
@@ -594,12 +557,10 @@ var LibraryGL = {
     }
   },
 
-  glCompileShader__deps: ['$GL'],
   glCompileShader: function(shader) {
     Module.ctx.compileShader(GL.hashtable("shader").get(shader));
   },
 
-  glGetShaderInfoLog__deps: ['$GL'],
   glGetShaderInfoLog: function(shader, maxLength, length, infoLog) {
     var log = Module.ctx.getShaderInfoLog(GL.hashtable("shader").get(shader));
     // Work around a bug in Chromium which causes getShaderInfoLog to return null
@@ -613,17 +574,14 @@ var LibraryGL = {
     }
   },
 
-  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 : function(program, pname, p) {
     {{{ makeSetValue('p', '0', 'Module.ctx.getProgramParameter(GL.hashtable("program").get(program), pname)', 'i32') }}};
   },
 
-  glIsShader__deps: ['$GL'],
   glIsShader: function(shader) {
     var fb = GL.hashtable("shader").get(shader);
     if (typeof(fb) == 'undefined') {
@@ -632,17 +590,14 @@ var LibraryGL = {
     return Module.ctx.isShader(fb);
   },
 
-  glCreateProgram__deps: ['$GL'],
   glCreateProgram: function() {
     return GL.hashtable("program").add(Module.ctx.createProgram());
   },
 
-  glDeleteProgram__deps: ['$GL'],
   glDeleteProgram: function(program) {
     Module.ctx.deleteProgram(GL.hashtable("program").get(program));
   },
 
-  glAttachShader__deps: ['$GL'],
   glAttachShader: function(program, shader) {
     Module.ctx.attachShader(GL.hashtable("program").get(program),
                             GL.hashtable("shader").get(shader));
@@ -655,12 +610,10 @@ var LibraryGL = {
     {{{ makeSetValue('precision', '0', 'result.precision', 'i32') }}};
   },
 
-  glLinkProgram__deps: ['$GL'],
   glLinkProgram: function(program) {
     Module.ctx.linkProgram(GL.hashtable("program").get(program));
   },
 
-  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
@@ -674,17 +627,14 @@ var LibraryGL = {
     }
   },
 
-  glUseProgram__deps: ['$Gl'],
   glUseProgram: function(program) {
     Module.ctx.useProgram(GL.hashtable("program").get(program));
   },
 
-  glValidateProgram__deps: ['$Gl'],
   glValidateProgram: function(program) {
     Module.ctx.validateProgram(GL.hashtable("program").get(program));
   },
 
-  glIsProgram__deps: ['$GL'],
   glIsProgram: function(program) {
     var fb = GL.hashtable("program").get(program);
     if (typeof(fb) == 'undefined') {
@@ -693,18 +643,15 @@ var LibraryGL = {
     return Module.ctx.isProgram(fb);
   },
 
-  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: function(target, framebuffer) {
     Module.ctx.bindFramebuffer(target, GL.hashtable("framebuffer").get(framebuffer));
   },
 
-  glGenFramebuffers__deps: ['$GL'],
   glGenFramebuffers: function(n, ids) {
     for (var i = 0; i < n; ++i) {
       var fb = GL.hashtable("framebuffer").add(Module.ctx.createFramebuffer());
@@ -712,7 +659,6 @@ var LibraryGL = {
     }
   },
 
-  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' ) }}});
@@ -720,25 +666,21 @@ var LibraryGL = {
     }
   },
 
-  glFramebufferRenderbuffer__deps: ['$GL'],
   glFramebufferRenderbuffer: function(target, attachment, renderbuffertarget, renderbuffer) {
     Module.ctx.framebufferRenderbuffer(target, attachment, renderbuffertarget,
                                        GL.hashtable("renderbuffer").get(renderbuffer));
   },
 
-  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: function(target, attachment, pname, params) {
     var result = Module.ctx.getFramebufferAttachmentParameter(target, attachment, pname);
     {{{ makeSetValue('params', '0', 'params', 'i32') }}};
   },
 
-  glIsFramebuffer__deps: ['$GL'],
   glIsFramebuffer: function(framebuffer) {
     var fb = GL.hashtable("framebuffer").get(framebuffer);
     if (typeof(fb) == 'undefined') {
@@ -769,5 +711,6 @@ var LibraryGL = {
   });
 });
 
+autoAddDeps(LibraryGL, '$GL');
 mergeInto(LibraryManager.library, LibraryGL);
 
diff --git a/src/library_glut.js b/src/library_glut.js
index 53207d34..0569c9e8 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -16,7 +16,6 @@ var LibraryGLUT = {
     buttons: 0,
     modifiers: 0,
 
-    saveModifiers__deps: ['$GLUT'],
     saveModifiers: function(event) {
       GLUT.modifiers = 0;
       if (event['shiftKey'])
@@ -27,7 +26,6 @@ var LibraryGLUT = {
         GLUT.modifiers += 4; /* GLUT_ACTIVE_ALT */
     },
 
-    onMousemove__deps: ['$GLUT'],
     onMousemove: function(event) {
       GLUT.lastX = event['clientX'];
       GLUT.lastY = event['clientY'];
@@ -75,7 +73,6 @@ var LibraryGLUT = {
       return keycode;
     },
 
-    onKeydown__deps: ['$GLUT'],
     onKeydown: function(event) {
       if (GLUT.specialFunc || GLUT.keyboardFunc) {
         var key = GLUT.getSpecialKey(event['keyCode']);
@@ -98,7 +95,6 @@ var LibraryGLUT = {
       }
     },
 
-    onKeyup__deps: ['$GLUT'],
     onKeyup: function(event) {
       if (GLUT.specialUpFunc || GLUT.keyboardUpFunc) {
         var key = GLUT.getSpecialKey(event['keyCode']);
@@ -121,7 +117,6 @@ var LibraryGLUT = {
       }
     },
 
-    onMouseButtonDown__deps: ['$GLUT'],
     onMouseButtonDown: function(event){
       GLUT.lastX = event['clientX'];
       GLUT.lastY = event['clientY'];
@@ -134,7 +129,6 @@ var LibraryGLUT = {
       }
     },
 
-    onMouseButtonUp__deps: ['$GLUT'],
     onMouseButtonUp: function(event){
       GLUT.lastX = event['clientX'];
       GLUT.lastY = event['clientY'];
@@ -148,10 +142,8 @@ var LibraryGLUT = {
     },
   },
 
-  glutGetModifiers__deps: ['$GLUT'],
   glutGetModifiers: function() { return GLUT.modifiers; },
 
-  glutInit__deps: ['$GLUT'],
   glutInit: function(argcp, argv) {
     // Ignore arguments
     GLUT.initTime = Date.now();
@@ -167,7 +159,6 @@ var LibraryGLUT = {
     Module['canvas'].height = height;
   },
 
-  glutGet__deps: ['$GLUT'],
   glutGet: function(type) {
     switch (type) {
       case 700: /* GLUT_ELAPSED_TIME */
@@ -186,47 +177,38 @@ 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;
   },
@@ -294,7 +276,6 @@ var LibraryGLUT = {
   glutInitDisplayMode: function(mode) {},
   glutSwapBuffers: function() {},
 
-  glutPostRedisplay__deps: ['$GLUT'],
   glutPostRedisplay: function() {
     if (GLUT.displayFunc) {
       var RAF = window['setTimeout'];
@@ -323,5 +304,6 @@ var LibraryGLUT = {
 
 };
 
+autoAddDeps(LibraryGLUT, '$GLUT');
 mergeInto(LibraryManager.library, LibraryGLUT);