Merge remote-tracking branch 'upstream/incoming' into gl_small_fixes

Conflicts:
	src/library_gl.js

1 files changed, 1 insertions, 0 deletions

diff --git a/src/settings.js b/src/settings.js
index 15c92176..901812b6 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -101,6 +101,7 @@ var SAFE_HEAP_LOG = 0; // Log out all SAFE_HEAP operations
 var LABEL_DEBUG = 0; // Print out labels and functions as we enter them
 var EXCEPTION_DEBUG = 1; // Print out exceptions in emscriptened code
 var LIBRARY_DEBUG = 0; // Print out when we enter a library call (library*.js)
+var GL_DEBUG = 0; // Print out all calls into WebGL
 var DISABLE_EXCEPTION_CATCHING = 0; // Disables generating code to actually catch exceptions. If the code you
                                     // are compiling does not actually rely on catching exceptions (but the
                                     // compiler generates code for it, maybe because of stdlibc++ stuff),