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.

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

chrome_webgl2_workaround #4945

Merged
merged 1 commit into from
Feb 16, 2017
Merged

Conversation

juj
Copy link
Collaborator

@juj juj commented Feb 14, 2017

Work around the issue that Chrome 56 and Chrome 57 shipped WebGL 2 without the new WebGL 2 function entry points. Fix a bug in glBufferData() where legacy GL emulation was used without gating for #if LEGACY_GL_EMULATION.

@juj juj added the GL label Feb 14, 2017
@@ -1507,17 +1513,24 @@ var LibraryGL = {
usage = 0x88E8; // GL_DYNAMIC_DRAW
break;
}
#endif
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block was actually missing #if LEGACY_GL_EMULATION, coming from an old commit d2a3ea8.

…thout the new WebGL 2 function entry points. Fix a bug in glBufferData() where legacy GL emulation was used without gating for #if LEGACY_GL_EMULATION.
Copy link

@gouletr gouletr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified, the error goes away in Chrome 56.

@kripken
Copy link
Member

kripken commented Feb 14, 2017

Overall lgtm, but do we not expect chrome to fix this soon? (if soon, then maybe best to just wait?)

@gouletr
Copy link

gouletr commented Feb 14, 2017

@kripken without this fix we can't upgrade Emscripten otherwise it breaks running in Chrome release today.

@kripken
Copy link
Member

kripken commented Feb 14, 2017

I see, ok.

@juj
Copy link
Collaborator Author

juj commented Feb 16, 2017

Overall lgtm, but do we not expect chrome to fix this soon? (if soon, then maybe best to just wait?)

They said they will have the fix in Chrome 58, and they're asking to land this workaround in the meanwhile and not wait. So I'll go ahead and push this in.

Thanks @gouletr for testing!

@juj juj merged commit 42ffd7a into emscripten-core:incoming Feb 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants