ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5098 from bjornharrtell/gl-log

Browse Source 
Reintroduce log messages for relevant WebGL assertions
This commit is contained in:
Andreas Hocevar
2016-03-22 17:54:44 +01:00
parent 1634aaa9dd a2a3ca84e2
commit 587817af94
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/webgl/context.js
View File

@@ -231,7 +231,7 @@ ol.webgl.Context.prototype.getShader = function(shaderObject) {
goog.asserts.assert(
gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) ||
gl.isContextLost(),
'illegal state, shader not compiled or context lost');
gl.getShaderInfoLog(shader) || 'illegal state, shader not compiled or context lost');
this.shaderCache_[shaderKey] = shader;
return shader;
}
@@ -261,7 +261,7 @@ ol.webgl.Context.prototype.getProgram = function(
goog.asserts.assert(
gl.getProgramParameter(program, goog.webgl.LINK_STATUS) ||
gl.isContextLost(),
'illegal state, shader not linked or context lost');
gl.getProgramInfoLog(program) || 'illegal state, shader not linked or context lost');
this.programCache_[programKey] = program;
return program;
}