Merge pull request #359 from prenaux/develop

library.js, added llvm_invariant_start/end & llvm_bswap_i16 ; hello_world_gles.c, added F11 for fullscreen ;

3 files changed, 28 insertions, 5 deletions

diff --git a/src/library.js b/src/library.js
index c491f078..7a46a68f 100644
--- a/src/library.js
+++ b/src/library.js
@@ -1867,7 +1867,7 @@ LibraryManager.library = {
 
 #if CATCH_EXIT_CODE
     throw new ExitStatus();
-#else 
+#else
     throw 'exit(' + status + ') called, at ' + new Error().stack;
 #endif
   },
@@ -4394,6 +4394,21 @@ LibraryManager.library = {
     */
   },
 
+  llvm_bswap_i16: function(x) {
+    x = unSign(x, 32);
+    var bytes = [];
+    bytes[0] = x & 255;
+    x >>= 8;
+    bytes[1] = x & 255;
+    x >>= 8;
+    var ret = 0;
+    ret <<= 8;
+    ret += bytes[0];
+    ret <<= 8;
+    ret += bytes[1];
+    return ret;
+  },
+
   llvm_bswap_i32: function(x) {
     x = unSign(x, 32);
     var bytes = [];
@@ -4408,7 +4423,7 @@ LibraryManager.library = {
     }
     return ret;
   },
-  
+
   llvm_ctlz_i32: function(x) {
     for (var i=0; i<32; i++) {
         if ( (x & (1 << (31-i))) != 0 ) {
@@ -4711,6 +4726,9 @@ LibraryManager.library = {
   llvm_lifetime_start: function() {},
   llvm_lifetime_end: function() {},
 
+  llvm_invariant_start: function() {},
+  llvm_invariant_end: function() {},
+
   // ==========================================================================
   // math.h
   // ==========================================================================
@@ -4935,7 +4953,7 @@ LibraryManager.library = {
     if (isNaN(x)) return {{{ cDefine('FP_NAN') }}};
     if (!isFinite(x)) return {{{ cDefine('FP_INFINITE') }}};
     if (x == 0) return {{{ cDefine('FP_ZERO') }}};
-    // FP_SUBNORMAL..?  
+    // FP_SUBNORMAL..?
     return {{{ cDefine('FP_NORMAL') }}};
   },
   __fpclassifyd: '__fpclassifyf',
diff --git a/src/library_gl.js b/src/library_gl.js
index deb39a03..983d1e2c 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -116,6 +116,8 @@ var LibraryGL = {
         return allocate(intArrayFromString(Module.ctx.getParameter(name_)), 'i8', ALLOC_NORMAL);
       case 0x1F03 /* GL_EXTENSIONS */:
         return allocate(intArrayFromString(Module.ctx.getSupportedExtensions().join(' ')), 'i8', ALLOC_NORMAL);
+      case 0x8B8C /*GL_SHADING_LANGUAGE_VERSION*/:
+        return allocate(intArrayFromString("OpenGL ES GLSL ES 1.00 (WebGL)"), 'i8', ALLOC_NORMAL);
       default:
         throw 'Failure: Invalid glGetString value: ' + name_;
     }
diff --git a/src/library_glut.js b/src/library_glut.js
index e4b2d138..9ad83684 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -226,13 +226,13 @@ var LibraryGLUT = {
     onFullScreenEventChange: function(event){
       var width;
       var height;
-      if (document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen) {
+      if (document["fullScreen"] || document["mozFullScreen"] || document["webkitIsFullScreen"]) {
         width = screen["width"];
         height = screen["height"];
       } else {
         width = GLUT.windowWidth;
         height = GLUT.windowHeight;
-	// TODO set position
+	    // TODO set position
         document.removeEventListener('fullscreenchange', GLUT.onFullScreenEventChange, true);
         document.removeEventListener('mozfullscreenchange', GLUT.onFullScreenEventChange, true);
         document.removeEventListener('webkitfullscreenchange', GLUT.onFullScreenEventChange, true);
@@ -241,6 +241,7 @@ var LibraryGLUT = {
       Module['canvas'].height = height;
       /* Can't call _glutReshapeWindow as that requests cancelling fullscreen. */
       if (GLUT.reshapeFunc) {
+        // console.log("GLUT.reshapeFunc (from FS): " + width + ", " + height);
         FUNCTION_TABLE[GLUT.reshapeFunc](width, height);
       }
       _glutPostRedisplay();
@@ -378,9 +379,11 @@ var LibraryGLUT = {
   glutReshapeWindow__deps: ['$GLUT', 'glutPostRedisplay'],
   glutReshapeWindow: function(width, height) {
     GLUT.cancelFullScreen();
+    // console.log("glutReshapeWindow: " + width + ", " + height);
     Module['canvas'].width  = width;
     Module['canvas'].height = height;
     if (GLUT.reshapeFunc) {
+      // console.log("GLUT.reshapeFunc: " + width + ", " + height);
       FUNCTION_TABLE[GLUT.reshapeFunc](width, height);
     }
     _glutPostRedisplay();