Skip to content

Use normal JS library aliases for GL symbols. NFC #19033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Mar 22, 2023
Merged

Use normal JS library aliases for GL symbols. NFC #19033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/library_glemu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3881,16 +3881,16 @@ var LibraryGLEmulation = {

// Open GLES1.1 compatibility

glGenFramebuffersOES : 'glGenFramebuffers',
glGenRenderbuffersOES : 'glGenRenderbuffers',
glBindFramebufferOES : 'glBindFramebuffer',
glBindRenderbufferOES : 'glBindRenderbuffer',
glGetRenderbufferParameterivOES : 'glGetRenderbufferParameteriv',
glFramebufferRenderbufferOES : 'glFramebufferRenderbuffer',
glRenderbufferStorageOES : 'glRenderbufferStorage',
glCheckFramebufferStatusOES : 'glCheckFramebufferStatus',
glDeleteFramebuffersOES : 'glDeleteFramebuffers',
glDeleteRenderbuffersOES : 'glDeleteRenderbuffers',
glGenFramebuffersOES: 'glGenFramebuffers',
glGenRenderbuffersOES: 'glGenRenderbuffers',
glBindFramebufferOES: 'glBindFramebuffer',
glBindRenderbufferOES: 'glBindRenderbuffer',
glGetRenderbufferParameterivOES: 'glGetRenderbufferParameteriv',
glFramebufferRenderbufferOES: 'glFramebufferRenderbuffer',
glRenderbufferStorageOES: 'glRenderbufferStorage',
glCheckFramebufferStatusOES: 'glCheckFramebufferStatus',
glDeleteFramebuffersOES: 'glDeleteFramebuffers',
glDeleteRenderbuffersOES: 'glDeleteRenderbuffers',
glFramebufferTexture2DOES: 'glFramebufferTexture2D',

// GLU
Expand Down
36 changes: 5 additions & 31 deletions src/library_webgl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4220,40 +4220,14 @@ createGLPassthroughFunctions(LibraryGL, glPassthroughFuncs);

autoAddDeps(LibraryGL, '$GL');

function copyLibEntry(lib, a, b) {
lib[a] = lib[b];
lib[a + '__postset'] = lib[b + '__postset'];
lib[a + '__proxy'] = lib[b + '__proxy'];
lib[a + '__sig'] = lib[b + '__sig'];
lib[a + '__deps'] = (lib[b + '__deps'] || []).slice(0);
}

function recordGLProcAddressGet(lib) {
// GL proc address retrieval - allow access through glX and emscripten_glX, to allow name collisions with user-implemented things having the same name (see gl.c)
// GL proc address retrieval - allow access through glX and emscripten_glX, to
// allow name collisions with user-implemented things having the same name
// (see gl.c)
Object.keys(lib).forEach((x) => {
if (isJsLibraryConfigIdentifier(x)) return;
if (x.substr(0, 2) != 'gl') return;
while (typeof lib[x] == 'string') {
// resolve aliases right here, simpler for fastcomp
copyLibEntry(lib, x, lib[x]);
if (x.startsWith('gl') && !isJsLibraryConfigIdentifier(x)) {
lib['emscripten_' + x] = x;
}
const y = 'emscripten_' + x;
lib[x + '__deps'] = (lib[x + '__deps'] || []).map((dep) => {
// prefix dependencies as well
if (typeof dep == 'string' && dep[0] == 'g' && dep[1] == 'l' && lib[dep]) {
const orig = dep;
dep = 'emscripten_' + dep;
let fixed = lib[x].toString().replace(new RegExp('_' + orig + '\\(', 'g'), '_' + dep + '(');
// `function` is 8 characters, add space and an explicit name after if there isn't one already
if (fixed.startsWith('function(') || fixed.startsWith('function (')) {
fixed = fixed.substr(0, 8) + ' _' + y + fixed.substr(8);
}
lib[x] = eval('(function() { return ' + fixed + ' })()');
}
return dep;
});
// copy it
copyLibEntry(lib, y, x);
});
}

Expand Down