diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-16 10:42:08 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-16 10:42:08 -0700 |
| commit | 86fe72e8bfdcf5e6518c7e615ce599d1c6c491dd (patch) | |
| tree | 53e56b4bb071578fbe409e3e21383dbb8a4df3f6 /src/library_egl.js | |
| parent | 9ca5fc4f2af23e78e8f44e89b5024588d0f57cf8 (diff) | |
| parent | c2ace4f8473ca8851be15d1f49f3f8bc2bb76ce5 (diff) | |
Merge branch 'antialiasing' of github.com:wsmind/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'src/library_egl.js')
| -rw-r--r-- | src/library_egl.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/library_egl.js b/src/library_egl.js index ff912ed2..c25dc8ef 100644 --- a/src/library_egl.js +++ b/src/library_egl.js @@ -170,10 +170,10 @@ var LibraryEGL = { {{{ makeSetValue('value', '0', '0x3038' /* EGL_NONE */, 'i32') }}}; return 1; case 0x3031: // EGL_SAMPLES - {{{ makeSetValue('value', '0', '0' /* No multisampling. */, 'i32') }}}; + {{{ makeSetValue('value', '0', '4' /* 2x2 Multisampling */, 'i32') }}}; return 1; case 0x3032: // EGL_SAMPLE_BUFFERS - {{{ makeSetValue('value', '0', '0' /* No multisampling. */, 'i32') }}}; + {{{ makeSetValue('value', '0', '1' /* Multisampling enabled */, 'i32') }}}; return 1; case 0x3033: // EGL_SURFACE_TYPE {{{ makeSetValue('value', '0', '0x0004' /* EGL_WINDOW_BIT */, 'i32') }}}; @@ -250,7 +250,7 @@ var LibraryEGL = { return 1; /* Magic ID for Emscripten 'default surface' */ }, - eglCreateContext__deps: ['glutCreateWindow', '$GL'], + eglCreateContext__deps: ['glutInitDisplayMode', 'glutCreateWindow', '$GL'], // EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); eglCreateContext: function(display, config, hmm, contextAttribs) { @@ -259,6 +259,7 @@ var LibraryEGL = { return 0; } + _glutInitDisplayMode(0x92 /* GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE */); EGL.windowID = _glutCreateWindow(); if (EGL.windowID != 0) { EGL.setErrorCode(0x3000 /* EGL_SUCCESS */); |