Wrap ol.renderer.webgl code in define condition

src/ol/renderer/webgl/imagelayer.js

@@ -12,13 +12,15 @@ goog.require('ol.webgl');
 goog.require('ol.webgl.Context');
 
 
-/**
+if (ol.ENABLE_WEBGL) {
+
+  /**
    * @constructor
    * @extends {ol.renderer.webgl.Layer}
    * @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
    * @param {ol.layer.Image} imageLayer Tile layer.
    */
-ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
+  ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
 
     ol.renderer.webgl.Layer.call(this, mapRenderer, imageLayer);
 
@@ -41,16 +43,16 @@ ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
      */
     this.hitTransformationMatrix_ = null;
 
-};
+  };
-ol.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer);
+  ol.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer);
 
 
-/**
+  /**
    * @param {ol.ImageBase} image Image.
    * @private
    * @return {WebGLTexture} Texture.
    */
-ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
+  ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
 
     // We meet the conditions to work with non-power of two textures.
     // http://www.khronos.org/webgl/wiki/WebGL_and_OpenGL_Differences#Non-Power_of_Two_Texture_Support
@@ -61,13 +63,13 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
 
     return ol.webgl.Context.createTexture(
         gl, imageElement, ol.webgl.CLAMP_TO_EDGE, ol.webgl.CLAMP_TO_EDGE);
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
+  ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
     var layer = this.getLayer();
     var source = layer.getSource();
     var resolution = frameState.viewState.resolution;
@@ -83,13 +85,13 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coo
         function(feature) {
           return callback.call(thisArg, feature, layer);
         });
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layerState, context) {
+  ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layerState, context) {
 
     var gl = this.mapRenderer.getGL();
 
@@ -167,10 +169,10 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
     }
 
     return !!image;
-};
+  };
 
 
-/**
+  /**
    * @param {number} canvasWidth Canvas width.
    * @param {number} canvasHeight Canvas height.
    * @param {number} pixelRatio Pixel ratio.
@@ -180,7 +182,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
    * @param {ol.Extent} imageExtent Image extent.
    * @private
    */
-ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio,
+  ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio,
           viewCenter, viewResolution, viewRotation, imageExtent) {
 
     var canvasExtentWidth = canvasWidth * viewResolution;
@@ -200,23 +202,23 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvas
         (imageExtent[3] - imageExtent[1]) / 2);
     ol.transform.translate(projectionMatrix, 1, 1);
 
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
+  ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
     var hasFeature = this.forEachFeatureAtCoordinate(
         coordinate, frameState, 0, ol.functions.TRUE, this);
     return hasFeature !== undefined;
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
+  ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
     if (!this.image_ || !this.image_.getImage()) {
       return undefined;
     }
@@ -267,10 +269,10 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fra
         return undefined;
       }
     }
-};
+  };
 
 
-/**
+  /**
    * The transformation matrix to get the pixel on the image for a
    * pixel on the map.
    * @param {ol.Size} mapSize The map size.
@@ -278,7 +280,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fra
    * @return {ol.Transform} The transformation matrix.
    * @private
    */
-ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) {
+  ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) {
     // the first matrix takes a map pixel, flips the y-axis and scales to
     // a range between -1 ... 1
     var mapCoordTransform = ol.transform.create();
@@ -302,4 +304,6 @@ ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = function(ma
     ol.transform.multiply(transform, mapCoordTransform);
 
     return transform;
-};
+  };
+
+}

src/ol/renderer/webgl/layer.js

@@ -13,13 +13,15 @@ goog.require('ol.webgl.Buffer');
 goog.require('ol.webgl.Context');
 
 
-/**
+if (ol.ENABLE_WEBGL) {
+
+  /**
    * @constructor
    * @extends {ol.renderer.Layer}
    * @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
    * @param {ol.layer.Layer} layer Layer.
    */
-ol.renderer.webgl.Layer = function(mapRenderer, layer) {
+  ol.renderer.webgl.Layer = function(mapRenderer, layer) {
 
     ol.renderer.Layer.call(this, layer);
 
@@ -82,16 +84,16 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) {
      */
     this.defaultLocations_ = null;
 
-};
+  };
-ol.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
+  ol.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
 
 
-/**
+  /**
    * @param {olx.FrameState} frameState Frame state.
    * @param {number} framebufferDimension Framebuffer dimension.
    * @protected
    */
-ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebufferDimension) {
+  ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebufferDimension) {
 
     var gl = this.mapRenderer.getGL();
 
@@ -129,15 +131,15 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebu
       gl.bindFramebuffer(ol.webgl.FRAMEBUFFER, this.framebuffer);
     }
 
-};
+  };
 
 
-/**
+  /**
    * @param {olx.FrameState} frameState Frame state.
    * @param {ol.LayerState} layerState Layer state.
    * @param {ol.webgl.Context} context Context.
    */
-ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) {
+  ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) {
 
     this.dispatchComposeEvent_(
         ol.render.EventType.PRECOMPOSE, context, frameState);
@@ -181,16 +183,16 @@ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState
     this.dispatchComposeEvent_(
         ol.render.EventType.POSTCOMPOSE, context, frameState);
 
-};
+  };
 
 
-/**
+  /**
    * @param {ol.render.EventType} type Event type.
    * @param {ol.webgl.Context} context WebGL context.
    * @param {olx.FrameState} frameState Frame state.
    * @private
    */
-ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context, frameState) {
+  ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context, frameState) {
     var layer = this.getLayer();
     if (layer.hasListener(type)) {
       var viewState = frameState.viewState;
@@ -207,54 +209,54 @@ ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context
           type, render, frameState, null, context);
       layer.dispatchEvent(composeEvent);
     }
-};
+  };
 
 
-/**
+  /**
    * @return {!ol.Transform} Matrix.
    */
-ol.renderer.webgl.Layer.prototype.getTexCoordMatrix = function() {
+  ol.renderer.webgl.Layer.prototype.getTexCoordMatrix = function() {
     return this.texCoordMatrix;
-};
+  };
 
 
-/**
+  /**
    * @return {WebGLTexture} Texture.
    */
-ol.renderer.webgl.Layer.prototype.getTexture = function() {
+  ol.renderer.webgl.Layer.prototype.getTexture = function() {
     return this.texture;
-};
+  };
 
 
-/**
+  /**
    * @return {!ol.Transform} Matrix.
    */
-ol.renderer.webgl.Layer.prototype.getProjectionMatrix = function() {
+  ol.renderer.webgl.Layer.prototype.getProjectionMatrix = function() {
     return this.projectionMatrix;
-};
+  };
 
 
-/**
+  /**
    * Handle webglcontextlost.
    */
-ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = function() {
+  ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = function() {
     this.texture = null;
     this.framebuffer = null;
     this.framebufferDimension = undefined;
-};
+  };
 
 
-/**
+  /**
    * @abstract
    * @param {olx.FrameState} frameState Frame state.
    * @param {ol.LayerState} layerState Layer state.
    * @param {ol.webgl.Context} context Context.
    * @return {boolean} whether composeFrame should be called.
    */
-ol.renderer.webgl.Layer.prototype.prepareFrame = function(frameState, layerState, context) {};
+  ol.renderer.webgl.Layer.prototype.prepareFrame = function(frameState, layerState, context) {};
 
 
-/**
+  /**
    * @abstract
    * @param {ol.Pixel} pixel Pixel.
    * @param {olx.FrameState} frameState FrameState.
@@ -264,4 +266,6 @@ ol.renderer.webgl.Layer.prototype.prepareFrame = function(frameState, layerState
    * @return {T|undefined} Callback result.
    * @template S,T,U
    */
-ol.renderer.webgl.Layer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {};
+  ol.renderer.webgl.Layer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {};
+
+}

src/ol/renderer/webgl/map.js

@@ -21,13 +21,15 @@ goog.require('ol.webgl.Context');
 goog.require('ol.webgl.ContextEventType');
 
 
-/**
+if (ol.ENABLE_WEBGL) {
+
+  /**
    * @constructor
    * @extends {ol.renderer.Map}
    * @param {Element} container Container.
    * @param {ol.Map} map Map.
    */
