aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-02-09 11:33:40 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-02-09 11:34:24 -0800
commit4729a9bf9855f77167e8d995649e52c3b21fa5eb (patch)
tree70f345ff94d5b8726a278df2847763df71e1542f /src
parentb5044fc04c85f90be4708945f2d48c0e11355969 (diff)
handle unknown shader compilation bugs a little better
Diffstat (limited to 'src')
-rw-r--r--src/library_gl.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index 261780ce..90c618c7 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -1548,9 +1548,7 @@ var LibraryGL = {
#endif
var log = GLctx.getShaderInfoLog(GL.shaders[shader]);
// Work around a bug in Chromium which causes getShaderInfoLog to return null
- if (!log) {
- log = "";
- }
+ if (!log) log = '(unknown error)';
log = log.substr(0, maxLength - 1);
writeStringToMemory(log, infoLog);
if (length) {
@@ -1564,7 +1562,10 @@ var LibraryGL = {
GL.validateGLObjectID(GL.shaders, shader, 'glGetShaderiv', 'shader');
#endif
if (pname == 0x8B84) { // GL_INFO_LOG_LENGTH
- {{{ makeSetValue('p', '0', 'GLctx.getShaderInfoLog(GL.shaders[shader]).length + 1', 'i32') }}};
+ var log = GLctx.getShaderInfoLog(GL.shaders[shader]);
+ // Work around a bug in Chromium which causes getShaderInfoLog to return null
+ if (!log) log = '(unknown error)';
+ {{{ makeSetValue('p', '0', 'log.length + 1', 'i32') }}};
} else {
{{{ makeSetValue('p', '0', 'GLctx.getShaderParameter(GL.shaders[shader], pname)', 'i32') }}};
}