aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-04-27 14:28:08 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-04-27 14:28:08 -0700
commit29166d62529613834f24ef478714af8e3348ff16 (patch)
treedef9360ee230d5756577d57729fbdb656785a0f9 /src
parentce09542f7240014bff487d91921d1393b163a617 (diff)
handle GL_INFO_LOG_LENGTH
Diffstat (limited to 'src')
-rw-r--r--src/library_gl.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index d3011c69..0a4b4521 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -752,11 +752,19 @@ var LibraryGL = {
},
glGetShaderiv : function(shader, pname, p) {
- {{{ makeSetValue('p', '0', 'Module.ctx.getShaderParameter(GL.shaders[shader], pname)', 'i32') }}};
+ if (pname == 0x8B84) { // GL_INFO_LOG_LENGTH
+ {{{ makeSetValue('p', '0', 'Module.ctx.getShaderInfoLog(GL.shaders[shader]).length + 1', 'i32') }}};
+ } else {
+ {{{ makeSetValue('p', '0', 'Module.ctx.getShaderParameter(GL.shaders[shader], pname)', 'i32') }}};
+ }
},
glGetProgramiv : function(program, pname, p) {
- {{{ makeSetValue('p', '0', 'Module.ctx.getProgramParameter(GL.programs[program], pname)', 'i32') }}};
+ if (pname == 0x8B84) { // GL_INFO_LOG_LENGTH
+ {{{ makeSetValue('p', '0', 'Module.ctx.getProgramInfoLog(GL.programs[program]).length + 1', 'i32') }}};
+ } else {
+ {{{ makeSetValue('p', '0', 'Module.ctx.getProgramParameter(GL.programs[program], pname)', 'i32') }}};
+ }
},
glIsShader: function(shader) {
@@ -1008,10 +1016,10 @@ var LibraryGL = {
#if GL_DEBUG
console.log('Original source: ' + GL.shaderOriginalSources[shader]);
console.log('Source: ' + GL.shaderSources[shader]);
+ throw 'Shader compilation halt';
#else
console.log('Enable GL_DEBUG to see shader source');
#endif
- throw 'Shader compilation halt';
}
};