Unity-Technologies
/
emscripten
зеркало из https://github.com/Unity-Technologies/emscripten.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

move emscripten_GetProcAddress to a C library, so that it is less hackish and can work in fastcomp

This commit is contained in:
Alon Zakai 2014-02-08 20:44:26 -08:00
Родитель b3ab733682
Коммит 475548d8c3
8 изменённых файлов: 1767 добавлений и 83 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
src/deps_info.json
Просмотреть файл

@ -1,5 +1,7 @@
{
"uuid_compare": ["memcmp"],
"SDL_Init": ["malloc", "free"]
"SDL_Init": ["malloc", "free"],
"SDL_GL_GetProcAddress": ["emscripten_GetProcAddress"],
"eglGetProcAddress": ["emscripten_GetProcAddress"]
}

2
src/library_egl.js
Просмотреть файл

@ -555,7 +555,7 @@ var LibraryEGL = {
eglGetProcAddress__deps: ['emscripten_GetProcAddress'],
eglGetProcAddress: function(name_) {
return _emscripten_GetProcAddress(Pointer_stringify(name_));
return _emscripten_GetProcAddress(name_);
},
};

99
src/library_gl.js
Просмотреть файл

@ -2325,6 +2325,7 @@ var LibraryGL = {
Module.printErr('WARNING: deleteObject received invalid id: ' + id);
}
},
glDeleteObjectARB: 'glDeleteObject',
glGetObjectParameteriv__sig: 'viii',
glGetObjectParameteriv: function(id, type, result) {
@ -2347,6 +2348,7 @@ var LibraryGL = {
Module.printErr('WARNING: getObjectParameteriv received invalid id: ' + id);
}
},
glGetObjectParameterivARB: 'glGetObjectParameteriv',
glGetInfoLog__sig: 'viiii',
glGetInfoLog: function(id, maxLength, length, infoLog) {
@ -2358,6 +2360,7 @@ var LibraryGL = {
Module.printErr('WARNING: getObjectParameteriv received invalid id: ' + id);
}
},
glGetInfoLogARB: 'glGetInfoLog',
glBindProgram__sig: 'vii',
glBindProgram: function(type, id) {
@ -2365,6 +2368,7 @@ var LibraryGL = {
assert(id == 0);
#endif
},
glBindProgramARB: 'glBindProgram',
glGetPointerv: function(name, p) {
var attribute;
@ -5031,39 +5035,11 @@ var LibraryGL = {
#else // LEGACY_GL_EMULATION
// Warn if code tries to use various emulation stuff, when emulation is disabled
// (do not warn if INCLUDE_FULL_LIBRARY is one, because then likely the gl code will
// not be called anyhow, leave only the runtime aborts)
glVertexPointer__deps: [function() {
#if INCLUDE_FULL_LIBRARY == 0
warn('Legacy GL function (glVertexPointer) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.');
#endif
}],
glVertexPointer: function(){ throw 'Legacy GL function (glVertexPointer) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glGenVertexArrays__deps: [function() {
#if INCLUDE_FULL_LIBRARY == 0
warn('Legacy GL function (glGenVertexArrays) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.');
#endif
}],
glGenVertexArrays: function(){ throw 'Legacy GL function (glGenVertexArrays) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glMatrixMode__deps: [function() {
#if INCLUDE_FULL_LIBRARY == 0
warn('Legacy GL function (glMatrixMode) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.');
#endif
}],
glMatrixMode: function(){ throw 'Legacy GL function (glMatrixMode) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glBegin__deps: [function() {
#if INCLUDE_FULL_LIBRARY == 0
warn('Legacy GL function (glBegin) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.');
#endif
}],
glBegin: function(){ throw 'Legacy GL function (glBegin) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glLoadIdentity__deps: [function() {
#if INCLUDE_FULL_LIBRARY == 0
warn('Legacy GL function (glLoadIdentity) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.');
#endif
}],
glLoadIdentity: function(){ throw 'Legacy GL function (glLoadIdentity) called. You need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glVertexPointer: function(){ throw 'Legacy GL function (glVertexPointer) called. If you want legacy GL emulation, you need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glGenVertexArrays: function(){ throw 'Legacy GL function (glGenVertexArrays) called. If you want legacy GL emulation, you need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glMatrixMode: function(){ throw 'Legacy GL function (glMatrixMode) called. If you want legacy GL emulation, you need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glBegin: function(){ throw 'Legacy GL function (glBegin) called. If you want legacy GL emulation, you need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
glLoadIdentity: function(){ throw 'Legacy GL function (glLoadIdentity) called. If you want legacy GL emulation, you need to compile with -s LEGACY_GL_EMULATION=1 to enable legacy GL emulation.'; },
#endif // LEGACY_GL_EMULATION
@ -5374,52 +5350,17 @@ if (LEGACY_GL_EMULATION) {
DEFAULT_LIBRARY_FUNCS_TO_INCLUDE.push('$GLEmulation');
}
// GL proc address retrieval
LibraryGL.emscripten_GetProcAddress__deps = [function() {
// ProcAddress is used, so include everything in GL. This runs before we go to the $ProcAddressTable object,
// and we fill its deps just in time, and create the lookup table
var table = {};
LibraryManager.library.emscripten_procAddressTable__deps = keys(LibraryGL).map(function(x) {
if (x.substr(-6) == '__deps' || x.substr(-9) == '__postset' || x.substr(-5) == '__sig' || x.substr(-5) == '__asm' || x.substr(0, 2) != 'gl') return null;
var original = x;
if (('_' + x) in Functions.implementedFunctions) {
// a user-implemented function aliases this one, but we still want it to be accessible by name, so rename it
var y = x + '__procTable';
LibraryManager.library[y] = LibraryManager.library[x];
LibraryManager.library[y + '__deps'] = LibraryManager.library[x + '__deps'];
LibraryManager.library[y + '__postset'] = LibraryManager.library[x + '__postset'];
LibraryManager.library[y + '__sig'] = LibraryManager.library[x + '__sig'];//|| Functions.implementedFunctions['_' + x];
LibraryManager.library[y + '__asm'] = LibraryManager.library[x + '__asm'];
x = y;
assert(!(y in Functions.implementedFunctions) && !Functions.unimplementedFunctions['_' + y]);
}
var longX = '_' + x;
var sig = LibraryManager.library[x + '__sig'] || functionStubSigs[longX];
if (sig) {
table[original] = Functions.getIndex(longX, sig);
if (!(longX in Functions.implementedFunctions)) Functions.unimplementedFunctions[longX] = sig;
}
return x;
}).filter(function(x) { return x !== null });
// convert table into function with switch, to not confuse closure compiler
var tableImpl = 'switch(name) {\n';
for (var x in table) tableImpl += 'case "' + x + '": return ' + table[x] + '; break;\n';
tableImpl += '}\nreturn 0;';
LibraryManager.library.emscripten_procAddressTable = new Function('name', tableImpl);
}, 'emscripten_procAddressTable'];
LibraryGL.emscripten_GetProcAddress = function _LibraryGL_emscripten_GetProcAddress(name) {
name = name.replace('EXT', '').replace('ARB', '');
switch(name) { // misc renamings
case 'glCreateProgramObject': name = 'glCreateProgram'; break;
case 'glUseProgramObject': name = 'glUseProgram'; break;
case 'glCreateShaderObject': name = 'glCreateShader'; break;
case 'glAttachObject': name = 'glAttachShader'; break;
case 'glDetachObject': name = 'glDetachShader'; break;
}
var ret = _emscripten_procAddressTable(name);
if (!ret) Module.printErr('WARNING: getProcAddress failed for ' + name);
return ret;
}
// 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)
keys(LibraryGL).forEach(function(x) {
if (x.substr(-6) == '__deps' || x.substr(-9) == '__postset' || x.substr(-5) == '__sig' || x.substr(-5) == '__asm' || x.substr(0, 2) != 'gl') return;
var original = x;
var y = 'emscripten_' + x;
LibraryGL[y] = LibraryGL[x];
LibraryGL[y + '__deps'] = LibraryGL[x + '__deps']; // note that we might want to rename in the deps as well
LibraryGL[y + '__postset'] = LibraryGL[x + '__postset'];
LibraryGL[y + '__sig'] = LibraryGL[x + '__sig'];
LibraryGL[y + '__asm'] = LibraryGL[x + '__asm'];
});
// Final merge
mergeInto(LibraryManager.library, LibraryGL);

2
src/library_sdl.js
Просмотреть файл

@ -2487,7 +2487,7 @@ var LibrarySDL = {
SDL_GL_GetProcAddress__deps: ['emscripten_GetProcAddress'],
SDL_GL_GetProcAddress: function(name_) {
return _emscripten_GetProcAddress(Pointer_stringify(name_));
return _emscripten_GetProcAddress(name_);
},
SDL_GL_SwapBuffers: function() {},

1729
system/lib/gl.c Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1
system/lib/gl.symbols Normal file
Просмотреть файл

@ -0,0 +1 @@
T emscripten_GetProcAddress

2
tools/shared.py
Просмотреть файл

@ -345,7 +345,7 @@ def find_temp_directory():
# we re-check sanity when the settings are changed)
# We also re-check sanity and clear the cache when the version changes
EMSCRIPTEN_VERSION = '1.10.2'
EMSCRIPTEN_VERSION = '1.10.3'
def generate_sanity():
return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT + '|' + get_clang_version()

11
tools/system_libs.py
Просмотреть файл

@ -20,6 +20,7 @@ def calculate(temp_files, in_temp, stdout, stderr):
libcextra_symbols = read_symbols(shared.path_from_root('system', 'lib', 'libcextra.symbols'))
libcxx_symbols = read_symbols(shared.path_from_root('system', 'lib', 'libcxx', 'symbols'), exclude=libc_symbols)
libcxxabi_symbols = read_symbols(shared.path_from_root('system', 'lib', 'libcxxabi', 'symbols'), exclude=libc_symbols)
gl_symbols = read_symbols(shared.path_from_root('system', 'lib', 'gl.symbols'))
# XXX we should disable EMCC_DEBUG when building libs, just like in the relooper
@ -322,6 +323,15 @@ def calculate(temp_files, in_temp, stdout, stderr):
#shared.Settings.CORRECT_SIGNS = shared.Settings.CORRECT_OVERFLOWS = shared.Settings.CORRECT_ROUNDINGS = 1
return True
# gl
def create_gl():
prev_cxx = os.environ.get('EMMAKEN_CXX')
if prev_cxx: os.environ['EMMAKEN_CXX'] = ''
o = in_temp('gl.o')
execute([shared.PYTHON, shared.EMCC, shared.path_from_root('system', 'lib', 'gl.c'), '-o', o])
if prev_cxx: os.environ['EMMAKEN_CXX'] = prev_cxx
return o
# Settings this in the environment will avoid checking dependencies and make building big projects a little faster
# 1 means include everything; otherwise it can be the name of a lib (libcxx, etc.)
force = os.environ.get('EMCC_FORCE_STDLIBS')
@ -359,6 +369,7 @@ def calculate(temp_files, in_temp, stdout, stderr):
for name, create, apply_, library_symbols in [('libcxx', create_libcxx, apply_libcxx, libcxx_symbols),
('libcextra', create_libcextra, lambda x: True, libcextra_symbols),
('libcxxabi', create_libcxxabi, apply_libcxxabi, libcxxabi_symbols),
('gl', create_gl, lambda x: True, gl_symbols),
('libc', create_libc, apply_libc, libc_symbols)]:
force_this = force_all or force == name
if not force_this: