Minor cleanups to GL passthrough function handling. NFC (#19023)

Author: sbc100

src/library_webgl.js

@@ -4172,18 +4172,18 @@ var LibraryGL = {
   glFrontFace__sig: 'vi',
 };
 
-// Simple pass-through functions. Starred ones have return values. [X] ones have X in the C name but not in the JS name
-var glFuncs = [[0, 'finish flush'],
- [1, 'clearDepth clearDepth[f] depthFunc enable disable frontFace cullFace clear lineWidth clearStencil stencilMask checkFramebufferStatus* generateMipmap activeTexture blendEquation isEnabled*'],
- [2, 'blendFunc blendEquationSeparate depthRange depthRange[f] stencilMaskSeparate hint polygonOffset vertexAttrib1f'],
- [3, 'texParameteri texParameterf vertexAttrib2f stencilFunc stencilOp'],
- [4, 'viewport clearColor scissor vertexAttrib3f renderbufferStorage blendFuncSeparate blendColor stencilFuncSeparate stencilOpSeparate'],
- [5, 'vertexAttrib4f'],
- [6, ''],
- [7, ''],
- [8, 'copyTexImage2D copyTexSubImage2D'],
- [9, ''],
- [10, '']];
+// Simple pass-through functions.
+// - Starred ones have return values.
+// - [X] ones have X in the C name but not in the JS name
+var glPassthroughFuncs = [
+  [0, 'finish flush'],
+  [1, 'clearDepth clearDepth[f] depthFunc enable disable frontFace cullFace clear lineWidth clearStencil stencilMask checkFramebufferStatus* generateMipmap activeTexture blendEquation isEnabled*'],
+  [2, 'blendFunc blendEquationSeparate depthRange depthRange[f] stencilMaskSeparate hint polygonOffset vertexAttrib1f'],
+  [3, 'texParameteri texParameterf vertexAttrib2f stencilFunc stencilOp'],
+  [4, 'viewport clearColor scissor vertexAttrib3f renderbufferStorage blendFuncSeparate blendColor stencilFuncSeparate stencilOpSeparate'],
+  [5, 'vertexAttrib4f'],
+  [8, 'copyTexImage2D copyTexSubImage2D'],
+];
 
 function createGLPassthroughFunctions(lib, funcs) {
   funcs.forEach((data) => {
@@ -4194,11 +4194,10 @@ function createGLPassthroughFunctions(lib, funcs) {
     const returnStub = '(function(' + args + ') { return GLctx[\'NAME\'](' + args + ') })';
     const sigEnd = range(num).map(() => 'i').join('');
     names.split(' ').forEach((name) => {
-      if (name.length == 0) return;
       let stub = plainStub;
       let sig;
-      if (name[name.length-1] == '*') {
-        name = name.substr(0, name.length-1);
+      if (name.endsWith('*')) {
+        name = name.slice(0, -1);
         stub = returnStub;
         sig = 'i' + sigEnd;
       } else {
@@ -4207,7 +4206,7 @@ function createGLPassthroughFunctions(lib, funcs) {
       let cName = name;
       if (name.includes('[')) {
         cName = name.replace('[', '').replace(']', '');
-        name = cName.substr(0, cName.length-1);
+        name = cName.slice(0, -1);
       }
       cName = 'gl' + cName[0].toUpperCase() + cName.substr(1);
       assert(!(cName in lib), "Cannot reimplement the existing function " + cName);
@@ -4217,7 +4216,7 @@ function createGLPassthroughFunctions(lib, funcs) {
   });
 }
 
-createGLPassthroughFunctions(LibraryGL, glFuncs);
+createGLPassthroughFunctions(LibraryGL, glPassthroughFuncs);
 
 autoAddDeps(LibraryGL, '$GL');
 

src/library_webgl2.js

@@ -1116,28 +1116,28 @@ var LibraryWebGL2 = {
   glClearBufferfi__sig: 'viifi',
 };
 
-// Simple pass-through functions. Starred ones have return values. [X] ones have X in the C name but not in the JS name
-var webgl2Funcs = [[0, 'endTransformFeedback pauseTransformFeedback resumeTransformFeedback'],
- [1, 'beginTransformFeedback readBuffer endQuery'],
- [2, ''],
- [3, ''],
- [4, 'clearBufferfi'],
- [5, 'vertexAttribI4i vertexAttribI4ui copyBufferSubData texStorage2D renderbufferStorageMultisample'],
- [6, 'texStorage3D'],
- [7, ''],
- [8, ''],
- [9, 'copyTexSubImage3D'],
- [10, 'blitFramebuffer']];
-
 #if MAX_WEBGL_VERSION >= 2
 
-// If user passes -sMAX_WEBGL_VERSION >= 2 -sSTRICT but not -lGL (to link in WebGL 1), then WebGL2 library should not
-// be linked in as well.
+// Simple pass-through functions.
+// - Starred ones have return values.
+// - [X] ones have X in the C name but not in the JS name
+var webgl2PassthroughFuncs = [
+  [0, 'endTransformFeedback pauseTransformFeedback resumeTransformFeedback'],
+  [1, 'beginTransformFeedback readBuffer endQuery'],
+  [4, 'clearBufferfi'],
+  [5, 'vertexAttribI4i vertexAttribI4ui copyBufferSubData texStorage2D renderbufferStorageMultisample'],
+  [6, 'texStorage3D'],
+  [9, 'copyTexSubImage3D'],
+  [10, 'blitFramebuffer']
+];
+
+// If user passes -sMAX_WEBGL_VERSION >= 2 -sSTRICT but not -lGL (to link in
+// WebGL 1), then WebGL2 library should not be linked in as well.
 if (typeof createGLPassthroughFunctions == 'undefined') {
   throw 'In order to use WebGL 2 in strict mode with -sMAX_WEBGL_VERSION=2, you need to link in WebGL support with -lGL!';
 }
 
-createGLPassthroughFunctions(LibraryWebGL2, webgl2Funcs);
+createGLPassthroughFunctions(LibraryWebGL2, webgl2PassthroughFuncs);
 
 recordGLProcAddressGet(LibraryWebGL2);