-ol.renderer.webgl.Map = function(container, map) {
+  ol.renderer.webgl.Map = function(container, map) {
     ol.renderer.Map.call(this, container, map);
 
     /**
@@ -155,18 +157,18 @@ ol.renderer.webgl.Map = function(container, map) {
     this.textureCacheFrameMarkerCount_ = 0;
 
     this.initializeGL_();
-};
+  };
-ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
+  ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
 
 
-/**
+  /**
    * @param {ol.Tile} tile Tile.
    * @param {ol.Size} tileSize Tile size.
    * @param {number} tileGutter Tile gutter.
    * @param {number} magFilter Mag filter.
    * @param {number} minFilter Min filter.
    */
-ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileGutter, magFilter, minFilter) {
+  ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileGutter, magFilter, minFilter) {
     var gl = this.getGL();
     var tileKey = tile.getKey();
     if (this.textureCache_.containsKey(tileKey)) {
@@ -221,15 +223,15 @@ ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileG
         minFilter: minFilter
       });
     }
-};
+  };
 
 
-/**
+  /**
    * @param {ol.render.EventType} type Event type.
    * @param {olx.FrameState} frameState Frame state.
    * @private
    */
-ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameState) {
+  ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameState) {
     var map = this.getMap();
     if (map.hasListener(type)) {
       var context = this.context_;
@@ -249,13 +251,13 @@ ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameStat
           frameState, null, context);
       map.dispatchEvent(composeEvent);
     }
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.Map.prototype.disposeInternal = function() {
+  ol.renderer.webgl.Map.prototype.disposeInternal = function() {
     var gl = this.getGL();
     if (!gl.isContextLost()) {
       this.textureCache_.forEach(
@@ -271,15 +273,15 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
     }
     this.context_.dispose();
     ol.renderer.Map.prototype.disposeInternal.call(this);
-};
+  };
 
 
-/**
+  /**
    * @param {ol.Map} map Map.
    * @param {olx.FrameState} frameState Frame state.
    * @private
    */
-ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
+  ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
     var gl = this.getGL();
     var textureCacheEntry;
     while (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ >
@@ -296,46 +298,46 @@ ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
       }
       this.textureCache_.pop();
     }
-};
+  };
 
 
-/**
+  /**
    * @return {ol.webgl.Context} The context.
    */
-ol.renderer.webgl.Map.prototype.getContext = function() {
+  ol.renderer.webgl.Map.prototype.getContext = function() {
     return this.context_;
-};
+  };
 
 
-/**
+  /**
    * @return {WebGLRenderingContext} GL.
    */
-ol.renderer.webgl.Map.prototype.getGL = function() {
+  ol.renderer.webgl.Map.prototype.getGL = function() {
     return this.gl_;
-};
+  };
 
 
-/**
+  /**
    * @return {ol.structs.PriorityQueue.<Array>} Tile texture queue.
    */
-ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
+  ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
     return this.tileTextureQueue_;
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.Map.prototype.getType = function() {
+  ol.renderer.webgl.Map.prototype.getType = function() {
     return ol.renderer.Type.WEBGL;
-};
+  };
 
 
-/**
+  /**
    * @param {ol.events.Event} event Event.
    * @protected
    */
-ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
+  ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
     event.preventDefault();
     this.textureCache_.clear();
     this.textureCacheFrameMarkerCount_ = 0;
@@ -345,22 +347,22 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
       var renderer = /** @type {ol.renderer.webgl.Layer} */ (renderers[id]);
       renderer.handleWebGLContextLost();
     }
-};
+  };
 
 
-/**
+  /**
    * @protected
    */
-ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
+  ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
     this.initializeGL_();
     this.getMap().render();
-};
+  };
 
 
-/**
+  /**
    * @private
    */
