Merge branch 'incoming' into f32

Conflicts:
	src/parseTools.js

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/test_webgl_context_attributes_glut.c b/tests/test_webgl_context_attributes_glut.c
new file mode 100644
index 00000000..3255fc9a
--- /dev/null
+++ b/tests/test_webgl_context_attributes_glut.c
@@ -0,0 +1,42 @@
+#include <GL/glew.h>
+#include <GL/glut.h>
+#include <emscripten.h>
+
+#include "test_webgl_context_attributes_common.c"
+
+int main(int argc, char *argv[]) {
+    
+    checkContextAttributesSupport(); 
+    
+    unsigned int glutDisplayMode = GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA;
+        
+#ifdef AA_ACTIVATED
+    antiAliasingActivated = true;
+    glutDisplayMode |= GLUT_MULTISAMPLE;
+#endif
+    
+#ifdef DEPTH_ACTIVATED
+    depthActivated = true;
+    glutDisplayMode |= GLUT_DEPTH;
+#endif
+    
+#ifdef STENCIL_ACTIVATED
+    stencilActivated = true;
+    glutDisplayMode |= GLUT_STENCIL;
+#endif
+    
+    glutInit(&argc, argv);
+    glutInitWindowSize(WINDOWS_SIZE, WINDOWS_SIZE);
+    glutInitDisplayMode(glutDisplayMode);
+    glutCreateWindow("WebGL");
+    glutDisplayFunc(draw);  
+     
+    glewInit();
+    initGlObjects();
+    
+    draw();
+    
+    REPORT_RESULT();
+    
+    return 0;
+}