Added some symbol compatibility for OpenGL1.1.

Added implementations for
- eglTerminate
- eglDestroySurface
- eglDestroyContext
Stubbed out glTextEnvi

4 files changed, 61 insertions, 3 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 6af2ce0b..e9396d69 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -268,7 +268,7 @@ mergeInto(LibraryManager.library, {
       }
       return ctx;
     },
-
+    destroyContext: function(canvas, useWebGL, setInModule) {},
     requestFullScreen: function() {
       var canvas = Module['canvas'];
       function fullScreenChange() {
diff --git a/src/library_egl.js b/src/library_egl.js
index a9eb37dd..271ea29e 100644
--- a/src/library_egl.js
+++ b/src/library_egl.js
@@ -83,6 +83,17 @@ var LibraryEGL = {
     return 1;
   },
   
+// EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
+  eglTerminate: function(display) {
+    if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
+      EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
+      return 0;
+    }
+    // TODO: Tear down EGL here. Currently a no-op since we don't need to actually do anything here for the browser.
+    EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
+    return 1;
+  },
+
   // EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
   eglGetConfigs: function(display, configs, config_size, numConfigs) { 
     return EGL.chooseConfig(display, 0, configs, config_size, numConfigs);
@@ -225,6 +236,20 @@ var LibraryEGL = {
     return 62006; /* Magic ID for Emscripten 'default surface' */
   },
 
+  // EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay display, EGLSurface surface);
+  eglDestroySurface: function(display, surface) { 
+    if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
+      EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
+      return 0; 
+    }
+    if (surface != 62006 /* Magic ID for the only EGLSurface supported by Emscripten */) {
+      EGL.setErrorCode(0x300D /* EGL_BAD_SURFACE */);
+      return 1;
+    }
+    EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
+    return 1; /* Magic ID for Emscripten 'default surface' */
+  },
+
   eglCreateContext__deps: ['glutCreateWindow', '$GL'],
   
   // EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
@@ -234,7 +259,21 @@ var LibraryEGL = {
       return 0;
     }
 
-    _glutCreateWindow();
+    EGL.windowID = _glutCreateWindow();
+    EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
+    return 62004; // Magic ID for Emscripten EGLContext
+  },
+
+  eglDestroyContext__deps: ['glutDestroyWindow', '$GL'],
+  
+  // EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext context);
+  eglDestroyContext: function(display, context) {
+    if (display != 62000 /* Magic ID for Emscripten 'default display' */) {
+      EGL.setErrorCode(0x3008 /* EGL_BAD_DISPLAY */);
+      return 0;
+    }
+
+    _glutDestroyWindow(EGL.windowID);
     EGL.setErrorCode(0x3000 /* EGL_SUCCESS */);
     return 62004; // Magic ID for Emscripten EGLContext
   },
diff --git a/src/library_gl.js b/src/library_gl.js
index 7f0ad4a7..3e273886 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -2600,7 +2600,7 @@ var LibraryGL = {
 
   glTexGeni: function() { throw 'glTexGeni: TODO' },
   glTexGenfv: function() { throw 'glTexGenfv: TODO' },
-  glTexEnvi: function() { throw 'glTexEnvi: TODO' },
+  glTexEnvi: function() { console.log('glTexEnvi - unimplemented') },
   glTexEnvfv: function() { throw 'glTexEnvfv: TODO' },
 
   glTexImage1D: function() { throw 'glTexImage1D: TODO' },
@@ -2614,6 +2614,19 @@ var LibraryGL = {
   glVertexAttribPointer__sig: 'viiiiii',
   glCheckFramebufferStatus__sig: 'ii',
   glRenderbufferStorage__sig: 'viiii',
+  
+  // Open GLES1.1 compatibility
+  glGenFramebuffersOES : 'glGenFramebuffers',
+  glGenRenderbuffersOES : 'glGenRenderbuffers',
+  glBindFramebufferOES : 'glBindFramebuffer',
+  glBindRenderbufferOES : 'glBindRenderbuffer',
+  glGetRenderbufferParameterivOES : 'glGetRenderbufferParameteriv',
+  glFramebufferRenderbufferOES : 'glFramebufferRenderbuffer',
+  glRenderbufferStorageOES : 'glRenderbufferStorage',
+  glCheckFramebufferStatusOES : 'glCheckFramebufferStatus',
+  glDeleteFramebuffersOES : 'glDeleteFramebuffers',
+  glDeleteRenderbuffersOES : 'glDeleteRenderbuffers'
+  
 };
 
 // Simple pass-through functions. Starred ones have return values. [X] ones have X in the C name but not in the JS name
diff --git a/src/library_glut.js b/src/library_glut.js
index 2e662698..bb4dfefa 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -381,6 +381,12 @@ var LibraryGLUT = {
     return 1;
   },
 
+  glutDestroyWindow__deps: ['$Browser'],
+  glutDestroyWindow: function(name) {
+    Module.ctx = Browser.destroyContext(Module['canvas'], true, true);
+    return 1;
+  },
+
   glutReshapeWindow__deps: ['$GLUT', 'glutPostRedisplay'],
   glutReshapeWindow: function(width, height) {
     GLUT.cancelFullScreen();