-ol.renderer.webgl.Map.prototype.initializeGL_ = function() {
+  ol.renderer.webgl.Map.prototype.initializeGL_ = function() {
     var gl = this.gl_;
     gl.activeTexture(ol.webgl.TEXTURE0);
     gl.blendFuncSeparate(
@@ -370,22 +372,22 @@ ol.renderer.webgl.Map.prototype.initializeGL_ = function() {
     gl.disable(ol.webgl.DEPTH_TEST);
     gl.disable(ol.webgl.SCISSOR_TEST);
     gl.disable(ol.webgl.STENCIL_TEST);
-};
+  };
 
 
-/**
+  /**
    * @param {ol.Tile} tile Tile.
    * @return {boolean} Is tile texture loaded.
    */
-ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) {
+  ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) {
     return this.textureCache_.containsKey(tile.getKey());
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
+  ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
 
     var context = this.getContext();
     var gl = this.getGL();
@@ -471,13 +473,13 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
     this.scheduleRemoveUnusedLayerRenderers(frameState);
     this.scheduleExpireIconCache(frameState);
 
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg,
+  ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg,
           layerFilter, thisArg2) {
     var result;
 
@@ -504,13 +506,13 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate
       }
     }
     return undefined;
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
+  ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
     var hasFeature = false;
 
     if (this.getGL().isContextLost()) {
@@ -536,13 +538,13 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, fr
       }
     }
     return hasFeature;
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
+  ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
           layerFilter, thisArg2) {
     if (this.getGL().isContextLost()) {
       return false;
@@ -568,4 +570,6 @@ ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState
       }
     }
     return undefined;
-};
+  };
+
+}

src/ol/renderer/webgl/tilelayer.js

@@ -17,13 +17,15 @@ goog.require('ol.webgl');
 goog.require('ol.webgl.Buffer');
 
 
-/**
+if (ol.ENABLE_WEBGL) {
+
+  /**
    * @constructor
    * @extends {ol.renderer.webgl.Layer}
    * @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
    * @param {ol.layer.Tile} tileLayer Tile layer.
    */
-ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
+  ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
 
     ol.renderer.webgl.Layer.call(this, mapRenderer, tileLayer);
 
@@ -80,21 +82,21 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
      */
     this.tmpSize_ = [0, 0];
 
-};
+  };
-ol.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
+  ol.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
+  ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
     var context = this.mapRenderer.getContext();
     context.deleteBuffer(this.renderArrayBuffer_);
     ol.renderer.webgl.Layer.prototype.disposeInternal.call(this);
-};
+  };
 
 
-/**
+  /**
    * Create a function that adds loaded tiles to the tile lookup.
    * @param {ol.source.Tile} source Tile source.
    * @param {ol.proj.Projection} projection Projection of the tiles.
@@ -105,7 +107,7 @@ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
    *     lookup.
    * @protected
    */
-ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
+  ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
     var mapRenderer = this.mapRenderer;
 
     return (
@@ -127,22 +129,22 @@ ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source,
           }
           return source.forEachLoadedTile(projection, zoom, tileRange, callback);
         });
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
+  ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
     ol.renderer.webgl.Layer.prototype.handleWebGLContextLost.call(this);
     this.locations_ = null;
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerState, context) {
+  ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerState, context) {
 
     var mapRenderer = this.mapRenderer;
     var gl = context.getGL();
@@ -354,13 +356,13 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
     ol.transform.translate(texCoordMatrix, -0.5, -0.5);
 
     return true;
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
+  ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
     if (!this.framebuffer) {
       return undefined;
     }
@@ -386,4 +388,6 @@ ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, fram
     } else {
       return undefined;
     }
-};
+  };
+
+}

src/ol/renderer/webgl/vectorlayer.js

@@ -9,13 +9,15 @@ goog.require('ol.renderer.webgl.Layer');
 goog.require('ol.transform');
 
 
-/**
+if (ol.ENABLE_WEBGL) {
+
+  /**
    * @constructor
    * @extends {ol.renderer.webgl.Layer}
    * @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
    * @param {ol.layer.Vector} vectorLayer Vector layer.
    */
-ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
+  ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
 
     ol.renderer.webgl.Layer.call(this, mapRenderer, vectorLayer);
 
@@ -62,14 +64,14 @@ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
      */
     this.layerState_ = null;
 
