Skip to content
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

Fix GL emulation with meta-dce #5964

Closed
wants to merge 3 commits into from
Closed

Fix GL emulation with meta-dce #5964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76a63d4
fix gl emulation with metadce - it assumed, incorrectly, that various…
kripken Dec 22, 2017
b9956ab
fix
kripken Dec 22, 2017
a559322
fix
kripken Dec 22, 2017
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
57 changes: 30 additions & 27 deletions src/library_gl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4052,7 +4052,10 @@ var LibraryGL = {
{{{ (updateExport = function(){ return '' }, '') }}}
#endif

var glEnable = _glEnable;
// DCE might get rid of some of the functions we would override; make sure we don't throw an error trying to find them
{{{ (getIfDefined = function(x){ return '(typeof ' + x + ' !== "undefined" ? ' + x + ' : function(){})' }, '') }}}

var glEnable = {{{ getIfDefined('_glEnable') }}};
_glEnable = _emscripten_glEnable = function _glEnable(cap) {
// Clean up the renderer on any change to the rendering state. The optimization of
// skipping renderer setup is aimed at the case of multiple glDraw* right after each other
Expand All @@ -4078,7 +4081,7 @@ var LibraryGL = {
};
{{{ updateExport('glEnable') }}}

var glDisable = _glDisable;
var glDisable = {{{ getIfDefined('_glDisable') }}};
_glDisable = _emscripten_glDisable = function _glDisable(cap) {
if (GLImmediate.lastRenderer) GLImmediate.lastRenderer.cleanup();
if (cap == 0x0B60 /* GL_FOG */) {
Expand Down Expand Up @@ -4112,7 +4115,7 @@ var LibraryGL = {
};
{{{ updateExport('glIsEnabled') }}}

var glGetBooleanv = _glGetBooleanv;
var glGetBooleanv = {{{ getIfDefined('_glGetBooleanv') }}};
_glGetBooleanv = _emscripten_glGetBooleanv = function _glGetBooleanv(pname, p) {
var attrib = GLEmulation.getAttributeFromCapability(pname);
if (attrib !== null) {
Expand All @@ -4124,7 +4127,7 @@ var LibraryGL = {
};
{{{ updateExport('glGetBooleanv') }}}

var glGetIntegerv = _glGetIntegerv;
var glGetIntegerv = {{{ getIfDefined('_glGetIntegerv') }}};
_glGetIntegerv = _emscripten_glGetIntegerv = function _glGetIntegerv(pname, params) {
switch (pname) {
case 0x84E2: pname = GLctx.MAX_TEXTURE_IMAGE_UNITS /* fake it */; break; // GL_MAX_TEXTURE_UNITS
Expand Down Expand Up @@ -4194,7 +4197,7 @@ var LibraryGL = {
};
{{{ updateExport('glGetIntegerv') }}}

var glGetString = _glGetString;
var glGetString = {{{ getIfDefined('_glGetString') }}};
_glGetString = _emscripten_glGetString = function _glGetString(name_) {
if (GL.stringCache[name_]) return GL.stringCache[name_];
switch(name_) {
Expand All @@ -4219,7 +4222,7 @@ var LibraryGL = {
GL.shaderSources = {};
GL.shaderOriginalSources = {};
#endif
var glCreateShader = _glCreateShader;
var glCreateShader = {{{ getIfDefined('_glCreateShader') }}};
_glCreateShader = _emscripten_glCreateShader = function _glCreateShader(shaderType) {
var id = glCreateShader(shaderType);
GL.shaderInfos[id] = {
Expand All @@ -4237,7 +4240,7 @@ var LibraryGL = {
return source;
}

var glShaderSource = _glShaderSource;
var glShaderSource = {{{ getIfDefined('_glShaderSource') }}};
_glShaderSource = _emscripten_glShaderSource = function _glShaderSource(shader, count, string, length) {
var source = GL.getSource(shader, count, string, length);
#if GL_DEBUG
Expand Down Expand Up @@ -4352,7 +4355,7 @@ var LibraryGL = {
};
{{{ updateExport('glShaderSource') }}}

var glCompileShader = _glCompileShader;
var glCompileShader = {{{ getIfDefined('_glCompileShader') }}};
_glCompileShader = _emscripten_glCompileShader = function _glCompileShader(shader) {
GLctx.compileShader(GL.shaders[shader]);
#if GL_DEBUG
Expand All @@ -4368,15 +4371,15 @@ var LibraryGL = {
{{{ updateExport('glCompileShader') }}}

GL.programShaders = {};
var glAttachShader = _glAttachShader;
var glAttachShader = {{{ getIfDefined('_glAttachShader') }}};
_glAttachShader = _emscripten_glAttachShader = function _glAttachShader(program, shader) {
if (!GL.programShaders[program]) GL.programShaders[program] = [];
GL.programShaders[program].push(shader);
glAttachShader(program, shader);
};
{{{ updateExport('glAttachShader') }}}

var glDetachShader = _glDetachShader;
var glDetachShader = {{{ getIfDefined('_glDetachShader') }}};
_glDetachShader = _emscripten_glDetachShader = function _glDetachShader(program, shader) {
var programShader = GL.programShaders[program];
if (!programShader) {
Expand All @@ -4389,7 +4392,7 @@ var LibraryGL = {
};
{{{ updateExport('glDetachShader') }}}

var glUseProgram = _glUseProgram;
var glUseProgram = {{{ getIfDefined('_glUseProgram') }}};
_glUseProgram = _emscripten_glUseProgram = function _glUseProgram(program) {
#if GL_DEBUG
if (GL.debug) {
Expand All @@ -4411,7 +4414,7 @@ var LibraryGL = {
}
{{{ updateExport('glUseProgram') }}}

var glDeleteProgram = _glDeleteProgram;
var glDeleteProgram = {{{ getIfDefined('_glDeleteProgram') }}};
_glDeleteProgram = _emscripten_glDeleteProgram = function _glDeleteProgram(program) {
glDeleteProgram(program);
if (program == GL.currProgram) {
Expand All @@ -4423,14 +4426,14 @@ var LibraryGL = {

// If attribute 0 was not bound, bind it to 0 for WebGL performance reasons. Track if 0 is free for that.
var zeroUsedPrograms = {};
var glBindAttribLocation = _glBindAttribLocation;
var glBindAttribLocation = {{{ getIfDefined('_glBindAttribLocation') }}};
_glBindAttribLocation = _emscripten_glBindAttribLocation = function _glBindAttribLocation(program, index, name) {
if (index == 0) zeroUsedPrograms[program] = true;
glBindAttribLocation(program, index, name);
};
{{{ updateExport('glBindAttribLocation') }}}

var glLinkProgram = _glLinkProgram;
var glLinkProgram = {{{ getIfDefined('_glLinkProgram') }}};
_glLinkProgram = _emscripten_glLinkProgram = function _glLinkProgram(program) {
if (!(program in zeroUsedPrograms)) {
GLctx.bindAttribLocation(GL.programs[program], 0, 'a_position');
Expand All @@ -4439,7 +4442,7 @@ var LibraryGL = {
};
{{{ updateExport('glLinkProgram') }}}

var glBindBuffer = _glBindBuffer;
var glBindBuffer = {{{ getIfDefined('_glBindBuffer') }}};
_glBindBuffer = _emscripten_glBindBuffer = function _glBindBuffer(target, buffer) {
glBindBuffer(target, buffer);
if (target == GLctx.ARRAY_BUFFER) {
Expand All @@ -4455,7 +4458,7 @@ var LibraryGL = {
};
{{{ updateExport('glBindBuffer') }}}

var glGetFloatv = _glGetFloatv;
var glGetFloatv = {{{ getIfDefined('_glGetFloatv') }}};
_glGetFloatv = _emscripten_glGetFloatv = function _glGetFloatv(pname, params) {
if (pname == 0x0BA6) { // GL_MODELVIEW_MATRIX
HEAPF32.set(GLImmediate.matrix[0/*m*/], params >> 2);
Expand All @@ -4479,7 +4482,7 @@ var LibraryGL = {
};
{{{ updateExport('glGetFloatv') }}}

var glHint = _glHint;
var glHint = {{{ getIfDefined('_glHint') }}};
_glHint = _emscripten_glHint = function _glHint(target, mode) {
if (target == 0x84EF) { // GL_TEXTURE_COMPRESSION_HINT
return;
Expand All @@ -4488,23 +4491,23 @@ var LibraryGL = {
};
{{{ updateExport('glHint') }}}

var glEnableVertexAttribArray = _glEnableVertexAttribArray;
var glEnableVertexAttribArray = {{{ getIfDefined('_glEnableVertexAttribArray') }}};
_glEnableVertexAttribArray = _emscripten_glEnableVertexAttribArray = function _glEnableVertexAttribArray(index) {
glEnableVertexAttribArray(index);
GLEmulation.enabledVertexAttribArrays[index] = 1;
if (GLEmulation.currentVao) GLEmulation.currentVao.enabledVertexAttribArrays[index] = 1;
};
{{{ updateExport('glEnableVertexAttribArray') }}}

var glDisableVertexAttribArray = _glDisableVertexAttribArray;
var glDisableVertexAttribArray = {{{ getIfDefined('_glDisableVertexAttribArray') }}};
_glDisableVertexAttribArray = _emscripten_glDisableVertexAttribArray = function _glDisableVertexAttribArray(index) {
glDisableVertexAttribArray(index);
delete GLEmulation.enabledVertexAttribArrays[index];
if (GLEmulation.currentVao) delete GLEmulation.currentVao.enabledVertexAttribArrays[index];
};
{{{ updateExport('glDisableVertexAttribArray') }}}

var glVertexAttribPointer = _glVertexAttribPointer;
var glVertexAttribPointer = {{{ getIfDefined('_glVertexAttribPointer') }}};
_glVertexAttribPointer = _emscripten_glVertexAttribPointer = function _glVertexAttribPointer(index, size, type, normalized, stride, pointer) {
glVertexAttribPointer(index, size, type, normalized, stride, pointer);
if (GLEmulation.currentVao) { // TODO: avoid object creation here? likely not hot though
Expand Down Expand Up @@ -6405,44 +6408,44 @@ var LibraryGL = {
GLEmulation.init();
}

var glActiveTexture = _glActiveTexture;
var glActiveTexture = {{{ getIfDefined('_glActiveTexture') }}};
_glActiveTexture = _emscripten_glActiveTexture = function _glActiveTexture(texture) {
GLImmediate.TexEnvJIT.hook_activeTexture(texture);
glActiveTexture(texture);
};
{{{ updateExport('glActiveTexture') }}}

var glEnable = _glEnable;
var glEnable = {{{ getIfDefined('_glEnable') }}};
_glEnable = _emscripten_glEnable = function _glEnable(cap) {
GLImmediate.TexEnvJIT.hook_enable(cap);
glEnable(cap);
};
{{{ updateExport('glEnable') }}}

var glDisable = _glDisable;
var glDisable = {{{ getIfDefined('_glDisable') }}};
_glDisable = _emscripten_glDisable = function _glDisable(cap) {
GLImmediate.TexEnvJIT.hook_disable(cap);
glDisable(cap);
};
{{{ updateExport('glDisable') }}}

var glTexEnvf = (typeof(_glTexEnvf) != 'undefined') ? _glTexEnvf : function(){};
var glTexEnvf = {{{ getIfDefined('_glTexEnvf') }}};
_glTexEnvf = _emscripten_glTexEnvf = function _glTexEnvf(target, pname, param) {
GLImmediate.TexEnvJIT.hook_texEnvf(target, pname, param);
// Don't call old func, since we are the implementor.
//glTexEnvf(target, pname, param);
};
{{{ updateExport('glTexEnvf') }}}

var glTexEnvi = (typeof(_glTexEnvi) != 'undefined') ? _glTexEnvi : function(){};
var glTexEnvi = {{{ getIfDefined('_glTexEnvi') }}};
_glTexEnvi = _emscripten_glTexEnvi = function _glTexEnvi(target, pname, param) {
GLImmediate.TexEnvJIT.hook_texEnvi(target, pname, param);
// Don't call old func, since we are the implementor.
//glTexEnvi(target, pname, param);
};
{{{ updateExport('glTexEnvi') }}}

var glTexEnvfv = (typeof(_glTexEnvfv) != 'undefined') ? _glTexEnvfv : function(){};
var glTexEnvfv = {{{ getIfDefined('_glTexEnvfv') }}};
_glTexEnvfv = _emscripten_glTexEnvfv = function _glTexEnvfv(target, pname, param) {
GLImmediate.TexEnvJIT.hook_texEnvfv(target, pname, param);
// Don't call old func, since we are the implementor.
Expand All @@ -6460,7 +6463,7 @@ var LibraryGL = {
};
{{{ updateExport('glGetTexEnvfv') }}}

var glGetIntegerv = _glGetIntegerv;
var glGetIntegerv = {{{ getIfDefined('_glGetIntegerv') }}};
_glGetIntegerv = _emscripten_glGetIntegerv = function _glGetIntegerv(pname, params) {
switch (pname) {
case 0x8B8D: { // GL_CURRENT_PROGRAM
Expand Down
5 changes: 3 additions & 2 deletions tests/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,8 +1787,9 @@ def test_cubegeom_proc(self):
return glBindBuffer;
}
''')
for opts in [0, 1]:
self.btest('cubegeom_proc.c', reference='cubegeom.png', args=['-O' + str(opts), 'side.c', '-s', 'LEGACY_GL_EMULATION=1', '-lGL', '-lSDL'])
# also test -Os in wasm, which uses meta-dce, which should not break legacy gl emulation hacks
for opts in [[], ['-O1'], ['-Os', '-s', 'WASM=1']]:
self.btest('cubegeom_proc.c', reference='cubegeom.png', args=opts + ['side.c', '-s', 'LEGACY_GL_EMULATION=1', '-lGL', '-lSDL'])

def test_cubegeom_glew(self):
self.btest('cubegeom_glew.c', reference='cubegeom.png', args=['-O2', '--closure', '1', '-s', 'LEGACY_GL_EMULATION=1', '-lGL', '-lGLEW', '-lSDL'])
Expand Down