aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-08-15 12:55:04 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-08-15 12:55:04 -0700
commitdf70b6582ddd4e50d92bf7cb0142b39285c9747e (patch)
treee884402eaa44e71a2ae99953b82c390e3234daed
parent19047555b54a8190a927e77f2d1c73410ad4fd0a (diff)
parentdeb278c645e1f0c8a5584cc3e0461086860d0e2f (diff)
Merge pull request #1526 from inolen/glcompileshader
don't check COMPILE_STATUS in glCompileShader by default
-rw-r--r--src/library_gl.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index 17595021..89a13bbe 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -1618,17 +1618,15 @@ var LibraryGL = {
var glCompileShader = _glCompileShader;
_glCompileShader = function(shader) {
Module.ctx.compileShader(GL.shaders[shader]);
+#if GL_DEBUG
if (!Module.ctx.getShaderParameter(GL.shaders[shader], Module.ctx.COMPILE_STATUS)) {
Module.printErr('Failed to compile shader: ' + Module.ctx.getShaderInfoLog(GL.shaders[shader]));
Module.printErr('Info: ' + JSON.stringify(GL.shaderInfos[shader]));
-#if GL_DEBUG
Module.printErr('Original source: ' + GL.shaderOriginalSources[shader]);
Module.printErr('Source: ' + GL.shaderSources[shader]);
throw 'Shader compilation halt';
-#else
- Module.printErr('Enable GL_DEBUG to see shader source');
-#endif
}
+#endif
};
GL.programShaders = {};