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

Add message to assertions.

Browse Source
This commit is contained in:
Marc Jansen
2015-03-30 22:50:15 +02:00
parent 2c40d74a15
commit fb9ba22c30
45 changed files with 394 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,8 @@ ol.webgl.Context = function(canvas, gl) {
// use the OES_element_index_uint extension if available
if (this.hasOESElementIndexUint) {
var ext = gl.getExtension('OES_element_index_uint');
goog.asserts.assert(!goog.isNull(ext));
goog.asserts.assert(!goog.isNull(ext),
'Failed to get extension "OES_element_index_uint"');
}
goog.events.listen(this.canvas_, ol.webgl.WebGLContextEventType.LOST,
@@ -122,7 +123,8 @@ ol.webgl.Context.prototype.bindBuffer = function(target, buf) {
var buffer = gl.createBuffer();
gl.bindBuffer(target, buffer);
goog.asserts.assert(target == goog.webgl.ARRAY_BUFFER ||
target == goog.webgl.ELEMENT_ARRAY_BUFFER);
target == goog.webgl.ELEMENT_ARRAY_BUFFER,
'target is supposed to be an ARRAY_BUFFER or ELEMENT_ARRAY_BUFFER');
var /** @type {ArrayBufferView} */ arrayBuffer;
if (target == goog.webgl.ARRAY_BUFFER) {
arrayBuffer = new Float32Array(arr);
@@ -147,7 +149,8 @@ ol.webgl.Context.prototype.bindBuffer = function(target, buf) {
ol.webgl.Context.prototype.deleteBuffer = function(buf) {
var gl = this.getGL();
var bufferKey = goog.getUid(buf);
goog.asserts.assert(bufferKey in this.bufferCache_);
goog.asserts.assert(bufferKey in this.bufferCache_,
'attempted to delete uncached buffer');
var bufferCacheEntry = this.bufferCache_[bufferKey];
if (!gl.isContextLost()) {
gl.deleteBuffer(bufferCacheEntry.buffer);
@@ -231,7 +234,8 @@ ol.webgl.Context.prototype.getShader = function(shaderObject) {
}
goog.asserts.assert(
gl.getShaderParameter(shader, goog.webgl.COMPILE_STATUS) ||
gl.isContextLost());
gl.isContextLost(),
'illegal state, shader not compiled or context lost');
this.shaderCache_[shaderKey] = shader;
return shader;
}
@@ -266,7 +270,8 @@ ol.webgl.Context.prototype.getProgram = function(
}
goog.asserts.assert(
gl.getProgramParameter(program, goog.webgl.LINK_STATUS) ||
gl.isContextLost());
gl.isContextLost(),
'illegal state, shader not linked or context lost');
this.programCache_[programKey] = program;
return program;
}