-};
+  };
-ol.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
+  ol.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, layerState, context) {
+  ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, layerState, context) {
     this.layerState_ = layerState;
     var viewState = frameState.viewState;
     var replayGroup = this.replayGroup_;
@@ -86,13 +88,13 @@ ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, laye
       gl.disable(gl.SCISSOR_TEST);
     }
 
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() {
+  ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() {
     var replayGroup = this.replayGroup_;
     if (replayGroup) {
       var context = this.mapRenderer.getContext();
@@ -100,13 +102,13 @@ ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() {
       this.replayGroup_ = null;
     }
     ol.renderer.webgl.Layer.prototype.disposeInternal.call(this);
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
+  ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
     if (!this.replayGroup_ || !this.layerState_) {
       return undefined;
     } else {
@@ -132,13 +134,13 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(co
             }
           });
     }
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
+  ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
     if (!this.replayGroup_ || !this.layerState_) {
       return false;
     } else {
@@ -150,13 +152,13 @@ ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordi
           frameState.size, frameState.pixelRatio, layerState.opacity,
           frameState.skippedFeatureUids);
     }
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
+  ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
     var coordinate = ol.transform.apply(
         frameState.pixelToCoordinateTransform, pixel.slice());
     var hasFeature = this.hasFeatureAtCoordinate(coordinate, frameState);
@@ -166,23 +168,23 @@ ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, fr
     } else {
       return undefined;
     }
-};
+  };
 
 
-/**
+  /**
    * Handle changes in image style state.
    * @param {ol.events.Event} event Image style change event.
    * @private
    */
-ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event) {
+  ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event) {
     this.renderIfReadyAndVisible();
-};
+  };
 
 
-/**
+  /**
    * @inheritDoc
    */
-ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, layerState, context) {
+  ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, layerState, context) {
 
     var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer());
     var vectorSource = vectorLayer.getSource();
@@ -281,10 +283,10 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, laye
     this.replayGroup_ = replayGroup;
 
     return true;
-};
+  };
 
 
-/**
+  /**
    * @param {ol.Feature} feature Feature.
    * @param {number} resolution Resolution.
    * @param {number} pixelRatio Pixel ratio.
@@ -293,7 +295,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, laye
    * @param {ol.render.webgl.ReplayGroup} replayGroup Replay group.
    * @return {boolean} `true` if an image is loading.
    */
-ol.renderer.webgl.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) {
+  ol.renderer.webgl.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) {
     if (!styles) {
       return false;
     }
@@ -312,4 +314,6 @@ ol.renderer.webgl.VectorLayer.prototype.renderFeature = function(feature, resolu
           this.handleStyleImageChange_, this) || loading;
     }
     return loading;
-};
+  };
+
+}

src/ol/webgl.js

@@ -1,278 +1,280 @@
 goog.provide('ol.webgl');
 
 
