Use arrow function in library_webgl.js. NFC

Author: sbc100

src/library_webgl.js

@@ -136,7 +136,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
   emscripten_webgl_enable_WEBGL_multi_draw: (ctx) => webgl_enable_WEBGL_multi_draw(GL.contexts[ctx].GLctx),
 
   $getEmscriptenSupportedExtensions__internal: true,
-  $getEmscriptenSupportedExtensions: function(ctx) {
+  $getEmscriptenSupportedExtensions: (ctx) => {
     // Restrict the list of advertised extensions to those that we actually
     // support.
     var supportedExtensions = [
@@ -280,7 +280,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
     // glGetError() to fetch it. As per GLES2 spec, only the first error is
     // remembered, and subsequent errors are discarded until the user has
     // cleared the stored error by a call to glGetError().
-    recordError: function recordError(errorCode) {
+    recordError: (errorCode) => {
 #if GL_TRACK_ERRORS
       if (!GL.lastError) {
         GL.lastError = errorCode;
@@ -370,7 +370,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
       }
     },
 
-    getTempVertexBuffer: function getTempVertexBuffer(sizeBytes) {
+    getTempVertexBuffer: (sizeBytes) => {
       var idx = GL.log2ceilLookup(sizeBytes);
       var ringbuffer = GL.currentContext.tempVertexBuffers1[idx];
       var nextFreeBufferIndex = GL.currentContext.tempVertexBufferCounters1[idx];
@@ -387,7 +387,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
       return ringbuffer[nextFreeBufferIndex];
     },
 
-    getTempIndexBuffer: function getTempIndexBuffer(sizeBytes) {
+    getTempIndexBuffer: (sizeBytes) => {
       var idx = GL.log2ceilLookup(sizeBytes);
       var ibo = GL.currentContext.tempIndexBuffers[idx];
       if (ibo) {
@@ -405,7 +405,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
     // doublebuffered temp VB memory pointers, so that every second frame
     // utilizes different set of temp buffers. The aim is to keep the set of
     // buffers being rendered, and the set of buffers being updated disjoint.
-    newRenderingFrameStarted: function newRenderingFrameStarted() {
+    newRenderingFrameStarted: () => {
       if (!GL.currentContext) {
         return;
       }
@@ -450,13 +450,13 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
 
 #if GL_FFP_ONLY
     enabledClientAttribIndices: [],
-    enableVertexAttribArray: function enableVertexAttribArray(index) {
+    enableVertexAttribArray: (index) => {
       if (!GL.enabledClientAttribIndices[index]) {
         GL.enabledClientAttribIndices[index] = true;
         GLctx.enableVertexAttribArray(index);
       }
     },
-    disableVertexAttribArray: function disableVertexAttribArray(index) {
+    disableVertexAttribArray: (index) => {
       if (GL.enabledClientAttribIndices[index]) {
         GL.enabledClientAttribIndices[index] = false;
         GLctx.disableVertexAttribArray(index);
@@ -465,7 +465,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
 #endif
 
 #if FULL_ES2
-    calcBufLength: function calcBufLength(size, type, stride, count) {
+    calcBufLength: (size, type, stride, count) => {
       if (stride > 0) {
         return count * stride;  // XXXvlad this is not exactly correct I don't think
       }
@@ -475,7 +475,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
 
     usedTempBuffers: [],
 
-    preDrawHandleClientVertexAttribBindings: function preDrawHandleClientVertexAttribBindings(count) {
+    preDrawHandleClientVertexAttribBindings: (count) => {
       GL.resetBufferBinding = false;
 
       // TODO: initial pass to detect ranges we need to upload, might not need
@@ -499,7 +499,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
       }
     },
 
-    postDrawHandleClientVertexAttribBindings: function postDrawHandleClientVertexAttribBindings() {
+    postDrawHandleClientVertexAttribBindings: () => {
       if (GL.resetBufferBinding) {
         GLctx.bindBuffer(0x8892 /*GL_ARRAY_BUFFER*/, GL.buffers[GLctx.currentArrayBufferBinding]);
       }
@@ -3673,7 +3673,7 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
   , '$emulGlGenVertexArrays'
 #endif
   ],
-  glGenVertexArrays: function (n, arrays) {
+  glGenVertexArrays: (n, arrays) => {
 #if LEGACY_GL_EMULATION
     emulGlGenVertexArrays(n, arrays);
 #else
@@ -4204,13 +4204,13 @@ for (/**@suppress{duplicate}*/var i = 0; i < {{{ GL_POOL_TEMP_BUFFERS_SIZE }}};
   'SDL_GL_GetProcAddress',
   'eglGetProcAddress',
   'glfwGetProcAddress'
-].forEach(function(name) {
-  LibraryGL[name] = function(name) { abort(); return 0; };
+].forEach((name) => {
+  LibraryGL[name] = (name) => { abort(); return 0; };
   // Due to the two pass nature of compiling .js files,
   // in INCLUDE_FULL_LIBRARY mode, we must include the above
   // stub functions, but not their __deps message handlers.
 #if !INCLUDE_FULL_LIBRARY
-  LibraryGL[name + '__deps'] = [function() {
+  LibraryGL[name + '__deps'] = [() => {
     error(`linker: Undefined symbol: ${name}(). Please pass -sGL_ENABLE_GET_PROC_ADDRESS at link time to link in ${name}().`);
   }];
 #endif
@@ -4235,15 +4235,12 @@ function createGLPassthroughFunctions(lib, funcs) {
     const num = data[0];
     const names = data[1];
     const args = range(num).map((i) => 'x' + i ).join(', ');
-    const plainStub = `(function(${args}) { GLctx.NAME(${args}) })`;
-    const returnStub = `(function(${args}) { return GLctx.NAME(${args}) })`;
+    const stub = `(${args}) => GLctx.NAME(${args})`;
     const sigEnd = range(num).map(() => 'i').join('');
     names.split(' ').forEach((name) => {
-      let stub = plainStub;
       let sig;
       if (name.endsWith('*')) {
         name = name.slice(0, -1);
-        stub = returnStub;
         sig = 'i' + sigEnd;
       } else {
         sig = 'v' + sigEnd;

test/code_size/hello_webgl2_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 569,
   "a.html.gz": 379,
-  "a.js": 4681,
-  "a.js.gz": 2412,
+  "a.js": 4637,
+  "a.js.gz": 2408,
   "a.wasm": 10388,
   "a.wasm.gz": 6692,
-  "total": 15638,
-  "total_gz": 9483
+  "total": 15594,
+  "total_gz": 9479
 }

test/code_size/hello_webgl2_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 567,
   "a.html.gz": 379,
-  "a.js": 17917,
-  "a.js.gz": 8089,
+  "a.js": 17873,
+  "a.js.gz": 8080,
   "a.mem": 3123,
   "a.mem.gz": 2693,
-  "total": 21607,
-  "total_gz": 11161
+  "total": 21563,
+  "total_gz": 11152
 }

test/code_size/hello_webgl_wasm.json

@@ -1,10 +1,10 @@
 {
   "a.html": 569,
   "a.html.gz": 379,
-  "a.js": 4167,
-  "a.js.gz": 2236,
+  "a.js": 4123,
+  "a.js.gz": 2229,
   "a.wasm": 10388,
   "a.wasm.gz": 6692,
-  "total": 15124,
-  "total_gz": 9307
+  "total": 15080,
+  "total_gz": 9300
 }

test/code_size/hello_webgl_wasm2js.json

@@ -1,10 +1,10 @@
 {
   "a.html": 567,
   "a.html.gz": 379,
-  "a.js": 17395,
-  "a.js.gz": 7900,
+  "a.js": 17351,
+  "a.js.gz": 7896,
   "a.mem": 3123,
   "a.mem.gz": 2693,
-  "total": 21085,
-  "total_gz": 10972
+  "total": 21041,
+  "total_gz": 10968
 }