Skip to content

Commit 9ffc857

Browse files
sbc100sbc100
authored
Add auto-generated sigs for src/library_egl.js. NFC (#19259)
1 parent 57c5ae6 commit 9ffc857

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

‎src/library_egl.js

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ var LibraryEGL = {
9191

9292
// EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id);
9393
eglGetDisplay__proxy: 'sync',
94-
eglGetDisplay__sig: 'ii',
9594
eglGetDisplay: function(nativeDisplayType) {
9695
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
9796
// Note: As a 'conformant' implementation of EGL, we would prefer to init here only if the user
@@ -110,7 +109,6 @@ var LibraryEGL = {
110109

111110
// EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
112111
eglInitialize__proxy: 'sync',
113-
eglInitialize__sig: 'iiii',
114112
eglInitialize: function(display, majorVersion, minorVersion) {
115113
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
116114
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -129,7 +127,6 @@ var LibraryEGL = {
129127

130128
// EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
131129
eglTerminate__proxy: 'sync',
132-
eglTerminate__sig: 'ii',
133130
eglTerminate: function(display) {
134131
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
135132
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -145,21 +142,18 @@ var LibraryEGL = {
145142

146143
// EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
147144
eglGetConfigs__proxy: 'sync',
148-
eglGetConfigs__sig: 'iiiii',
149145
eglGetConfigs: function(display, configs, config_size, numConfigs) {
150146
return EGL.chooseConfig(display, 0, configs, config_size, numConfigs);
151147
},
152148

153149
// EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
154150
eglChooseConfig__proxy: 'sync',
155-
eglChooseConfig__sig: 'iiiiii',
156151
eglChooseConfig: function(display, attrib_list, configs, config_size, numConfigs) {
157152
return EGL.chooseConfig(display, attrib_list, configs, config_size, numConfigs);
158153
},
159154

160155
// EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
161156
eglGetConfigAttrib__proxy: 'sync',
162-
eglGetConfigAttrib__sig: 'iiiii',
163157
eglGetConfigAttrib: function(display, config, attribute, value) {
164158
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
165159
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -277,7 +271,6 @@ var LibraryEGL = {
277271

278272
// EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list);
279273
eglCreateWindowSurface__proxy: 'sync',
280-
eglCreateWindowSurface__sig: 'iiiii',
281274
eglCreateWindowSurface: function(display, config, win, attrib_list) {
282275
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
283276
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -297,7 +290,6 @@ var LibraryEGL = {
297290

298291
// EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay display, EGLSurface surface);
299292
eglDestroySurface__proxy: 'sync',
300-
eglDestroySurface__sig: 'iii',
301293
eglDestroySurface: function(display, surface) {
302294
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
303295
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -321,7 +313,6 @@ var LibraryEGL = {
321313

322314
// EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
323315
eglCreateContext__proxy: 'sync',
324-
eglCreateContext__sig: 'iiiii',
325316
eglCreateContext: function(display, config, hmm, contextAttribs) {
326317
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
327318
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -386,7 +377,6 @@ var LibraryEGL = {
386377

387378
// EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext context);
388379
eglDestroyContext__proxy: 'sync',
389-
eglDestroyContext__sig: 'iii',
390380
eglDestroyContext: function(display, context) {
391381
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
392382
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -407,7 +397,6 @@ var LibraryEGL = {
407397

408398
// EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
409399
eglQuerySurface__proxy: 'sync',
410-
eglQuerySurface__sig: 'iiiii',
411400
eglQuerySurface: function(display, surface, attribute, value) {
412401
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
413402
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -474,7 +463,6 @@ var LibraryEGL = {
474463

475464
// EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
476465
eglQueryContext__proxy: 'sync',
477-
eglQueryContext__sig: 'iiiii',
478466
eglQueryContext: function(display, context, attribute, value) {
479467
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
480468
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -514,15 +502,13 @@ var LibraryEGL = {
514502

515503
// EGLAPI EGLint EGLAPIENTRY eglGetError(void);
516504
eglGetError__proxy: 'sync',
517-
eglGetError__sig: 'i',
518505
eglGetError: function() {
519506
return EGL.errorCode;
520507
},
521508

522509
// EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
523510
eglQueryString__deps: ['$stringToNewUTF8'],
524511
eglQueryString__proxy: 'sync',
525-
eglQueryString__sig: 'iii',
526512
eglQueryString: function(display, name) {
527513
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
528514
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -547,7 +533,6 @@ var LibraryEGL = {
547533

548534
// EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api);
549535
eglBindAPI__proxy: 'sync',
550-
eglBindAPI__sig: 'ii',
551536
eglBindAPI: function(api) {
552537
if (api == 0x30A0 /* EGL_OPENGL_ES_API */) {
553538
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
@@ -560,23 +545,20 @@ var LibraryEGL = {
560545

561546
// EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);
562547
eglQueryAPI__proxy: 'sync',
563-
eglQueryAPI__sig: 'i',
564548
eglQueryAPI: function() {
565549
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
566550
return 0x30A0; // EGL_OPENGL_ES_API
567551
},
568552

569553
// EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void);
570554
eglWaitClient__proxy: 'sync',
571-
eglWaitClient__sig: 'i',
572555
eglWaitClient: function() {
573556
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
574557
return 1;
575558
},
576559

577560
// EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine);
578561
eglWaitNative__proxy: 'sync',
579-
eglWaitNative__sig: 'ii',
580562
eglWaitNative: function(nativeEngineId) {
581563
EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
582564
return 1;
@@ -589,7 +571,6 @@ var LibraryEGL = {
589571
// EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval);
590572
eglSwapInterval__deps: ['emscripten_set_main_loop_timing'],
591573
eglSwapInterval__proxy: 'sync',
592-
eglSwapInterval__sig: 'iii',
593574
eglSwapInterval: function(display, interval) {
594575
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
595576
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -605,7 +586,6 @@ var LibraryEGL = {
605586
// EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
606587
eglMakeCurrent__deps: ['$GL'],
607588
eglMakeCurrent__proxy: 'sync',
608-
eglMakeCurrent__sig: 'iiiii',
609589
eglMakeCurrent: function(display, draw, read, context) {
610590
if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
611591
EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
@@ -632,14 +612,12 @@ var LibraryEGL = {
632612

633613
// EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void);
634614
eglGetCurrentContext__proxy: 'sync',
635-
eglGetCurrentContext__sig: 'i',
636615
eglGetCurrentContext: function() {
637616
return EGL.currentContext;
638617
},
639618

640619
// EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw);
641620
eglGetCurrentSurface__proxy: 'sync',
642-
eglGetCurrentSurface__sig: 'ii',
643621
eglGetCurrentSurface: function(readdraw) {
644622
if (readdraw == 0x305A /* EGL_READ */) {
645623
return EGL.currentReadSurface;
@@ -653,15 +631,13 @@ var LibraryEGL = {
653631

654632
// EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void);
655633
eglGetCurrentDisplay__proxy: 'sync',
656-
eglGetCurrentDisplay__sig: 'i',
657634
eglGetCurrentDisplay: function() {
658635
return EGL.currentContext ? 62000 /* Magic ID for Emscripten 'default display' */ : 0;
659636
},
660637

661638
// EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
662639
eglSwapBuffers__proxy: 'sync',
663-
eglSwapBuffers__sig: 'iii',
664-
eglSwapBuffers: function() {
640+
eglSwapBuffers: function(dpy, surface) {
665641
#if PROXY_TO_WORKER
666642
if (Browser.doSwapBuffers) Browser.doSwapBuffers();
667643
#endif
@@ -684,7 +660,6 @@ var LibraryEGL = {
684660
},
685661

686662
eglReleaseThread__proxy: 'sync',
687-
eglReleaseThread__sig: 'i',
688663
eglReleaseThread: function() {
689664
// Equivalent to eglMakeCurrent with EGL_NO_CONTEXT and EGL_NO_SURFACE.
690665
EGL.currentContext = 0;

‎src/library_sigs.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,32 @@ sigs = {
463463
clock_time_get__sig: 'iijp',
464464
dladdr__sig: 'ipp',
465465
dlopen__sig: 'ppi',
466+
eglBindAPI__sig: 'ii',
467+
eglChooseConfig__sig: 'ipppip',
468+
eglCreateContext__sig: 'ppppp',
469+
eglCreateWindowSurface__sig: 'pppip',
470+
eglDestroyContext__sig: 'ipp',
471+
eglDestroySurface__sig: 'ipp',
472+
eglGetConfigAttrib__sig: 'ippip',
473+
eglGetConfigs__sig: 'ippip',
474+
eglGetCurrentContext__sig: 'p',
475+
eglGetCurrentDisplay__sig: 'p',
476+
eglGetCurrentSurface__sig: 'pi',
477+
eglGetDisplay__sig: 'pi',
478+
eglGetError__sig: 'i',
479+
eglInitialize__sig: 'ippp',
480+
eglMakeCurrent__sig: 'ipppp',
481+
eglQueryAPI__sig: 'i',
482+
eglQueryContext__sig: 'ippip',
483+
eglQueryString__sig: 'ppi',
484+
eglQuerySurface__sig: 'ippip',
485+
eglReleaseThread__sig: 'i',
486+
eglSwapBuffers__sig: 'ipp',
487+
eglSwapInterval__sig: 'ipi',
488+
eglTerminate__sig: 'ip',
489+
eglWaitClient__sig: 'i',
490+
eglWaitGL__sig: 'i',
491+
eglWaitNative__sig: 'ii',
466492
ellipseColor__sig: 'ipiiiii',
467493
ellipseRGBA__sig: 'ipiiiiiiii',
468494
emscripten_SDL_SetEventHandler__sig: 'vpp',

‎tools/gen_sig_info.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
#else
7979
#include <GL/glfw.h>
8080
#endif
81+
#include <EGL/egl.h>
8182
#include <GL/glew.h>
8283
#include <GL/glut.h>
8384
#include <AL/al.h>
@@ -153,8 +154,6 @@ def ignore_symbol(s, cxx):
153154
return True
154155
if s.startswith('emscripten_gl') or s.startswith('emscripten_alc'):
155156
return True
156-
if s.startswith('egl'):
157-
return True
158157
if s.startswith('gl') and any(s.endswith(x) for x in ('NV', 'EXT', 'WEBGL', 'ARB', 'ANGLE')):
159158
return True
160159
if cxx and s in ('__dlsym', '__asctime_r'):
@@ -272,6 +271,7 @@ def extract_sig_info(sig_info, extra_settings=None, extra_cflags=None, cxx=False
272271
# of JS symbols are included.
273272
'STACK_OVERFLOW_CHECK': 1,
274273
'USE_SDL': 1,
274+
'USE_GLFW': 0,
275275
'FETCH': 1,
276276
'PTHREADS': 1,
277277
'SHARED_MEMORY': 1,
@@ -354,11 +354,10 @@ def main(args):
354354
extract_sig_info(sig_info, {'USE_GLFW': 3}, ['-DGLFW3'])
355355
extract_sig_info(sig_info, {'JS_LIBRARIES': ['src/embind/embind.js', 'src/embind/emval.js'],
356356
'USE_SDL': 0,
357-
'USE_GLFW': 0,
358357
'MAX_WEBGL_VERSION': 0,
359358
'AUTO_JS_LIBRARIES': 0}, cxx=True)
360359
extract_sig_info(sig_info, {'LEGACY_GL_EMULATION': 1}, ['-DGLES'])
361-
extract_sig_info(sig_info, {'FULL_ES3': 1, 'MAX_WEBGL_VERSION': 2})
360+
extract_sig_info(sig_info, {'USE_GLFW': 2, 'FULL_ES3': 1, 'MAX_WEBGL_VERSION': 2})
362361
extract_sig_info(sig_info, {'STANDALONE_WASM': 1})
363362
extract_sig_info(sig_info, {'MAIN_MODULE': 2})
364363

0 commit comments

Comments
 (0)