-/** Constants taken from goog.webgl
+if (ol.ENABLE_WEBGL) {
+
+  /** Constants taken from goog.webgl
    */
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.ONE = 1;
+  ol.webgl.ONE = 1;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.SRC_ALPHA = 0x0302;
+  ol.webgl.SRC_ALPHA = 0x0302;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.COLOR_ATTACHMENT0 = 0x8CE0;
+  ol.webgl.COLOR_ATTACHMENT0 = 0x8CE0;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.COLOR_BUFFER_BIT = 0x00004000;
+  ol.webgl.COLOR_BUFFER_BIT = 0x00004000;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TRIANGLES = 0x0004;
+  ol.webgl.TRIANGLES = 0x0004;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TRIANGLE_STRIP = 0x0005;
+  ol.webgl.TRIANGLE_STRIP = 0x0005;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.ONE_MINUS_SRC_ALPHA = 0x0303;
+  ol.webgl.ONE_MINUS_SRC_ALPHA = 0x0303;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.ARRAY_BUFFER = 0x8892;
+  ol.webgl.ARRAY_BUFFER = 0x8892;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.ELEMENT_ARRAY_BUFFER = 0x8893;
+  ol.webgl.ELEMENT_ARRAY_BUFFER = 0x8893;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.STREAM_DRAW = 0x88E0;
+  ol.webgl.STREAM_DRAW = 0x88E0;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.STATIC_DRAW = 0x88E4;
+  ol.webgl.STATIC_DRAW = 0x88E4;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.DYNAMIC_DRAW = 0x88E8;
+  ol.webgl.DYNAMIC_DRAW = 0x88E8;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.CULL_FACE = 0x0B44;
+  ol.webgl.CULL_FACE = 0x0B44;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.BLEND = 0x0BE2;
+  ol.webgl.BLEND = 0x0BE2;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.STENCIL_TEST = 0x0B90;
+  ol.webgl.STENCIL_TEST = 0x0B90;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.DEPTH_TEST = 0x0B71;
+  ol.webgl.DEPTH_TEST = 0x0B71;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.SCISSOR_TEST = 0x0C11;
+  ol.webgl.SCISSOR_TEST = 0x0C11;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.UNSIGNED_BYTE = 0x1401;
+  ol.webgl.UNSIGNED_BYTE = 0x1401;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.UNSIGNED_SHORT = 0x1403;
+  ol.webgl.UNSIGNED_SHORT = 0x1403;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.UNSIGNED_INT = 0x1405;
+  ol.webgl.UNSIGNED_INT = 0x1405;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.FLOAT = 0x1406;
+  ol.webgl.FLOAT = 0x1406;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.RGBA = 0x1908;
+  ol.webgl.RGBA = 0x1908;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.FRAGMENT_SHADER = 0x8B30;
+  ol.webgl.FRAGMENT_SHADER = 0x8B30;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.VERTEX_SHADER = 0x8B31;
+  ol.webgl.VERTEX_SHADER = 0x8B31;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.LINK_STATUS = 0x8B82;
+  ol.webgl.LINK_STATUS = 0x8B82;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.LINEAR = 0x2601;
+  ol.webgl.LINEAR = 0x2601;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TEXTURE_MAG_FILTER = 0x2800;
+  ol.webgl.TEXTURE_MAG_FILTER = 0x2800;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TEXTURE_MIN_FILTER = 0x2801;
+  ol.webgl.TEXTURE_MIN_FILTER = 0x2801;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TEXTURE_WRAP_S = 0x2802;
+  ol.webgl.TEXTURE_WRAP_S = 0x2802;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TEXTURE_WRAP_T = 0x2803;
+  ol.webgl.TEXTURE_WRAP_T = 0x2803;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TEXTURE_2D = 0x0DE1;
+  ol.webgl.TEXTURE_2D = 0x0DE1;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.TEXTURE0 = 0x84C0;
+  ol.webgl.TEXTURE0 = 0x84C0;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.CLAMP_TO_EDGE = 0x812F;
+  ol.webgl.CLAMP_TO_EDGE = 0x812F;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.COMPILE_STATUS = 0x8B81;
+  ol.webgl.COMPILE_STATUS = 0x8B81;
 
 
-/**
+  /**
    * @const
    * @type {number}
    */
-ol.webgl.FRAMEBUFFER = 0x8D40;
+  ol.webgl.FRAMEBUFFER = 0x8D40;
 
 
-/** end of goog.webgl constants
+  /** end of goog.webgl constants
    */
 
 
-/**
+  /**
    * @const
    * @private
    * @type {Array.<string>}
    */
-ol.webgl.CONTEXT_IDS_ = [
+  ol.webgl.CONTEXT_IDS_ = [
     'experimental-webgl',
     'webgl',
     'webkit-3d',
     'moz-webgl'
-];
+  ];
 
 
-/**
+  /**
    * @param {HTMLCanvasElement} canvas Canvas.
    * @param {Object=} opt_attributes Attributes.
    * @return {WebGLRenderingContext} WebGL rendering context.
    */
-ol.webgl.getContext = function(canvas, opt_attributes) {
+  ol.webgl.getContext = function(canvas, opt_attributes) {
     var context, i, ii = ol.webgl.CONTEXT_IDS_.length;
     for (i = 0; i < ii; ++i) {
       try {
@@ -285,4 +287,6 @@ ol.webgl.getContext = function(canvas, opt_attributes) {
       }
     }
     return null;
-};
+  };
+
+}